kvm: nVMX: move nested events check to kvm_vcpu_running

bonzini · bonzini · commit 0ad3bed6c5ec · 2017-02-15T14:54:33.000+01:00
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: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
@@ -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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -7023,6 +7023,9 @@ static inline int vcpu_block(struct kvm kvm, struct kvm_vcpu vcpu)`
`7023`	`7023`
`7024`	`7024`	`static inline bool kvm_vcpu_running(struct kvm_vcpu *vcpu)`
`7025`	`7025`	`{`
	`7026`	`+ if (is_guest_mode(vcpu) && kvm_x86_ops->check_nested_events)`
	`7027`	`+ kvm_x86_ops->check_nested_events(vcpu, false);`
	`7028`	`+`
`7026`	`7029`	`return (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE &&`
`7027`	`7030`	`!vcpu->arch.apf.halted);`
`7028`	`7031`	`}`
`@@ -8389,9 +8392,6 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu)`
`8389`	`8392`
`8390`	`8393`	`int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)`
`8391`	`8394`	`{`
`8392`		`- if (is_guest_mode(vcpu) && kvm_x86_ops->check_nested_events)`
`8393`		`- kvm_x86_ops->check_nested_events(vcpu, false);`
`8394`		`-`
`8395`	`8395`	`return kvm_vcpu_running(vcpu) \|\| kvm_vcpu_has_events(vcpu);`
`8396`	`8396`	`}`
`8397`	`8397`