From patchwork Fri Nov 11 13:58:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 18852 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp777667wru; Fri, 11 Nov 2022 06:39:32 -0800 (PST) X-Google-Smtp-Source: AA0mqf4ntmhb6p8OxBlPhCXCO2L6VgTifw5qLCShXteHs7eLc7dRi60KsD5eVu3MpfiPd9aspAOy X-Received: by 2002:a05:6402:205c:b0:461:9e1f:222b with SMTP id bc28-20020a056402205c00b004619e1f222bmr1632831edb.312.1668177572466; Fri, 11 Nov 2022 06:39:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668177572; cv=none; d=google.com; s=arc-20160816; b=zWCpD+8re24wAqY37hcU9OkEbKQREuFMLTImDfbWVE6Qka/Rc9oRJzShyviPkAt5JV v4n0UiG7YN1+EChi2JXe1pxWwgtonAODwTo2+xa6+et/7/E2k11FkVuyB7gGPp9M8Heq OO4G/OcK5hUN2tgUTbePaHqpqprb6A9p86/hemWfziNOLOCVvKkVvihMLo6jKHF0c7I6 YDcUVF3gWGj2FNR0mFDVMrdTnYaKMfxaDgtuhoPs27JLatdkguKVIldWWMZzGhWxaiST ELNebrbQviQjrsUR4nbBWPdJ+JKdA9S1+ghtr0VSFsf4iMlbL0UPxEJ5Gb1bxG68xD/a qF1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=8LlK3JaLUlNPvY1OMKf4DIZ6KPBnqoAfjrM8HhykhKw=; b=R0A9qD26CrrvdseKhJ9dXPen5eDq+pijZwL6n6ncUtM0qqsdMdIuDvyfDdX0aUVaWO LB1PH6nLQf+Pn5q2X50C7mrSuaU6j1g8WefYwNHuvNH6SbbnXt4Fc4LPSuR90TqcJRfS X/JbFJe3WEKRlCDiLRoELrjy/3Y71WPcToFP9Bo3JzFhKkpbMoi/JF98H2pedhDIXMgb 8WqQKBhU14+WwXP5WLrqT3Ri86H7Y8hqJql/Z2CMT5eQrZR2DPbamZUFiTwOruOQV4Ho bFlf/1T3bnb68a3kH2AjOf52SV/bQA0BC9SZ4YleFcXRQXXlSf0AFuKPaIyD4tWhXgTF cFlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Er05wIV3; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gb17-20020a170907961100b007827639faffsi2192381ejc.760.2022.11.11.06.39.07; Fri, 11 Nov 2022 06:39:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Er05wIV3; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234506AbiKKOJn (ORCPT + 99 others); Fri, 11 Nov 2022 09:09:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234874AbiKKOHs (ORCPT ); Fri, 11 Nov 2022 09:07:48 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E25C09B55B; Fri, 11 Nov 2022 06:00:23 -0800 (PST) Message-ID: <20221111135206.688367117@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1668175131; 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: references:references; bh=8LlK3JaLUlNPvY1OMKf4DIZ6KPBnqoAfjrM8HhykhKw=; b=Er05wIV3y7qyjvKHAe9RHM3QTy3fJwOqgzu/VcwYLfx7ZwsTTFjMF6+0Imrtr3ibuoQ0nN 55tOvYFkgvSXcp5RTRpXkGT0EUEnkV9etxGpkhwWAnEF4da/H3bR7ENs0l2Uj5i4y58FPU PQkdHSe0AbeD/q90EluphJalKYr2NRkxgM/LisWMiKJPG5dUCZKIaZFJwRM+yTnN477C7U tu97FdP0R5lnrjOOT3FavfkvBmoKlTYvojRlIrwPWRr3Qi/JJcVRBMNESn1EmknKSqS9ve RFbq3mdQjyh9b+8Mvp1U2fd4/3AglhXpr0krNJsEg72XetXqTtEe1PSlOFL34A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1668175131; 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: references:references; bh=8LlK3JaLUlNPvY1OMKf4DIZ6KPBnqoAfjrM8HhykhKw=; b=ptkecwef/JW8RO3aUBfzxGKEs8ZReI0FnVOn86e6JdzESmIs6tI37lSrIEayOc1aaQ1gCb PgR6vQUlhV/dEnAw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Joerg Roedel , Will Deacon , linux-pci@vger.kernel.org, Bjorn Helgaas , Lorenzo Pieralisi , Marc Zyngier , Greg Kroah-Hartman , Jason Gunthorpe , Dave Jiang , Alex Williamson , Kevin Tian , Dan Williams , Logan Gunthorpe , Ashok Raj , Jon Mason , Allen Hubbe , "Ahmed S. Darwish" , Reinette Chatre Subject: [patch 25/33] PCI/MSI: Provide post-enable dynamic allocation interfaces for MSI-X References: <20221111133158.196269823@linutronix.de> MIME-Version: 1.0 Date: Fri, 11 Nov 2022 14:58:51 +0100 (CET) X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749210966566924018?= X-GMAIL-MSGID: =?utf-8?q?1749210966566924018?= MSI-X vectors can be allocated after the initial MSI-X enablement, but this needs explicit support of the underlying interrupt domains. Provide a function to query the ability and functions to allocate/free individual vectors post-enable. The allocation can either request a specific index in the MSI-X table or with the index argument MSI_ANY_INDEX it allocates the next free vector. The return value is a struct msi_map which on success contains both index and the Linux interrupt number. In case of failure index is negative and the Linux interrupt number is 0. The allocation function is for a single MSI-X index at a time as that's sufficient for the most urgent use case VFIO to get rid of the 'disable MSI-X, reallocate, enable-MSI-X' cycle which is prone to lost interrupts and redirections to the legacy and obviously unhandled INTx. Also for the use cases Jason Gunthorpe pointed a single index allocation is sufficient. Signed-off-by: Thomas Gleixner Acked-by: Bjorn Helgaas --- drivers/pci/msi/api.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ drivers/pci/msi/irqdomain.c | 3 + include/linux/pci.h | 6 +++ 3 files changed, 75 insertions(+), 1 deletion(-) --- a/drivers/pci/msi/api.c +++ b/drivers/pci/msi/api.c @@ -113,6 +113,73 @@ int pci_enable_msix_range(struct pci_dev EXPORT_SYMBOL(pci_enable_msix_range); /** + * pci_msix_can_alloc_dyn - Query whether dynamic allocation after enabling + * MSI-X is supported + * + * @dev: PCI device to operate on + * + * Return: True if supported, false otherwise + */ +bool pci_msix_can_alloc_dyn(struct pci_dev *dev) +{ + if (!dev->msix_cap) + return false; + + return pci_msi_domain_supports(dev, MSI_FLAG_PCI_MSIX_ALLOC_DYN, DENY_LEGACY); +} +EXPORT_SYMBOL_GPL(pci_msix_can_alloc_dyn); + +/** + * pci_msix_alloc_irq_at - Allocate an MSI-X interrupt after enabling MSI-X + * at a given MSI-X vector index or any free vector index + * + * @dev: PCI device to operate on + * @index: Index to allocate. If @index == MSI_ANY_INDEX this allocates + * the next free index in the MSI-X table + * @affdesc: Optional pointer to an affinity descriptor structure. NULL otherwise + * + * Return: A struct msi_map + * + * On success msi_map::index contains the allocated index (>= 0) and + * msi_map::virq the allocated Linux interrupt number (> 0). + * + * On fail msi_map::index contains the error code and msi_map::virq + * is set to 0. + */ +struct msi_map pci_msix_alloc_irq_at(struct pci_dev *dev, unsigned int index, + const struct irq_affinity_desc *affdesc) +{ + struct msi_map map = { .index = -ENOTSUPP }; + + if (!dev->msix_enabled) + return map; + + if (!pci_msix_can_alloc_dyn(dev)) + return map; + + return msi_domain_alloc_irq_at(&dev->dev, MSI_DEFAULT_DOMAIN, index, affdesc, NULL); +} +EXPORT_SYMBOL_GPL(pci_msix_alloc_irq_at); + +/** + * pci_msix_free_irq - Free an interrupt on a PCI/MSIX interrupt domain + * which was allocated via pci_msix_alloc_irq_at() + * + * @dev: The PCI device to operate on + * @map: A struct msi_map describing the interrupt to free + * as returned from the allocation function. + */ +void pci_msix_free_irq(struct pci_dev *dev, struct msi_map map) +{ + if (WARN_ON_ONCE(map.index < 0 || map.virq <= 0)) + return; + if (WARN_ON_ONCE(!pci_msix_can_alloc_dyn(dev))) + return; + msi_domain_free_irqs_range(&dev->dev, MSI_DEFAULT_DOMAIN, map.index, map.index); +} +EXPORT_SYMBOL_GPL(pci_msix_free_irq); + +/** * pci_disable_msix() - Disable MSI-X interrupt mode on device * @dev: the PCI device to operate on * --- a/drivers/pci/msi/irqdomain.c +++ b/drivers/pci/msi/irqdomain.c @@ -225,7 +225,8 @@ static struct msi_domain_template pci_ms }, .info = { - .flags = MSI_COMMON_FLAGS | MSI_FLAG_PCI_MSIX, + .flags = MSI_COMMON_FLAGS | MSI_FLAG_PCI_MSIX | + MSI_FLAG_PCI_MSIX_ALLOC_DYN, .bus_token = DOMAIN_BUS_PCI_DEVICE_MSIX, }, }; --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -1559,6 +1560,11 @@ int pci_alloc_irq_vectors_affinity(struc unsigned int max_vecs, unsigned int flags, struct irq_affinity *affd); +bool pci_msix_can_alloc_dyn(struct pci_dev *dev); +struct msi_map pci_msix_alloc_irq_at(struct pci_dev *dev, unsigned int index, + const struct irq_affinity_desc *affdesc); +void pci_msix_free_irq(struct pci_dev *pdev, struct msi_map map); + void pci_free_irq_vectors(struct pci_dev *dev); int pci_irq_vector(struct pci_dev *dev, unsigned int nr); const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev, int vec);