diff mbox series

[v2,16/22] KVM: nVMX: Prioritize SMI over nested IRQ/NMI

Message ID	20200425070154.251290-7-pbonzini@redhat.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=4nXr=6J=vger.kernel.org=kvm-owner@kernel.org> From: Paolo Bonzini <pbonzini@redhat.com> To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: wei.huang2@amd.com, cavery@redhat.com, vkuznets@redhat.com, Sean Christopherson <sean.j.christopherson@intel.com>, Oliver Upton <oupton@google.com>, Jim Mattson <jmattson@google.com> Subject: [PATCH v2 16/22] KVM: nVMX: Prioritize SMI over nested IRQ/NMI Date: Sat, 25 Apr 2020 03:01:48 -0400 Message-Id: <20200425070154.251290-7-pbonzini@redhat.com> In-Reply-To: <20200424172416.243870-1-pbonzini@redhat.com> References: <20200424172416.243870-1-pbonzini@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk
Series	KVM: Event fixes and cleanup \| expand [v2,00/22] KVM: Event fixes and cleanup [v2,01/22] KVM: SVM: introduce nested_run_pending [v2,02/22] KVM: SVM: leave halted state on vmexit [v2,03/22] KVM: SVM: immediately inject INTR vmexit [v2,04/22] KVM: SVM: Implement check_nested_events for NMI [v2,05/22] KVM: nVMX: Preserve exception priority irrespective of exiting behavior [v2,06/22] KVM: nVMX: Open a window for pending nested VMX preemption timer [v2,07/22] KVM: x86: Set KVM_REQ_EVENT if run is canceled with req_immediate_exit set [v2,08/22] KVM: x86: Make return for {interrupt_nmi,smi}_allowed() a bool instead of int [v2,09/22] KVM: x86: replace is_smm checks with kvm_x86_ops.smi_allowed [v2,10/22] KVM: nVMX: Report NMIs as allowed when in L2 and Exit-on-NMI is set [v2,11/22] KVM: nSVM: Report NMIs as allowed when in L2 and Exit-on-NMI is set [v2,12/22] KVM: nSVM: Move SMI vmexit handling to svm_check_nested_events() [v2,13/22] KVM: VMX: Split out architectural interrupt/NMI blocking checks [v2,14/22] KVM: SVM: Split out architectural interrupt/NMI/SMI blocking checks [v2,15/22] KVM: nVMX: Preserve IRQ/NMI priority irrespective of exiting behavior [v2,16/22] KVM: nVMX: Prioritize SMI over nested IRQ/NMI [v2,17/22] KVM: nSVM: Report interrupts as allowed when in L2 and exit-on-interrupt is set [v2,18/22] KVM: nSVM: Preserve IRQ/NMI/SMI priority irrespective of exiting behavior [v2,19/22] KVM: x86: WARN on injected+pending exception even in nested case [v2,20/22] KVM: VMX: Use vmx_interrupt_blocked() directly from vmx_handle_exit() [v2,21/22] KVM: VMX: Use vmx_get_rflags() to query RFLAGS in vmx_interrupt_blocked() [v2,22/22] KVM: x86: Replace late check_nested_events() hack with more precise fix

Commit Message

Paolo Bonzini April 25, 2020, 7:01 a.m. UTC

From: Sean Christopherson <sean.j.christopherson@intel.com>

Check for an unblocked SMI in vmx_check_nested_events() so that pending
SMIs are correctly prioritized over IRQs and NMIs when the latter events
will trigger VM-Exit.  This also fixes an issue where an SMI that was
marked pending while processing a nested VM-Enter wouldn't trigger an
immediate exit, i.e. would be incorrectly delayed until L2 happened to
take a VM-Exit.

Fixes: 64d6067057d96 ("KVM: x86: stubs for SMM support")
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200423022550.15113-10-sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 arch/x86/kvm/vmx/nested.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff mbox series

Patch

diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index 188ff4cfdbaf..2c36f3f53108 100644
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -3750,6 +3750,12 @@  static int vmx_check_nested_events(struct kvm_vcpu *vcpu)
 		return 0;
 	}
 
+	if (vcpu->arch.smi_pending && !is_smm(vcpu)) {
+		if (block_nested_events)
+			return -EBUSY;
+		goto no_vmexit;
+	}
+
 	if (vcpu->arch.nmi_pending && !vmx_nmi_blocked(vcpu)) {
 		if (block_nested_events)
 			return -EBUSY;