Skip to content

Commit 4540515

Browse files
committed
KVM: x86: WARN if a vCPU gets a valid wakeup that KVM can't yet inject
WARN if a blocking vCPU is awakened by a valid wake event that KVM can't inject, e.g. because KVM needs to complete a nested VM-enter, or needs to re-inject an exception. For the nested VM-Enter case, KVM is supposed to clear "nested_run_pending" if L1 puts L2 into HLT, i.e. entering HLT "completes" the nested VM-Enter. And for already-injected exceptions, it should be impossible for the vCPU to be in a blocking state if a VM-Exit occurred while an exception was being vectored. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sean Christopherson <[email protected]>
1 parent 321ef62 commit 4540515

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

arch/x86/kvm/x86.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11208,7 +11208,10 @@ static inline int vcpu_block(struct kvm_vcpu *vcpu)
1120811208
* causes a spurious wakeup from HLT).
1120911209
*/
1121011210
if (is_guest_mode(vcpu)) {
11211-
if (kvm_check_nested_events(vcpu) < 0)
11211+
int r = kvm_check_nested_events(vcpu);
11212+
11213+
WARN_ON_ONCE(r == -EBUSY);
11214+
if (r < 0)
1121211215
return 0;
1121311216
}
1121411217

0 commit comments

Comments
 (0)