adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

KVM: Maintain back mapping from irqchip/pin to gsi

Browse source 
Maintain back mapping from irqchip/pin to gsi to speedup
interrupt acknowledgment notifications.

[avi: build fix on non-x86/ia64]

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Gleb Natapov 2009-08-24 11:54:21 +03:00 committed by Avi Kivity
parent 46e624b95c
commit 3e71f88bc9
4 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/ia64/include/asm/kvm.h
View file

@ -60,6 +60,7 @@ struct kvm_ioapic_state {
#define KVM_IRQCHIP_PIC_MASTER 0 #define KVM_IRQCHIP_PIC_MASTER 0
#define KVM_IRQCHIP_PIC_SLAVE 1 #define KVM_IRQCHIP_PIC_SLAVE 1
#define KVM_IRQCHIP_IOAPIC 2 #define KVM_IRQCHIP_IOAPIC 2
#define KVM_NR_IRQCHIPS 3
#define KVM_CONTEXT_SIZE 8*1024 #define KVM_CONTEXT_SIZE 8*1024

1
arch/x86/include/asm/kvm.h
View file

@ -79,6 +79,7 @@ struct kvm_ioapic_state {
#define KVM_IRQCHIP_PIC_MASTER 0 #define KVM_IRQCHIP_PIC_MASTER 0
#define KVM_IRQCHIP_PIC_SLAVE 1 #define KVM_IRQCHIP_PIC_SLAVE 1
#define KVM_IRQCHIP_IOAPIC 2 #define KVM_IRQCHIP_IOAPIC 2
#define KVM_NR_IRQCHIPS 3
/* for KVM_GET_REGS and KVM_SET_REGS */ /* for KVM_GET_REGS and KVM_SET_REGS */
struct kvm_regs { struct kvm_regs {

9
include/linux/kvm_host.h
View file

@ -131,7 +131,10 @@ struct kvm_kernel_irq_routing_entry {
struct hlist_node link; struct hlist_node link;
}; };
#ifdef __KVM_HAVE_IOAPIC
struct kvm_irq_routing_table { struct kvm_irq_routing_table {
int chip[KVM_NR_IRQCHIPS][KVM_IOAPIC_NUM_PINS];
struct kvm_kernel_irq_routing_entry *rt_entries; struct kvm_kernel_irq_routing_entry *rt_entries;
u32 nr_rt_entries; u32 nr_rt_entries;
/* /*
@ -141,6 +144,12 @@ struct kvm_irq_routing_table {
struct hlist_head map[0]; struct hlist_head map[0];
}; };
#else
struct kvm_irq_routing_table {};
#endif
struct kvm { struct kvm {
spinlock_t mmu_lock; spinlock_t mmu_lock;
spinlock_t requests_lock; spinlock_t requests_lock;

31
virt/kvm/irq_comm.c
View file

@ -175,25 +175,16 @@ void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin)
{ {
struct kvm_irq_ack_notifier *kian; struct kvm_irq_ack_notifier *kian;
struct hlist_node *n; struct hlist_node *n;
unsigned gsi = pin; int gsi;
int i;
trace_kvm_ack_irq(irqchip, pin); trace_kvm_ack_irq(irqchip, pin);
for (i = 0; i < kvm->irq_routing->nr_rt_entries; i++) { gsi = kvm->irq_routing->chip[irqchip][pin];
struct kvm_kernel_irq_routing_entry *e; if (gsi != -1)
e = &kvm->irq_routing->rt_entries[i]; hlist_for_each_entry(kian, n, &kvm->arch.irq_ack_notifier_list,
if (e->type == KVM_IRQ_ROUTING_IRQCHIP && link)
e->irqchip.irqchip == irqchip && if (kian->gsi == gsi)
e->irqchip.pin == pin) { kian->irq_acked(kian);
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);
} }
void kvm_register_irq_ack_notifier(struct kvm *kvm, void kvm_register_irq_ack_notifier(struct kvm *kvm,
@ -332,6 +323,9 @@ static int setup_routing_entry(struct kvm_irq_routing_table *rt,
} }
e->irqchip.irqchip = ue->u.irqchip.irqchip; e->irqchip.irqchip = ue->u.irqchip.irqchip;
e->irqchip.pin = ue->u.irqchip.pin + delta; 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; break;
case KVM_IRQ_ROUTING_MSI: case KVM_IRQ_ROUTING_MSI:
e->set = kvm_set_msi; e->set = kvm_set_msi;
@ -356,7 +350,7 @@ int kvm_set_irq_routing(struct kvm *kvm,
unsigned flags) unsigned flags)
{ {
struct kvm_irq_routing_table *new, *old; struct kvm_irq_routing_table *new, *old;
u32 i, nr_rt_entries = 0; u32 i, j, nr_rt_entries = 0;
int r; int r;
for (i = 0; i < nr; ++i) { for (i = 0; i < nr; ++i) {
@ -377,6 +371,9 @@ int kvm_set_irq_routing(struct kvm *kvm,
new->rt_entries = (void *)&new->map[nr_rt_entries]; new->rt_entries = (void *)&new->map[nr_rt_entries];
new->nr_rt_entries = 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) { for (i = 0; i < nr; ++i) {
r = -EINVAL; r = -EINVAL;