Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 264ff01d authored by Jan Kiszka's avatar Jan Kiszka Committed by Avi Kivity
Browse files

KVM: VMX: Fix pending NMI-vs.-IRQ race for user space irqchip 



As with the kernel irqchip, don't allow an NMI to stomp over an already
injected IRQ; instead wait for the IRQ injection to be completed.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent defaf158

arch/x86/kvm/vmx.c

+3 −1
Original line number Diff line number Diff line
@@ -2486,7 +2486,9 @@ static void do_interrupt_requests(struct kvm_vcpu *vcpu, 
	vmx_update_window_states(vcpu);



	if (vcpu->arch.nmi_pending && !vcpu->arch.nmi_injected) {

		if (vcpu->arch.nmi_window_open) {

		if (vcpu->arch.interrupt.pending) {

			enable_nmi_window(vcpu);

		} else if (vcpu->arch.nmi_window_open) {

			vcpu->arch.nmi_pending = false;

			vcpu->arch.nmi_injected = true;

		} else {