From nobody Wed Jul 1 18:58:20 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18663C433FE for ; Thu, 16 Dec 2021 21:42:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242215AbhLPVmR (ORCPT ); Thu, 16 Dec 2021 16:42:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242004AbhLPVlA (ORCPT ); Thu, 16 Dec 2021 16:41:00 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F827C06175B; Thu, 16 Dec 2021 13:40:42 -0800 (PST) Date: Thu, 16 Dec 2021 21:40:39 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1639690840; h=from:from:sender:sender:reply-to: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=WYWHQGKiQOFIDQ6lnL4KVWs3PxSo9uzYPRtrz25eAeo=; b=RHY1CdV84K54/wgm0kSD9Vqq8GSmI2Q6cZ5AybXJyN/lWSsyXCRymIoz5keQfr3p6SevYJ qe+BuSDOlUgAnb9AL5M3XJMbePEfW3MpCLu0k2BRCVuwCSP9O1OkRsOU09TE4drw/LvBO/ HNFb3wOOHQEwcFrlZsYL7v00nl/22Mc8HbWwaKP8odz+L4bUOEgOOmLdwP1YRZ8wmV6+Rg 7CWreWTOjHuXVuy0XS+gb2EKO48kFnrKgpNGFzL69Fw4+Xi7GDxZd1Qrsd160LWTtwJMt0 VgoKSI+5EUJ68MLLLS4iE47mh4anGwSnHUrPNxLU/SrgJAdCDybfIDwilF1LNg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1639690840; h=from:from:sender:sender:reply-to: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=WYWHQGKiQOFIDQ6lnL4KVWs3PxSo9uzYPRtrz25eAeo=; b=7UurfSTs7r/4tFMxFRvWD8VXLz/F30CnIga5TzKPmXUPEbU220ASX6G44fAreWJLNa25d/ yDFkqKpgVIhb//DA== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/msi] PCI/MSI: Protect MSI operations Cc: Thomas Gleixner , Michael Kelley , Nishanth Menon , Jason Gunthorpe , Bjorn Helgaas , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20211206210747.982292705@linutronix.de> References: <20211206210747.982292705@linutronix.de> MIME-Version: 1.0 Message-ID: <163969083980.23020.1709707505861502651.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the irq/msi branch of tip: Commit-ID: 5512c5eaf533a98d33a8dc0dcf415e72773184c8 Gitweb: https://git.kernel.org/tip/5512c5eaf533a98d33a8dc0dcf415e727= 73184c8 Author: Thomas Gleixner AuthorDate: Mon, 06 Dec 2021 23:51:13 +01:00 Committer: Thomas Gleixner CommitterDate: Thu, 16 Dec 2021 22:22:17 +01:00 PCI/MSI: Protect MSI operations To prepare for dynamic extension of MSI-X vectors, protect the MSI operations for MSI and MSI-X. This requires to move the invocation of irq_create_affinity_masks() out of the descriptor lock section to avoid reverse lock ordering vs. CPU hotplug lock as some callers of the PCI/MSI allocation interfaces already hold it. Signed-off-by: Thomas Gleixner Tested-by: Michael Kelley Tested-by: Nishanth Menon Reviewed-by: Jason Gunthorpe Acked-by: Bjorn Helgaas Link: https://lore.kernel.org/r/20211206210747.982292705@linutronix.de --- drivers/pci/msi/irqdomain.c | 4 +- drivers/pci/msi/msi.c | 100 +++++++++++++++++++++-------------- 2 files changed, 63 insertions(+), 41 deletions(-) diff --git a/drivers/pci/msi/irqdomain.c b/drivers/pci/msi/irqdomain.c index 180b2a1..c81793a 100644 --- a/drivers/pci/msi/irqdomain.c +++ b/drivers/pci/msi/irqdomain.c @@ -14,7 +14,7 @@ int pci_msi_setup_msi_irqs(struct pci_dev *dev, int nvec,= int type) =20 domain =3D dev_get_msi_domain(&dev->dev); if (domain && irq_domain_is_hierarchy(domain)) - return msi_domain_alloc_irqs(domain, &dev->dev, nvec); + return msi_domain_alloc_irqs_descs_locked(domain, &dev->dev, nvec); =20 return pci_msi_legacy_setup_msi_irqs(dev, nvec, type); } @@ -25,7 +25,7 @@ void pci_msi_teardown_msi_irqs(struct pci_dev *dev) =20 domain =3D dev_get_msi_domain(&dev->dev); if (domain && irq_domain_is_hierarchy(domain)) - msi_domain_free_irqs(domain, &dev->dev); + msi_domain_free_irqs_descs_locked(domain, &dev->dev); else pci_msi_legacy_teardown_msi_irqs(dev); } diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c index 0909b27..c9a03f9 100644 --- a/drivers/pci/msi/msi.c +++ b/drivers/pci/msi/msi.c @@ -320,11 +320,13 @@ static void __pci_restore_msix_state(struct pci_dev *= dev) =20 write_msg =3D arch_restore_msi_irqs(dev); =20 + msi_lock_descs(&dev->dev); for_each_pci_msi_entry(entry, dev) { if (write_msg) __pci_write_msi_msg(entry, &entry->msg); pci_msix_write_vector_ctrl(entry, entry->pci.msix_ctrl); } + msi_unlock_descs(&dev->dev); =20 pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL, 0); } @@ -375,19 +377,15 @@ static int pci_setup_msi_context(struct pci_dev *dev) } =20 static struct msi_desc * -msi_setup_entry(struct pci_dev *dev, int nvec, struct irq_affinity *affd) +msi_setup_entry(struct pci_dev *dev, int nvec, struct irq_affinity_desc *m= asks) { - struct irq_affinity_desc *masks =3D NULL; struct msi_desc *entry; u16 control; =20 - if (affd) - masks =3D irq_create_affinity_masks(nvec, affd); - /* MSI Entry Initialization */ entry =3D alloc_msi_entry(&dev->dev, nvec, masks); if (!entry) - goto out; + return NULL; =20 pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &control); /* Lies, damned lies, and MSIs */ @@ -410,8 +408,7 @@ msi_setup_entry(struct pci_dev *dev, int nvec, struct i= rq_affinity *affd) if (entry->pci.msi_attrib.can_mask) pci_read_config_dword(dev, entry->pci.mask_pos, &entry->pci.msi_mask); =20 -out: - kfree(masks); + return entry; } =20 @@ -447,6 +444,7 @@ static int msi_verify_entries(struct pci_dev *dev) static int msi_capability_init(struct pci_dev *dev, int nvec, struct irq_affinity *affd) { + struct irq_affinity_desc *masks =3D NULL; struct msi_desc *entry; int ret; =20 @@ -457,7 +455,11 @@ static int msi_capability_init(struct pci_dev *dev, in= t nvec, pci_msi_set_enable(dev, 0); dev->msi_enabled =3D 1; =20 - entry =3D msi_setup_entry(dev, nvec, affd); + if (affd) + masks =3D irq_create_affinity_masks(nvec, affd); + + msi_lock_descs(&dev->dev); + entry =3D msi_setup_entry(dev, nvec, masks); if (!entry) { ret =3D -ENOMEM; goto fail; @@ -483,13 +485,16 @@ static int msi_capability_init(struct pci_dev *dev, i= nt nvec, =20 pcibios_free_irq(dev); dev->irq =3D entry->irq; - return 0; + goto unlock; =20 err: pci_msi_unmask(entry, msi_multi_mask(entry)); free_msi_irqs(dev); fail: dev->msi_enabled =3D 0; +unlock: + msi_unlock_descs(&dev->dev); + kfree(masks); return ret; } =20 @@ -516,23 +521,18 @@ static void __iomem *msix_map_region(struct pci_dev *= dev, =20 static int msix_setup_entries(struct pci_dev *dev, void __iomem *base, struct msix_entry *entries, int nvec, - struct irq_affinity *affd) + struct irq_affinity_desc *masks) { - struct irq_affinity_desc *curmsk, *masks =3D NULL; + int i, vec_count =3D pci_msix_vec_count(dev); + struct irq_affinity_desc *curmsk; struct msi_desc *entry; void __iomem *addr; - int ret, i; - int vec_count =3D pci_msix_vec_count(dev); - - if (affd) - masks =3D irq_create_affinity_masks(nvec, affd); =20 for (i =3D 0, curmsk =3D masks; i < nvec; i++) { entry =3D alloc_msi_entry(&dev->dev, 1, curmsk); if (!entry) { /* No enough memory. Don't try again */ - ret =3D -ENOMEM; - goto out; + return -ENOMEM; } =20 entry->pci.msi_attrib.is_msix =3D 1; @@ -560,10 +560,7 @@ static int msix_setup_entries(struct pci_dev *dev, voi= d __iomem *base, if (masks) curmsk++; } - ret =3D 0; -out: - kfree(masks); - return ret; + return 0; } =20 static void msix_update_entries(struct pci_dev *dev, struct msix_entry *en= tries) @@ -590,6 +587,41 @@ static void msix_mask_all(void __iomem *base, int tsiz= e) writel(ctrl, base + PCI_MSIX_ENTRY_VECTOR_CTRL); } =20 +static int msix_setup_interrupts(struct pci_dev *dev, void __iomem *base, + struct msix_entry *entries, int nvec, + struct irq_affinity *affd) +{ + struct irq_affinity_desc *masks =3D NULL; + int ret; + + if (affd) + masks =3D irq_create_affinity_masks(nvec, affd); + + msi_lock_descs(&dev->dev); + ret =3D msix_setup_entries(dev, base, entries, nvec, masks); + if (ret) + goto out_free; + + ret =3D pci_msi_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX); + if (ret) + goto out_free; + + /* Check if all MSI entries honor device restrictions */ + ret =3D msi_verify_entries(dev); + if (ret) + goto out_free; + + msix_update_entries(dev, entries); + goto out_unlock; + +out_free: + free_msi_irqs(dev); +out_unlock: + msi_unlock_descs(&dev->dev); + kfree(masks); + return ret; +} + /** * msix_capability_init - configure device's MSI-X capability * @dev: pointer to the pci_dev data structure of MSI-X device function @@ -630,20 +662,9 @@ static int msix_capability_init(struct pci_dev *dev, s= truct msix_entry *entries, =20 dev->msix_base =3D base; =20 - ret =3D msix_setup_entries(dev, base, entries, nvec, affd); + ret =3D msix_setup_interrupts(dev, base, entries, nvec, affd); if (ret) - goto out_free; - - ret =3D pci_msi_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX); - if (ret) - goto out_free; - - /* Check if all MSI entries honor device restrictions */ - ret =3D msi_verify_entries(dev); - if (ret) - goto out_free; - - msix_update_entries(dev, entries); + goto out_disable; =20 /* Disable INTX */ pci_intx_for_msi(dev, 0); @@ -662,9 +683,6 @@ static int msix_capability_init(struct pci_dev *dev, st= ruct msix_entry *entries, pcibios_free_irq(dev); return 0; =20 -out_free: - free_msi_irqs(dev); - out_disable: dev->msix_enabled =3D 0; pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL | PCI_MSIX_FLAGS_= ENABLE, 0); @@ -773,8 +791,10 @@ void pci_disable_msi(struct pci_dev *dev) if (!pci_msi_enable || !dev || !dev->msi_enabled) return; =20 + msi_lock_descs(&dev->dev); pci_msi_shutdown(dev); free_msi_irqs(dev); + msi_unlock_descs(&dev->dev); } EXPORT_SYMBOL(pci_disable_msi); =20 @@ -860,8 +880,10 @@ void pci_disable_msix(struct pci_dev *dev) if (!pci_msi_enable || !dev || !dev->msix_enabled) return; =20 + msi_lock_descs(&dev->dev); pci_msix_shutdown(dev); free_msi_irqs(dev); + msi_unlock_descs(&dev->dev); } EXPORT_SYMBOL(pci_disable_msix); =20