| Message ID | 1250079442-5163-4-git-send-email-gleb@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/12/2009 03:17 PM, Gleb Natapov wrote: > Maintain back mapping from irqchip/pin to gsi to speedup > interrupt acknowledgment notifications. > > > struct kvm_irq_routing_table { > + int chip[KVM_NR_IRQCHIPS][KVM_IOAPIC_NUM_PINS]; > struct kvm_kernel_irq_routing_entry *rt_entries; > u32 nr_rt_entries; > /* > diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c > index a9d2262..00e4be7 100644 > --- a/virt/kvm/irq_comm.c > +++ b/virt/kvm/irq_comm.c > @@ -168,25 +168,16 @@ void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin) > { > struct kvm_irq_ack_notifier *kian; > struct hlist_node *n; > - unsigned gsi = pin; > - int i; > + unsigned gsi; > > trace_kvm_ack_irq(irqchip, pin); > > - for (i = 0; i< kvm->irq_routing->nr_rt_entries; i++) { > - struct kvm_kernel_irq_routing_entry *e; > - e =&kvm->irq_routing->rt_entries[i]; > - if (e->type == KVM_IRQ_ROUTING_IRQCHIP&& > - 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) > - kian->irq_acked(kian); > + gsi = kvm->irq_routing->chip[irqchip][pin]; > + if (gsi != -1) > unsigned vs. int compare... it will work, but will raise eyebrows. Better make it a -1U. > + hlist_for_each_entry(kian, n,&kvm->arch.irq_ack_notifier_list, > + link) > + if (kian->gsi == gsi) > + kian->irq_acked(kian); > } > > void kvm_register_irq_ack_notifier(struct kvm *kvm, > @@ -308,6 +299,9 @@ static int setup_routing_entry(struct kvm_irq_routing_table *rt, > } > e->irqchip.irqchip = ue->u.irqchip.irqchip; > e->irqchip.pin = ue->u.irqchip.pin + delta; > + if (e->irqchip.pin> KVM_IOAPIC_NUM_PINS) > + goto out; > >=
diff --git a/arch/ia64/include/asm/kvm.h b/arch/ia64/include/asm/kvm.h index 18a7e49..bc90c75 100644 --- a/arch/ia64/include/asm/kvm.h +++ b/arch/ia64/include/asm/kvm.h @@ -60,6 +60,7 @@ struct kvm_ioapic_state { #define KVM_IRQCHIP_PIC_MASTER 0 #define KVM_IRQCHIP_PIC_SLAVE 1 #define KVM_IRQCHIP_IOAPIC 2 +#define KVM_NR_IRQCHIPS 3 #define KVM_CONTEXT_SIZE 8*1024 diff --git a/arch/x86/include/asm/kvm.h b/arch/x86/include/asm/kvm.h index 4a5fe91..f02e87a 100644 --- a/arch/x86/include/asm/kvm.h +++ b/arch/x86/include/asm/kvm.h @@ -79,6 +79,7 @@ struct kvm_ioapic_state { #define KVM_IRQCHIP_PIC_MASTER 0 #define KVM_IRQCHIP_PIC_SLAVE 1 #define KVM_IRQCHIP_IOAPIC 2 +#define KVM_NR_IRQCHIPS 3 /* for KVM_GET_REGS and KVM_SET_REGS */ struct kvm_regs { diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 09df31d..7ac58df 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -133,6 +133,7 @@ struct kvm_kernel_irq_routing_entry { }; struct kvm_irq_routing_table { + int chip[KVM_NR_IRQCHIPS][KVM_IOAPIC_NUM_PINS]; struct kvm_kernel_irq_routing_entry *rt_entries; u32 nr_rt_entries; /* diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c index a9d2262..00e4be7 100644 --- a/virt/kvm/irq_comm.c +++ b/virt/kvm/irq_comm.c @@ -168,25 +168,16 @@ void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin) { struct kvm_irq_ack_notifier *kian; struct hlist_node *n; - unsigned gsi = pin; - int i; + unsigned gsi; trace_kvm_ack_irq(irqchip, pin); - for (i = 0; i < kvm->irq_routing->nr_rt_entries; i++) { - struct kvm_kernel_irq_routing_entry *e; - e = &kvm->irq_routing->rt_entries[i]; - if (e->type == KVM_IRQ_ROUTING_IRQCHIP && - 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) - kian->irq_acked(kian); + gsi = kvm->irq_routing->chip[irqchip][pin]; + if (gsi != -1) + hlist_for_each_entry(kian, n, &kvm->arch.irq_ack_notifier_list, + link) + if (kian->gsi == gsi) + kian->irq_acked(kian); } void kvm_register_irq_ack_notifier(struct kvm *kvm, @@ -308,6 +299,9 @@ static int setup_routing_entry(struct kvm_irq_routing_table *rt, } e->irqchip.irqchip = ue->u.irqchip.irqchip; e->irqchip.pin = ue->u.irqchip.pin + delta; + if (e->irqchip.pin > KVM_IOAPIC_NUM_PINS) + goto out; + rt->chip[ue->u.irqchip.irqchip][e->irqchip.pin] = ue->gsi; break; case KVM_IRQ_ROUTING_MSI: e->set = kvm_set_msi; @@ -332,7 +326,7 @@ int kvm_set_irq_routing(struct kvm *kvm, unsigned flags) { struct kvm_irq_routing_table *new, *old; - u32 i, nr_rt_entries = 0; + u32 i, j, nr_rt_entries = 0; int r; for (i = 0; i < nr; ++i) { @@ -353,6 +347,9 @@ int kvm_set_irq_routing(struct kvm *kvm, new->rt_entries = (void *)&new->map[nr_rt_entries]; new->nr_rt_entries = nr_rt_entries; + for (i = 0; i < 3; i++) + for (j = 0; j < KVM_IOAPIC_NUM_PINS; j++) + new->chip[i][j] = -1; for (i = 0; i < nr; ++i) { r = -EINVAL;
Maintain back mapping from irqchip/pin to gsi to speedup interrupt acknowledgment notifications. Signed-off-by: Gleb Natapov <gleb@redhat.com> --- arch/ia64/include/asm/kvm.h | 1 + arch/x86/include/asm/kvm.h | 1 + include/linux/kvm_host.h | 1 + virt/kvm/irq_comm.c | 31 ++++++++++++++----------------- 4 files changed, 17 insertions(+), 17 deletions(-)