From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWX4V-0008KX-J9 for qemu-devel@nongnu.org; Mon, 21 May 2012 14:11:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SWX4S-000196-VP for qemu-devel@nongnu.org; Mon, 21 May 2012 14:11:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2832) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWX4S-00017M-9h for qemu-devel@nongnu.org; Mon, 21 May 2012 14:11:04 -0400 From: Avi Kivity Date: Mon, 21 May 2012 19:37:35 +0300 Message-Id: <1337618267-16669-8-git-send-email-avi@redhat.com> In-Reply-To: <1337618267-16669-1-git-send-email-avi@redhat.com> References: <1337618267-16669-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 07/19] kvm: Add support for direct MSI injections List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Jan Kiszka , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org From: Jan Kiszka If the kernel supports KVM_SIGNAL_MSI, we can avoid the route-based MSI injection mechanism. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti --- 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