KVM: x86: fix SMI to halted VCPU

An SMI to a halted VCPU must wake it up, hence a VCPU with a pending
SMI must be considered runnable.

Fixes: 64d6067057d9658acb8675afcfba549abdb7fc16
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index b69ef58e51eefce0b609bb9eb37a61ad9cbd07f8..6e03546faf2e438b8ca1801962538defd9b2c6da 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7781,6 +7781,9 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu)
        if (atomic_read(&vcpu->arch.nmi_queued))
                return true;
 
+       if (test_bit(KVM_REQ_SMI, &vcpu->requests))
+               return true;
+
        if (kvm_arch_interrupt_allowed(vcpu) &&
            kvm_cpu_has_interrupt(vcpu))
                return true;