Commit 3a25dfa6 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: nVMX: promptly process interrupts delivered while in guest mode 



Since commit c300ab9f ("KVM: x86: Replace late check_nested_events() hack with
more precise fix") there is no longer the certainty that check_nested_events()
tries to inject an external interrupt vmexit to L1 on every call to vcpu_enter_guest.
Therefore, even in that case we need to set KVM_REQ_EVENT.  This ensures
that inject_pending_event() is called, and from there kvm_check_nested_events().

Fixes: c300ab9f ("KVM: x86: Replace late check_nested_events() hack with more precise fix")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent de7cd3f6

arch/x86/kvm/vmx/vmx.c

+6 −11
Original line number Diff line number Diff line
@@ -6305,18 +6305,13 @@ static int vmx_sync_pir_to_irr(struct kvm_vcpu *vcpu) 


		/*

		 * If we are running L2 and L1 has a new pending interrupt

		 * which can be injected, we should re-evaluate

		 * what should be done with this new L1 interrupt.

		 * If L1 intercepts external-interrupts, we should

		 * exit from L2 to L1. Otherwise, interrupt should be

		 * delivered directly to L2.

		 */

		if (is_guest_mode(vcpu) && max_irr_updated) {

			if (nested_exit_on_intr(vcpu))

				kvm_vcpu_exiting_guest_mode(vcpu);

			else

		 * which can be injected, this may cause a vmexit or it may

		 * be injected into L2.  Either way, this interrupt will be

		 * processed via KVM_REQ_EVENT, not RVI, because we do not use

		 * virtual interrupt delivery to inject L1 interrupts into L2.

		 */

		if (is_guest_mode(vcpu) && max_irr_updated)

			kvm_make_request(KVM_REQ_EVENT, vcpu);

		}

	} else {

		max_irr = kvm_lapic_find_highest_irr(vcpu);

	}