diff options
author | Jan Kiszka <jan.kiszka@siemens.com> | 2012-05-16 15:41:14 -0300 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-05-16 18:04:45 -0300 |
commit | 4a3adebb1854d48f0c67958e164c6b2f29d44064 (patch) | |
tree | 06119d7fc6fd344d12d918ef7c479ed665256cdd /kvm-all.c | |
parent | 80a3eb10fe8ff61666e3843f8c7711fd496fa89b (diff) | |
download | hqemu-4a3adebb1854d48f0c67958e164c6b2f29d44064.zip hqemu-4a3adebb1854d48f0c67958e164c6b2f29d44064.tar.gz |
kvm: Add support for direct MSI injections
If the kernel supports KVM_SIGNAL_MSI, we can avoid the route-based
MSI injection mechanism.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'kvm-all.c')
-rw-r--r-- | kvm-all.c | 22 |
1 files changed, 19 insertions, 3 deletions
@@ -96,6 +96,7 @@ struct KVMState uint32_t *used_gsi_bitmap; unsigned int gsi_count; QTAILQ_HEAD(msi_hashtab, KVMMSIRoute) msi_hashtab[KVM_MSI_HASHTAB_SIZE]; + bool direct_msi; #endif }; @@ -898,8 +899,10 @@ static void kvm_init_irq_routing(KVMState *s) s->irq_routes = g_malloc0(sizeof(*s->irq_routes)); s->nr_allocated_irq_routes = 0; - for (i = 0; i < KVM_MSI_HASHTAB_SIZE; i++) { - QTAILQ_INIT(&s->msi_hashtab[i]); + if (!s->direct_msi) { + for (i = 0; i < KVM_MSI_HASHTAB_SIZE; i++) { + QTAILQ_INIT(&s->msi_hashtab[i]); + } } kvm_arch_init_irq_routing(s); @@ -1005,7 +1008,7 @@ again: return bit - 1 + i * 32; } - if (retry) { + if (!s->direct_msi && retry) { retry = false; kvm_flush_dynamic_msi_routes(s); goto again; @@ -1031,8 +1034,19 @@ static KVMMSIRoute *kvm_lookup_msi_route(KVMState *s, MSIMessage msg) int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg) { + struct kvm_msi msi; KVMMSIRoute *route; + if (s->direct_msi) { + msi.address_lo = (uint32_t)msg.address; + msi.address_hi = msg.address >> 32; + msi.data = msg.data; + msi.flags = 0; + memset(msi.pad, 0, sizeof(msi.pad)); + + return kvm_vm_ioctl(s, KVM_SIGNAL_MSI, &msi); + } + route = kvm_lookup_msi_route(s, msg); if (!route) { int virq, ret; @@ -1209,6 +1223,8 @@ int kvm_init(void) s->pit_state2 = kvm_check_extension(s, KVM_CAP_PIT_STATE2); #endif + s->direct_msi = (kvm_check_extension(s, KVM_CAP_SIGNAL_MSI) > 0); + ret = kvm_arch_init(s); if (ret < 0) { goto err; |