[PATCH ppc-for-5.0 1/1] ppc/spapr: Don't call KVM_SVM_OFF ioctl on TCG

[PATCH ppc-for-5.0 1/1] ppc/spapr: Don't call KVM_SVM_OFF ioctl on TCG

[Bharata B Rao]

Invoking KVM_SVM_OFF ioctl for TCG guests will lead to a QEMU crash.
Fix this by ensuring that we don't call KVM_SVM_OFF ioctl on TCG.

Reported-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Fixes: 4930c1966249 ("ppc/spapr: Support reboot of secure pseries guest")
Signed-off-by: Bharata B Rao <bharata@linux.ibm.com>
---
 target/ppc/kvm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index b64916dc37..ae2f3c57c0 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -2902,9 +2902,12 @@ void kvmppc_set_reg_tb_offset(PowerPCCPU *cpu, int64_t tb_offset)
 void kvmppc_svm_off(Error **errp)
 {
     int rc;
-    KVMState *s = KVM_STATE(current_machine->accelerator);
 
-    rc = kvm_vm_ioctl(s, KVM_PPC_SVM_OFF);
+    if (!kvm_enabled()) {
+        return;
+    }
+
+    rc = kvm_vm_ioctl(KVM_STATE(current_machine->accelerator), KVM_PPC_SVM_OFF);
     if (rc && rc != -ENOTTY) {
         error_setg_errno(errp, -rc, "KVM_PPC_SVM_OFF ioctl failed");
     }
-- 
2.21.0

Re: [PATCH ppc-for-5.0 1/1] ppc/spapr: Don't call KVM_SVM_OFF ioctl on TCG

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1402 bytes --]

On Thu, Jan 02, 2020 at 11:11:55AM +0530, Bharata B Rao wrote:
> Invoking KVM_SVM_OFF ioctl for TCG guests will lead to a QEMU crash.
> Fix this by ensuring that we don't call KVM_SVM_OFF ioctl on TCG.
> 
> Reported-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> Fixes: 4930c1966249 ("ppc/spapr: Support reboot of secure pseries guest")
> Signed-off-by: Bharata B Rao <bharata@linux.ibm.com>

Applied to ppc-for-5.0, thanks.

> ---
>  target/ppc/kvm.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index b64916dc37..ae2f3c57c0 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -2902,9 +2902,12 @@ void kvmppc_set_reg_tb_offset(PowerPCCPU *cpu, int64_t tb_offset)
>  void kvmppc_svm_off(Error **errp)
>  {
>      int rc;
> -    KVMState *s = KVM_STATE(current_machine->accelerator);
>  
> -    rc = kvm_vm_ioctl(s, KVM_PPC_SVM_OFF);
> +    if (!kvm_enabled()) {
> +        return;
> +    }
> +
> +    rc = kvm_vm_ioctl(KVM_STATE(current_machine->accelerator), KVM_PPC_SVM_OFF);
>      if (rc && rc != -ENOTTY) {
>          error_setg_errno(errp, -rc, "KVM_PPC_SVM_OFF ioctl failed");
>      }

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]