From: Vitaly Kuznetsov Date: Fri, 10 Jul 2020 14:11:51 +0000 (+0200) Subject: KVM: nSVM: reset nested_run_pending upon nested_svm_vmrun_msrpm() failure X-Git-Tag: v5.15~3185^2~30 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ebdb3dba7b900a6b280d70f08befa0b96e0f806e;p=platform%2Fkernel%2Flinux-starfive.git KVM: nSVM: reset nested_run_pending upon nested_svm_vmrun_msrpm() failure WARN_ON_ONCE(svm->nested.nested_run_pending) in nested_svm_vmexit() will fire if nested_run_pending remains '1' but it doesn't really need to, we are already failing and not going to run nested guest. Signed-off-by: Vitaly Kuznetsov Message-Id: <20200710141157.1640173-4-vkuznets@redhat.com> Signed-off-by: Paolo Bonzini --- diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 19e1e99..bd0df1b 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -493,6 +493,8 @@ int nested_svm_vmrun(struct vcpu_svm *svm) enter_svm_guest_mode(svm, vmcb_gpa, nested_vmcb); if (!nested_svm_vmrun_msrpm(svm)) { + svm->nested.nested_run_pending = 0; + svm->vmcb->control.exit_code = SVM_EXIT_ERR; svm->vmcb->control.exit_code_hi = 0; svm->vmcb->control.exit_info_1 = 0;