From patchwork Wed Jun 22 03:42:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 9191843 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B45C96075A for ; Wed, 22 Jun 2016 03:43:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92D6220587 for ; Wed, 22 Jun 2016 03:43:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73FE528389; Wed, 22 Jun 2016 03:43:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A71D020587 for ; Wed, 22 Jun 2016 03:43:16 +0000 (UTC) Received: from localhost ([::1]:55476 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFZ4M-0004AD-KO for patchwork-qemu-devel@patchwork.kernel.org; Tue, 21 Jun 2016 23:43:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFZ47-0003y2-QG for qemu-devel@nongnu.org; Tue, 21 Jun 2016 23:43:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFZ41-0007LI-Vt for qemu-devel@nongnu.org; Tue, 21 Jun 2016 23:42:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60663) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFZ41-0007Ku-ND for qemu-devel@nongnu.org; Tue, 21 Jun 2016 23:42:53 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B2FC93B709; Wed, 22 Jun 2016 03:42:52 +0000 (UTC) Received: from pxdev.xzpeter.org (vpn1-6-253.pek2.redhat.com [10.72.6.253]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5M3gkQT014994; Tue, 21 Jun 2016 23:42:47 -0400 From: Peter Xu To: qemu-devel@nongnu.org Date: Wed, 22 Jun 2016 11:42:45 +0800 Message-Id: <1466566965-12809-1-git-send-email-peterx@redhat.com> In-Reply-To: <1466495274-5011-25-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 22 Jun 2016 03:42:52 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v10.2 24/26] kvm-irqchip: introduce kvm_irqchip_update_msi_route_no_commit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, mst@redhat.com, jasowang@redhat.com, rkrcmar@redhat.com, peterx@redhat.com, alex.williamson@redhat.com, jan.kiszka@web.de, wexu@redhat.com, pbonzini@redhat.com, marcel@redhat.com, imammedo@redhat.com, davidkiarie4@gmail.com, rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP We do gsi route commit for each irqchip route update before. This is not efficient if we are updating lots of routes in the same time. This patch introduce a new "no_commit" version of the update function, which can be used when we update multiple route entries in a sequence. This change also requires that we export kvm_irqchip_commit_routes() to public. Signed-off-by: Peter Xu --- After a second thought, a better way to do this is to introduce another new function, rather than modifying the old kvm_iqrchip_udpate_msi_route(). By doing this, I can avoid touch other part of codes, also I can keep add_msi_route() and update_msi_route() aligned since both of them will contain one commit phase. Please review this v10.2 instead of v10 for this patch, and will use this one in future versions if np. hw/intc/ioapic.c | 3 ++- include/sysemu/kvm.h | 10 +++++++++- kvm-all.c | 19 +++++++++++++++---- kvm-stub.c | 4 ++++ target-i386/kvm.c | 5 +++-- 5 files changed, 33 insertions(+), 8 deletions(-) diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index 0c34e3e..931aeaf 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -192,7 +192,8 @@ static void ioapic_update_kvm_routes(IOAPICCommonState *s) ioapic_entry_parse(s->ioredtbl[i], &info); msg.address = info.addr; msg.data = info.data; - kvm_irqchip_update_msi_route(kvm_state, i, msg, NULL); + kvm_irqchip_update_msi_route_no_commit(kvm_state, i, + msg, NULL); } kvm_irqchip_commit_routes(kvm_state); } diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 0a16e0e..ba7e7f0 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -371,7 +371,6 @@ 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); @@ -494,6 +493,15 @@ static inline void cpu_synchronize_post_init(CPUState *cpu) int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev); int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg, PCIDevice *dev); +/* + * Same as kvm_irqchip_update_msi_route(), but need explicit + * kvm_irqchip_commit_routes() afterward. This is efficient when we + * need to update multiple MSI routes at the same time, to avoid + * unnecessary commits between updates. + */ +int kvm_irqchip_update_msi_route_no_commit(KVMState *s, int virq, + MSIMessage msg, PCIDevice *dev); +void kvm_irqchip_commit_routes(KVMState *s); void kvm_irqchip_release_virq(KVMState *s, int virq); int kvm_irqchip_add_adapter_route(KVMState *s, AdapterInfo *adapter); diff --git a/kvm-all.c b/kvm-all.c index ca30a58..b896184 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1094,8 +1094,6 @@ static int kvm_update_routing_entry(KVMState *s, *entry = *new_entry; - kvm_irqchip_commit_routes(s); - return 0; } @@ -1280,8 +1278,8 @@ int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev) return virq; } -int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg, - PCIDevice *dev) +int kvm_irqchip_update_msi_route_no_commit(KVMState *s, int virq, + MSIMessage msg, PCIDevice *dev) { struct kvm_irq_routing_entry kroute = {}; @@ -1306,6 +1304,19 @@ int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg, return kvm_update_routing_entry(s, &kroute); } +int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg, + PCIDevice *dev) +{ + int ret; + + ret = kvm_irqchip_update_msi_route_no_commit(s, virq, msg, dev); + if (ret >= 0) { + kvm_irqchip_commit_routes(s); + } + + return ret; +} + static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int rfd, int virq, bool assign) { diff --git a/kvm-stub.c b/kvm-stub.c index 982e590..64e23f6 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -135,6 +135,10 @@ int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg, return -ENOSYS; } +void kvm_irqchip_commit_routes(KVMState *s) +{ +} + int kvm_irqchip_add_adapter_route(KVMState *s, AdapterInfo *adapter) { return -ENOSYS; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index f02ba0a..62aec24 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -3376,9 +3376,10 @@ static void kvm_update_msi_routes_all(void *private, bool global, QLIST_FOREACH(entry, &msi_route_list, list) { cnt++; msg = pci_get_msi_message(entry->dev, entry->vector); - kvm_irqchip_update_msi_route(kvm_state, entry->virq, - msg, entry->dev); + kvm_irqchip_update_msi_route_no_commit(kvm_state, entry->virq, + msg, entry->dev); } + kvm_irqchip_commit_routes(kvm_state); trace_kvm_x86_update_msi_routes(cnt); }