]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
KVM: x86: don't notify userspace IOAPIC on edge-triggered interrupt EOI
authorMiaohe Lin <linmiaohe@huawei.com>
Fri, 14 Feb 2020 02:32:38 +0000 (10:32 +0800)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 21 Feb 2020 17:04:57 +0000 (18:04 +0100)
Commit 13db77347db1 ("KVM: x86: don't notify userspace IOAPIC on edge
EOI") said, edge-triggered interrupts don't set a bit in TMR, which means
that IOAPIC isn't notified on EOI. And var level indicates level-triggered
interrupt.
But commit 3159d36ad799 ("KVM: x86: use generic function for MSI parsing")
replace var level with irq.level by mistake. Fix it by changing irq.level
to irq.trig_mode.

Cc: stable@vger.kernel.org
Fixes: 3159d36ad799 ("KVM: x86: use generic function for MSI parsing")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/irq_comm.c

index 79afa0bb5f410f701e18370b38f9aeb182f53cfc..c47d2acec52934eae639a8c4b347fbfa660caca6 100644 (file)
@@ -417,7 +417,7 @@ void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu,
 
                        kvm_set_msi_irq(vcpu->kvm, entry, &irq);
 
-                       if (irq.level &&
+                       if (irq.trig_mode &&
                            kvm_apic_match_dest(vcpu, NULL, APIC_DEST_NOSHORT,
                                                irq.dest_id, irq.dest_mode))
                                __set_bit(irq.vector, ioapic_handled_vectors);