| Message ID | 20200424172416.243870-3-pbonzini@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: Event fixes and cleanup | expand |
On Fri, Apr 24, 2020 at 01:23:56PM -0400, Paolo Bonzini wrote: > 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> Reviewed-by: Oliver Upton <oupton@google.com> > --- > arch/x86/kvm/svm/nested.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c > index 51cfab68428d..e69e60ac1370 100644 > --- a/arch/x86/kvm/svm/nested.c > +++ b/arch/x86/kvm/svm/nested.c > @@ -472,6 +472,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); > > -- > 2.18.2 > >
diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 51cfab68428d..e69e60ac1370 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -472,6 +472,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);
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> --- arch/x86/kvm/svm/nested.c | 3 +++ 1 file changed, 3 insertions(+)