Commit 44882eed authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Avi Kivity
Browse files

KVM: make irq ack notifications aware of routing table 



IRQ ack notifications assume an identity mapping between pin->gsi,
which might not be the case with, for example, HPET.

Translate before acking.

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Acked-by: default avatarGleb Natapov <gleb@redhat.com>
parent 934d534f

arch/x86/kvm/i8259.c

+3 −2
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ static void pic_unlock(struct kvm_pic *s) 
	spin_unlock(&s->lock);



	while (acks) {

		kvm_notify_acked_irq(kvm, __ffs(acks));

		kvm_notify_acked_irq(kvm, SELECT_PIC(__ffs(acks)),

				     __ffs(acks));

		acks &= acks - 1;

	}
@@ -232,7 +233,7 @@ int kvm_pic_read_irq(struct kvm *kvm) 
	}

	pic_update_irq(s);

	pic_unlock(s);

	kvm_notify_acked_irq(kvm, irq);

	kvm_notify_acked_irq(kvm, SELECT_PIC(irq), irq);



	return intno;

}

arch/x86/kvm/irq.h

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 
#include "lapic.h"



#define PIC_NUM_PINS 16

#define SELECT_PIC(irq) \

	((irq) < 8 ? KVM_IRQCHIP_PIC_MASTER : KVM_IRQCHIP_PIC_SLAVE)



struct kvm;

struct kvm_vcpu;

include/linux/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ void kvm_unregister_irq_mask_notifier(struct kvm *kvm, int irq, 
void kvm_fire_mask_notifiers(struct kvm *kvm, int irq, bool mask);



void kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level);

void kvm_notify_acked_irq(struct kvm *kvm, unsigned gsi);

void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin);

void kvm_register_irq_ack_notifier(struct kvm *kvm,

				   struct kvm_irq_ack_notifier *kian);

void kvm_unregister_irq_ack_notifier(struct kvm_irq_ack_notifier *kian);

virt/kvm/ioapic.c

+5 −5
Original line number Diff line number Diff line
@@ -293,20 +293,20 @@ void kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int level) 
	}

}



static void __kvm_ioapic_update_eoi(struct kvm_ioapic *ioapic, int gsi,

static void __kvm_ioapic_update_eoi(struct kvm_ioapic *ioapic, int pin,

				    int trigger_mode)

{

	union ioapic_redir_entry *ent;



	ent = &ioapic->redirtbl[gsi];

	ent = &ioapic->redirtbl[pin];



	kvm_notify_acked_irq(ioapic->kvm, gsi);

	kvm_notify_acked_irq(ioapic->kvm, KVM_IRQCHIP_IOAPIC, pin);



	if (trigger_mode == IOAPIC_LEVEL_TRIG) {

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

		ent->fields.remote_irr = 0;

		if (!ent->fields.mask && (ioapic->irr & (1 << gsi)))

			ioapic_service(ioapic, gsi);

		if (!ent->fields.mask && (ioapic->irr & (1 << pin)))

			ioapic_service(ioapic, pin);

	}

}

virt/kvm/irq_comm.c

+10 −3
Original line number Diff line number Diff line
@@ -59,10 +59,19 @@ void kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level) 
			e->set(e, kvm, !!(*irq_state));

}



void kvm_notify_acked_irq(struct kvm *kvm, unsigned gsi)

void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin)

{

	struct kvm_kernel_irq_routing_entry *e;

	struct kvm_irq_ack_notifier *kian;

	struct hlist_node *n;

	unsigned gsi = pin;



	list_for_each_entry(e, &kvm->irq_routing, link)

		if (e->irqchip.irqchip == irqchip &&

		    e->irqchip.pin == pin) {

			gsi = e->gsi;

			break;

		}



	hlist_for_each_entry(kian, n, &kvm->arch.irq_ack_notifier_list, link)

		if (kian->gsi == gsi)
@@ -237,8 +246,6 @@ int kvm_set_irq_routing(struct kvm *kvm, 
#define ROUTING_ENTRY1(irq) IOAPIC_ROUTING_ENTRY(irq)



#ifdef CONFIG_X86

#define SELECT_PIC(irq) \

	((irq) < 8 ? KVM_IRQCHIP_PIC_MASTER : KVM_IRQCHIP_PIC_SLAVE)

#  define PIC_ROUTING_ENTRY(irq) \

	{ .gsi = irq, .type = KVM_IRQ_ROUTING_IRQCHIP,	\

	  .u.irqchip.irqchip = SELECT_PIC(irq), .u.irqchip.pin = (irq) % 8 }