From patchwork Tue Apr 3 07:23:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 150333 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9BC6AB6FDB for ; Tue, 3 Apr 2012 17:24:32 +1000 (EST) Received: from localhost ([::1]:60887 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEy6Q-0006cM-9S for incoming@patchwork.ozlabs.org; Tue, 03 Apr 2012 03:24:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55802) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEy5U-0004GJ-8M for qemu-devel@nongnu.org; Tue, 03 Apr 2012 03:23:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SEy5M-0001f7-Us for qemu-devel@nongnu.org; Tue, 03 Apr 2012 03:23:31 -0400 Received: from fmmailgate05.web.de ([217.72.192.243]:50102) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEy5M-0001ee-MV for qemu-devel@nongnu.org; Tue, 03 Apr 2012 03:23:24 -0400 Received: from moweb001.kundenserver.de (moweb001.kundenserver.de [172.19.20.114]) by fmmailgate05.web.de (Postfix) with ESMTP id 5B5106BEF943 for ; Tue, 3 Apr 2012 09:23:23 +0200 (CEST) Received: from localhost.localdomain ([95.157.56.37]) by smtp.web.de (mrweb001) with ESMTPA (Nemesis) id 0Lc8rF-1SgZ3v3vWP-00jPOZ; Tue, 03 Apr 2012 09:23:23 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Tue, 3 Apr 2012 09:23:16 +0200 Message-Id: X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-Provags-ID: V02:K0:zyvB/tT+EZO8Hp/jnh5/T+S6w7Z2JiOPjP6DvBBpEy0 du2rQZA7s4kU/hhoT4AkNopp5dJw6KAvXe/uB5hnXFGLpEVxrj WtG9dm9MQ9dpB/Fabs4akmgpg9oypsR00LwecIlswoIhhp5Vbw LrtsUMB18+Jgu4XDJi3gNWHyY7zCtAQmVwbA8jjGP5mshxf1fi PsCyR32qUmqBInXdIrTsg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.243 Cc: qemu-devel , kvm@vger.kernel.org, "Michael S. Tsirkin" Subject: [Qemu-devel] [RFC][PATCH v2 4/4] kvm: Add support for direct MSI injections X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.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 --- kvm-all.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 5256511..6225bab 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -95,6 +95,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 }; @@ -895,8 +896,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); @@ -1035,7 +1038,7 @@ again: return bit - 1 + i * 32; } - if (retry) { + if (!s->direct_msi && retry) { retry = false; kvm_flush_dynamic_msi_routes(s); goto again; @@ -1062,8 +1065,19 @@ static KVMMSIRoute *kvm_lookup_msi_route(KVMState *s, uint64_t addr, int kvm_irqchip_send_msi(KVMState *s, uint64_t addr, uint32_t data) { + struct kvm_msi msi; KVMMSIRoute *route; + if (s->direct_msi) { + msi.address_lo = (uint32_t)addr; + msi.address_hi = addr >> 32; + msi.data = 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, addr, data); if (!route) { int gsi, ret; @@ -1231,6 +1245,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;