diff options
| author | Sean Christopherson <seanjc@google.com> | 2024-06-07 19:26:09 +0200 |
|---|---|---|
| committer | Sean Christopherson <seanjc@google.com> | 2024-06-28 17:59:07 +0200 |
| commit | 45405155d876c326da89162b8173b8cc9ab7ed75 (patch) | |
| tree | 3cfe3d0aa2502b25e93b815866d4b44b4dbf3616 | |
| parent | KVM: nVMX: Fold requested virtual interrupt check into has_nested_events() (diff) | |
| download | linux-45405155d876c326da89162b8173b8cc9ab7ed75.tar.xz linux-45405155d876c326da89162b8173b8cc9ab7ed75.zip | |
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/20240607172609.3205077-7-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
| -rw-r--r-- | arch/x86/kvm/x86.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index cacca83b06aa..aab69647c3b6 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -11208,7 +11208,10 @@ static inline int vcpu_block(struct kvm_vcpu *vcpu) * causes a spurious wakeup from HLT). */ if (is_guest_mode(vcpu)) { - if (kvm_check_nested_events(vcpu) < 0) + int r = kvm_check_nested_events(vcpu); + + WARN_ON_ONCE(r == -EBUSY); + if (r < 0) return 0; } |