Skip to content

Commit

Permalink
KVM: PIC: Only commit irq routing when necessary
Browse files Browse the repository at this point in the history
The current logic updates KVM's view of our interrupt map every time we
change it. While this is nice and bullet proof, it slows things down
badly for me. QEMU spends about 3 seconds on every start telling KVM what
news it has on its routing maps.

Instead, let's just synchronize the whole irq routing map as a whole when
we're done constructing it. For things that change during runtime, we can
still update the routing table on demand.

Signed-off-by: Alexander Graf <agraf@suse.de>
  • Loading branch information
agraf committed Jun 30, 2013
1 parent 82fc73b commit cb925cf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions hw/i386/kvm/ioapic.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ void kvm_pc_setup_irq_routing(bool pci_enabled)
}
}
}
kvm_irqchip_commit_routes(s);
}
}

Expand Down
1 change: 1 addition & 0 deletions include/sysemu/kvm.h
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ int kvm_set_irq(KVMState *s, int irq, int level);
int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg);

void kvm_irqchip_add_irq_route(KVMState *s, int gsi, int irqchip, int pin);
void kvm_irqchip_commit_routes(KVMState *s);

void kvm_put_apic_state(DeviceState *d, struct kvm_lapic_state *kapic);
void kvm_get_apic_state(DeviceState *d, struct kvm_lapic_state *kapic);
Expand Down
6 changes: 3 additions & 3 deletions kvm-all.c
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,7 @@ void kvm_init_irq_routing(KVMState *s)
kvm_arch_init_irq_routing(s);
}

static void kvm_irqchip_commit_routes(KVMState *s)
void kvm_irqchip_commit_routes(KVMState *s)
{
int ret;

Expand Down Expand Up @@ -1019,8 +1019,6 @@ static void kvm_add_routing_entry(KVMState *s,
new->u = entry->u;

set_gsi(s, entry->gsi);

kvm_irqchip_commit_routes(s);
}

static int kvm_update_routing_entry(KVMState *s,
Expand Down Expand Up @@ -1171,6 +1169,7 @@ int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg)
route->kroute.u.msi.data = le32_to_cpu(msg.data);

kvm_add_routing_entry(s, &route->kroute);
kvm_irqchip_commit_routes(s);

QTAILQ_INSERT_TAIL(&s->msi_hashtab[kvm_hash_msi(msg.data)], route,
entry);
Expand Down Expand Up @@ -1203,6 +1202,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg)
kroute.u.msi.data = le32_to_cpu(msg.data);

kvm_add_routing_entry(s, &kroute);
kvm_irqchip_commit_routes(s);

return virq;
}
Expand Down

0 comments on commit cb925cf

Please sign in to comment.