From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 23 Apr 2020 17:13:09 +0000 (-0400)
Subject: KVM: SVM: leave halted state on vmexit
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~2057^2~132
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=38c0b192bd6df089cdffd9828d19e764385f96e6;p=linux.git

KVM: SVM: leave halted state on vmexit

Similar to VMX, we need to leave the halted state when performing a vmexit.
Failure to do so will cause a hang after vmexit.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
index 7a724ea3d994..2a0f1b043145 100644
--- a/arch/x86/kvm/svm/nested.c
+++ b/arch/x86/kvm/svm/nested.c
@@ -473,6 +473,9 @@ int nested_svm_vmexit(struct vcpu_svm *svm)
 	leave_guest_mode(&svm->vcpu);
 	svm->nested.vmcb = 0;
 
+	/* in case we halted in L2 */
+	svm->vcpu.arch.mp_state = KVM_MP_STATE_RUNNABLE;
+
 	/* Give the current vmcb to the guest */
 	disable_gif(svm);