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

Commit 0ad3bed6 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

kvm: nVMX: move nested events check to kvm_vcpu_running 



vcpu_run calls kvm_vcpu_running, not kvm_arch_vcpu_runnable,
and the former does not call check_nested_events.

Once KVM_REQ_EVENT is removed from the APICv interrupt injection
path, however, this would leave no place to trigger a vmexit
from L2 to L1, causing a missed interrupt delivery while in guest
mode.  This is caught by the "ack interrupt on exit" test in
vmx.flat.

[This does not change the calls to check_nested_events in
 inject_pending_event.  That is material for a separate cleanup.]

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

arch/x86/kvm/x86.c

+3 −3
Original line number Diff line number Diff line
@@ -7023,6 +7023,9 @@ static inline int vcpu_block(struct kvm *kvm, struct kvm_vcpu *vcpu) 


static inline bool kvm_vcpu_running(struct kvm_vcpu *vcpu)

{

	if (is_guest_mode(vcpu) && kvm_x86_ops->check_nested_events)

		kvm_x86_ops->check_nested_events(vcpu, false);



	return (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE &&

		!vcpu->arch.apf.halted);

}
@@ -8389,9 +8392,6 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu) 


int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)

{

	if (is_guest_mode(vcpu) && kvm_x86_ops->check_nested_events)

		kvm_x86_ops->check_nested_events(vcpu, false);



	return kvm_vcpu_running(vcpu) || kvm_vcpu_has_events(vcpu);

}