Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c806a6ad authored Mar 18, 2015 by Radim Krčmář Committed by Marcelo Tosatti Mar 23, 2015

KVM: x86: call irq notifiers with directed EOI

kvm_ioapic_update_eoi() wasn't called if directed EOI was enabled.
We need to do that for irq notifiers.  (Like with edge interrupts.)

Fix it by skipping EOI broadcast only.

Bug: https://bugzilla.kernel.org/show_bug.cgi?id=82211


Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Tested-by: Bandan Das <bsd@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

parent 0790ec17

arch/x86/kvm/ioapic.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -422,6 +422,7 @@ static void __kvm_ioapic_update_eoi(struct kvm_vcpu *vcpu,
		struct kvm_ioapic *ioapic, int vector, int trigger_mode)
		{
		int i;
		struct kvm_lapic *apic = vcpu->arch.apic;

		for (i = 0; i < IOAPIC_NUM_PINS; i++) {
		union kvm_ioapic_redirect_entry *ent = &ioapic->redirtbl[i];
		@@ -443,7 +444,8 @@ static void __kvm_ioapic_update_eoi(struct kvm_vcpu *vcpu,
		kvm_notify_acked_irq(ioapic->kvm, KVM_IRQCHIP_IOAPIC, i);
		spin_lock(&ioapic->lock);

		if (trigger_mode != IOAPIC_LEVEL_TRIG)
		if (trigger_mode != IOAPIC_LEVEL_TRIG \|\|
		kvm_apic_get_reg(apic, APIC_SPIV) & APIC_SPIV_DIRECTED_EOI)
		continue;

		ASSERT(ent->fields.trig_mode == IOAPIC_LEVEL_TRIG);

arch/x86/kvm/lapic.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -833,8 +833,7 @@ int kvm_apic_compare_prio(struct kvm_vcpu vcpu1, struct kvm_vcpu vcpu2)

		static void kvm_ioapic_send_eoi(struct kvm_lapic *apic, int vector)
		{
		if (!(kvm_apic_get_reg(apic, APIC_SPIV) & APIC_SPIV_DIRECTED_EOI) &&
		kvm_ioapic_handles_vector(apic->vcpu->kvm, vector)) {
		if (kvm_ioapic_handles_vector(apic->vcpu->kvm, vector)) {
		int trigger_mode;
		if (apic_test_vector(vector, apic->regs + APIC_TMR))
		trigger_mode = IOAPIC_LEVEL_TRIG;