KVM: VMX: Don't unblock vCPU w/ Posted IRQ if IRQs are disabled in guest
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 16 Nov 2021 14:32:47 +0000 (09:32 -0500)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 8 Dec 2021 09:24:45 +0000 (04:24 -0500)
Don't configure the wakeup handler when a vCPU is blocking with IRQs
disabled, in which case any IRQ, posted or otherwise, should not be
recognized and thus should not wake the vCPU.

Fixes: bf9f6ac8d749 ("KVM: Update Posted-Interrupts Descriptor when vCPU is blocked")
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20211009021236.4122790-2-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/vmx/posted_intr.c

index 1c94783b5a54c5520466bb8b3753c89cfa1d5850..41f946e2123eb875c2a01a23d8626258f28fe4d5 100644 (file)
@@ -147,7 +147,8 @@ int pi_pre_block(struct kvm_vcpu *vcpu)
        struct pi_desc old, new;
        struct pi_desc *pi_desc = vcpu_to_pi_desc(vcpu);
 
-       if (!vmx_can_use_vtd_pi(vcpu->kvm))
+       if (!vmx_can_use_vtd_pi(vcpu->kvm) ||
+           vmx_interrupt_blocked(vcpu))
                return 0;
 
        WARN_ON(irqs_disabled());