Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C0AFC433EF for ; Thu, 21 Oct 2021 20:51:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8331260FD9 for ; Thu, 21 Oct 2021 20:51:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232023AbhJUUxi (ORCPT ); Thu, 21 Oct 2021 16:53:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60507 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231206AbhJUUxh (ORCPT ); Thu, 21 Oct 2021 16:53:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634849480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tvg1+vzYkQgTUtitqr7oiGoswR+A/SAGJgS7pwx+Rd0=; b=Hoj2diTYw9qe4/VQ/p6p6L4UePN8H2JrOl5yJCVMEotvr1b937f5OV/os4X+gI4jww93ph B0HChhPGTRqyqF7p33WmmWTpsYEil1z590Sqi6L6DXzcc+M/eV2X20x7LHyKOg8P2CSJqq 0irAF0PqyEBDW/RqWwu4X4BhAb5Kfuo= Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-317-K8girmjnNzuKXM0emaF0bw-1; Thu, 21 Oct 2021 16:51:18 -0400 X-MC-Unique: K8girmjnNzuKXM0emaF0bw-1 Received: by mail-ot1-f72.google.com with SMTP id w16-20020a9d5a90000000b0055036b7abd9so814698oth.22 for ; Thu, 21 Oct 2021 13:51:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tvg1+vzYkQgTUtitqr7oiGoswR+A/SAGJgS7pwx+Rd0=; b=newlnPhG3H+JWDh/Iw+GHzUZNBtcwIOk1QAHRfSGG90WrHzFtfV89Y7gJNhZmrJKVA orDjqxF2mvAGBL5D0WdJbwElcUqEOlz6VWKiJDWRs+F9xOS9WmIjo5e7a/pfpscgoRWL hFRH/sbxf9Q8RWe18unjvKRGX+M01YNVPikm0hgbX1bJ4cf/dteIhcJ6b0v+lKV+PD+V CNStX30Gy8LrOgTbEH8eefopgcHEDtaj3GLLOXz7SDFzUaNK1yAnIDCyWQwOG5ERmHuv PwwMSfwOxLEJvr5h0C5Rq5iDUFL2+jRgzHRlgFaW6N4Z0bNyB5N0oPxKzvlD0+qpAPSZ W3gQ== X-Gm-Message-State: AOAM532Pbf6kx9gCIj0uQWyMHGu/VgLPTO5OXGHSAo/JwznUk3F+06Iv wuo2rcGI2yT6VEqGMdWgBtmU0ZWVNDQNHrfRkhlFr6pVzy8dqqT9Se2gwNOS2JA24MhCxdKu1is 142Htrc3M2DiK X-Received: by 2002:a05:6830:2b06:: with SMTP id l6mr6792144otv.333.1634849477436; Thu, 21 Oct 2021 13:51:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzB5O+8LzVMgP4yQ2Cv1JjSuvhL4/tKWEBXw2P9Ec914rbb5mbX80Wba7nAtc18ARIR0Lj08g== X-Received: by 2002:a05:6830:2b06:: with SMTP id l6mr6792118otv.333.1634849477134; Thu, 21 Oct 2021 13:51:17 -0700 (PDT) Received: from redhat.com ([38.15.36.239]) by smtp.gmail.com with ESMTPSA id m7sm1436313oiw.49.2021.10.21.13.51.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 13:51:16 -0700 (PDT) Date: Thu, 21 Oct 2021 14:51:14 -0600 From: Alex Williamson To: "Longpeng(Mike)" Cc: , , , Subject: Re: [PATCH v4 6/6] vfio: defer to commit kvm irq routing when enable msi/msix Message-ID: <20211021145114.3fc4436e.alex.williamson@redhat.com> In-Reply-To: <20211014004852.1293-7-longpeng2@huawei.com> References: <20211014004852.1293-1-longpeng2@huawei.com> <20211014004852.1293-7-longpeng2@huawei.com> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Thu, 14 Oct 2021 08:48:52 +0800 "Longpeng(Mike)" wrote: > In migration resume phase, all unmasked msix vectors need to be > setup when loading the VF state. However, the setup operation would > take longer if the VM has more VFs and each VF has more unmasked > vectors. > > The hot spot is kvm_irqchip_commit_routes, it'll scan and update > all irqfds that are already assigned each invocation, so more > vectors means need more time to process them. > > vfio_pci_load_config > vfio_msix_enable > msix_set_vector_notifiers > for (vector = 0; vector < dev->msix_entries_nr; vector++) { > vfio_msix_vector_do_use > vfio_add_kvm_msi_virq > kvm_irqchip_commit_routes <-- expensive > } > > We can reduce the cost by only committing once outside the loop. > The routes are cached in kvm_state, we commit them first and then > bind irqfd for each vector. > > The test VM has 128 vcpus and 8 VF (each one has 65 vectors), > we measure the cost of the vfio_msix_enable for each VF, and > we can see 90+% costs can be reduce. > > VF Count of irqfds[*] Original With this patch > > 1st 65 8 2 > 2nd 130 15 2 > 3rd 195 22 2 > 4th 260 24 3 > 5th 325 36 2 > 6th 390 44 3 > 7th 455 51 3 > 8th 520 58 4 > Total 258ms 21ms > > [*] Count of irqfds > How many irqfds that already assigned and need to process in this > round. > > The optimization can be applied to msi type too. > > Signed-off-by: Longpeng(Mike) > --- > hw/vfio/pci.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++------------ > hw/vfio/pci.h | 1 + > 2 files changed, 105 insertions(+), 25 deletions(-) > > diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c > index 0bd832b..dca2d0c 100644 > --- a/hw/vfio/pci.c > +++ b/hw/vfio/pci.c > @@ -413,8 +413,6 @@ static int vfio_enable_vectors(VFIOPCIDevice *vdev, bool msix) > static void vfio_add_kvm_msi_virq(VFIOPCIDevice *vdev, VFIOMSIVector *vector, > int vector_n, bool msix) > { > - int virq; > - > if ((msix && vdev->no_kvm_msix) || (!msix && vdev->no_kvm_msi)) { > return; > } > @@ -423,20 +421,31 @@ static void vfio_add_kvm_msi_virq(VFIOPCIDevice *vdev, VFIOMSIVector *vector, > return; > } > > - virq = kvm_irqchip_add_msi_route(kvm_state, vector_n, &vdev->pdev); > - if (virq < 0) { > + vector->virq = kvm_irqchip_add_deferred_msi_route(kvm_state, vector_n, > + &vdev->pdev); > + if (vector->virq < 0) { > event_notifier_cleanup(&vector->kvm_interrupt); > + vector->virq = -1; Nit, it seems like all negative values are equivalent here, I don't think we need to explicitly set virq to -1 given that it's already < 0. > + return; > + } > + > + if (vdev->defer_kvm_irq_routing) { > + /* > + * The vector->virq will be reset to -1 if we fail to add the > + * corresponding irqfd in vfio_commit_kvm_msi_virq_batch(). > + */ > return; > } > > + kvm_irqchip_commit_routes(kvm_state); > + > if (kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, &vector->kvm_interrupt, > - NULL, virq) < 0) { > - kvm_irqchip_release_virq(kvm_state, virq); > + NULL, vector->virq) < 0) { > + kvm_irqchip_release_virq(kvm_state, vector->virq); > event_notifier_cleanup(&vector->kvm_interrupt); > + vector->virq = -1; > return; > } > - > - vector->virq = virq; > } > > static void vfio_remove_kvm_msi_virq(VFIOMSIVector *vector) > @@ -501,11 +510,13 @@ static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr, > * increase them as needed. > */ > if (vdev->nr_vectors < nr + 1) { > - vfio_disable_irqindex(&vdev->vbasedev, VFIO_PCI_MSIX_IRQ_INDEX); > vdev->nr_vectors = nr + 1; > - ret = vfio_enable_vectors(vdev, true); > - if (ret) { > - error_report("vfio: failed to enable vectors, %d", ret); > + if (!vdev->defer_kvm_irq_routing) { > + vfio_disable_irqindex(&vdev->vbasedev, VFIO_PCI_MSIX_IRQ_INDEX); > + ret = vfio_enable_vectors(vdev, true); > + if (ret) { > + error_report("vfio: failed to enable vectors, %d", ret); > + } > } > } else { > Error *err = NULL; > @@ -567,6 +578,46 @@ static void vfio_msix_vector_release(PCIDevice *pdev, unsigned int nr) > } > } > > +static void vfio_prepare_kvm_msi_virq_batch(VFIOPCIDevice *vdev) > +{ > + assert(!vdev->defer_kvm_irq_routing); > + vdev->defer_kvm_irq_routing = true; > +} > + > +static void vfio_commit_kvm_msi_virq_batch(VFIOPCIDevice *vdev) > +{ > + VFIOMSIVector *vector; > + int i; > + > + if (!vdev->defer_kvm_irq_routing) { > + return; > + } > + > + vdev->defer_kvm_irq_routing = false; > + > + if (!vdev->nr_vectors) { > + return; > + } > + > + kvm_irqchip_commit_routes(kvm_state); > + > + for (i = 0; i < vdev->nr_vectors; i++) { > + vector = &vdev->msi_vectors[i]; > + > + if (!vector->use || vector->virq < 0) { > + continue; > + } > + > + if (kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, > + &vector->kvm_interrupt, > + NULL, vector->virq) < 0) { > + kvm_irqchip_release_virq(kvm_state, vector->virq); > + event_notifier_cleanup(&vector->kvm_interrupt); > + vector->virq = -1; > + } I started trying to get rid of this code that largely duplicates the error case of vfio_add_kvm_msi_virq() and questioned why we setup the notifier separate from connecting it to the irqfd. If we setup the notifier and irqfd in the same function we can clean things up a bit more and confine the deferred state tests in the vector-use code. I think we can also assert if we have an unmatched batch commit call and we probably don't need to test both that a vector is in use and has a virq, one should not be true without the other. Does this look like an improvement to you and would you like to roll it into this patch? Thanks, Alex pci.c | 58 ++++++++++++++++++++++------------------------------------ 1 file changed, 22 insertions(+), 36 deletions(-) commit 6fb9336e3fe9e3775b0a0e7aadaff781fb52c0e7 Author: Alex Williamson Date: Thu Oct 21 13:35:12 2021 -0600 cleanup diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 1792c30049da..5b3a86dd5292 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -417,35 +417,33 @@ static void vfio_add_kvm_msi_virq(VFIOPCIDevice *vdev, VFIOMSIVector *vector, return; } - if (event_notifier_init(&vector->kvm_interrupt, 0)) { - return; - } - vector->virq = kvm_irqchip_add_deferred_msi_route(kvm_state, vector_n, &vdev->pdev); +} + +static void vfio_connect_kvm_msi_virq(VFIOMSIVector *vector) +{ if (vector->virq < 0) { - event_notifier_cleanup(&vector->kvm_interrupt); - vector->virq = -1; return; } - if (vdev->defer_kvm_irq_routing) { - /* - * The vector->virq will be reset to -1 if we fail to add the - * corresponding irqfd in vfio_commit_kvm_msi_virq_batch(). - */ - return; + if (event_notifier_init(&vector->kvm_interrupt, 0)) { + goto fail_notifier; } - kvm_irqchip_commit_routes(kvm_state); - if (kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, &vector->kvm_interrupt, NULL, vector->virq) < 0) { - kvm_irqchip_release_virq(kvm_state, vector->virq); - event_notifier_cleanup(&vector->kvm_interrupt); - vector->virq = -1; - return; + goto fail_kvm; } + + return; + +fail_kvm: + event_notifier_cleanup(&vector->kvm_interrupt); +fail_notifier: + kvm_irqchip_release_virq(kvm_state, vector->virq); + vector->virq = -1; + return; } static void vfio_remove_kvm_msi_virq(VFIOMSIVector *vector) @@ -501,6 +499,10 @@ static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr, } else { if (msg) { vfio_add_kvm_msi_virq(vdev, vector, nr, true); + if (!vdev->defer_kvm_irq_routing) { + kvm_irqchip_commit_routes(kvm_state); + vfio_connect_kvm_msi_virq(vector); + } } } @@ -586,13 +588,9 @@ static void vfio_prepare_kvm_msi_virq_batch(VFIOPCIDevice *vdev) static void vfio_commit_kvm_msi_virq_batch(VFIOPCIDevice *vdev) { - VFIOMSIVector *vector; int i; - if (!vdev->defer_kvm_irq_routing) { - return; - } - + assert(vdev->defer_kvm_irq_routing); vdev->defer_kvm_irq_routing = false; if (!vdev->nr_vectors) { @@ -602,19 +600,7 @@ static void vfio_commit_kvm_msi_virq_batch(VFIOPCIDevice *vdev) kvm_irqchip_commit_routes(kvm_state); for (i = 0; i < vdev->nr_vectors; i++) { - vector = &vdev->msi_vectors[i]; - - if (!vector->use || vector->virq < 0) { - continue; - } - - if (kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, - &vector->kvm_interrupt, - NULL, vector->virq) < 0) { - kvm_irqchip_release_virq(kvm_state, vector->virq); - event_notifier_cleanup(&vector->kvm_interrupt); - vector->virq = -1; - } + vfio_connect_kvm_msi_virq(&vdev->msi_vectors[i]); } }