[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/19] kvm: Add support for direct MSI injections
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 07/19] kvm: Add support for direct MSI injections |
Date: |
Mon, 21 May 2012 19:37:35 +0300 |
From: Jan Kiszka <address@hidden>
If the kernel supports KVM_SIGNAL_MSI, we can avoid the route-based
MSI injection mechanism.
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
kvm-all.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/kvm-all.c b/kvm-all.c
index ff0534b..d222012 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -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 @@ static int kvm_irqchip_get_virq(KVMState *s)
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;
--
1.7.10.1
- [Qemu-devel] [PATCH 17/19] kvm: Enable use of kvm_irqchip_in_kernel in hwlib code, (continued)
- [Qemu-devel] [PATCH 17/19] kvm: Enable use of kvm_irqchip_in_kernel in hwlib code, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 08/19] kvm: Enable in-kernel irqchip support by default, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 01/19] kvm: Refactor KVMState::max_gsi to gsi_count, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 14/19] kvm: Publicize kvm_irqchip_release_virq, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 06/19] kvm: Update kernel headers, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 04/19] pc: Enable MSI support at APIC level, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 16/19] kvm: Introduce kvm_irqchip_add/remove_irqfd, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 03/19] kvm: Introduce basic MSI support for in-kernel irqchips, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 13/19] kvm: Introduce kvm_irqchip_add_msi_route, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 02/19] Introduce MSIMessage structure, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 07/19] kvm: Add support for direct MSI injections,
Avi Kivity <=
- [Qemu-devel] [PATCH 18/19] msix: Add msix_nr_vectors_allocated, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 19/19] virtio/vhost: Add support for KVM in-kernel MSI injection, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 09/19] msix: Factor out msix_get_message, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 12/19] kvm: Rename kvm_irqchip_add_route to kvm_irqchip_add_irq_route, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 05/19] kvm: x86: Wire up MSI support for in-kernel irqchip, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 15/19] kvm: Make kvm_irqchip_commit_routes an internal service, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 11/19] msix: Introduce vector notifiers, Avi Kivity, 2012/05/21