Commit 28360f88 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Evaluate ability to inject SMI/NMI/IRQ after potential VM-Exit 



Determine whether or not new events can be injected after checking nested
events.  If a VM-Exit occurred during nested event handling, any previous
event that needed re-injection is gone from's KVM perspective; the event
is captured in the vmc*12 VM-Exit information, but doesn't exist in terms
of what needs to be done for entry to L1.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Link: https://lore.kernel.org/r/20220830231614.3580124-19-seanjc@google.com


Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6c593b52

arch/x86/kvm/x86.c

+8 −2
Original line number Diff line number Diff line
@@ -9723,7 +9723,7 @@ static void kvm_inject_exception(struct kvm_vcpu *vcpu) 


static int inject_pending_event(struct kvm_vcpu *vcpu, bool *req_immediate_exit)

{

	bool can_inject = !kvm_event_needs_reinjection(vcpu);

	bool can_inject;

	int r;



	/*
@@ -9788,7 +9788,13 @@ static int inject_pending_event(struct kvm_vcpu *vcpu, bool *req_immediate_exit) 
	if (r < 0)

		goto out;



	/* try to inject new event if pending */

	/*

	 * New events, other than exceptions, cannot be injected if KVM needs

	 * to re-inject a previous event.  See above comments on re-injecting

	 * for why pending exceptions get priority.

	 */

	can_inject = !kvm_event_needs_reinjection(vcpu);



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

		/*

		 * Fault-class exceptions, except #DBs, set RF=1 in the RFLAGS