KVM: nVMX: Fix virtual interrupt delivery injection

[cascardo/linux.git] / arch / x86 / kvm / vmx.c

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 0c9569b..7534a9f 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -7130,7 +7130,26 @@ static void vmx_hwapic_irr_update(struct kvm_vcpu *vcpu, int max_irr)
        if (max_irr == -1)
                return;
 
-       vmx_set_rvi(max_irr);
+       /*
+        * If a vmexit is needed, vmx_check_nested_events handles it.
+        */
+       if (is_guest_mode(vcpu) && nested_exit_on_intr(vcpu))
+               return;
+
+       if (!is_guest_mode(vcpu)) {
+               vmx_set_rvi(max_irr);
+               return;
+       }
+
+       /*
+        * Fall back to pre-APICv interrupt injection since L2
+        * is run without virtual interrupt delivery.
+        */
+       if (!kvm_event_needs_reinjection(vcpu) &&
+           vmx_interrupt_allowed(vcpu)) {
+               kvm_queue_interrupt(vcpu, max_irr, false);
+               vmx_inject_irq(vcpu);
+       }
 }
 
 static void vmx_load_eoi_exitmap(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap)