From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: linux-hyperv@vger.kernel.org, Paul Mackerras <paulus@samba.org>, sparclinux@vger.kernel.org, Wei Liu <wei.liu@kernel.org>, Ashok Raj <ashok.raj@intel.com>, Marc Zygnier <maz@kernel.org>, x86@kernel.org, Christian Borntraeger <borntraeger@de.ibm.com>, Bjorn Helgaas <helgaas@kernel.org>, Jason Gunthorpe <jgg@nvidia.com>, linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org, ath11k@lists.infradead.org, Kevin Tian <kevin.tian@intel.com>, Heiko Carstens <hca@linux.ibm.com>, Alex Williamson <alex.williamson@redhat.com>, Megha Dey <megha.dey@intel.com>, Juergen Gross <jgross@suse.com>, Thomas Bogendoerfer <tsbogend@alpha.franken.de>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [patch 19/22] PCI/MSI: Sanitize MSIX table map handling Date: Sat, 27 Nov 2021 02:19:04 +0100 (CET) [thread overview] Message-ID: <20211126223825.205369150@linutronix.de> (raw) In-Reply-To: 20211126222700.862407977@linutronix.de Unmapping the MSIX base mapping in the loops which allocate/free MSI desciptors is daft and in the way of allowing runtime expansion of MSI-X descriptors. Store the mapping in struct pci_dev and free it after freeing the MSI-X descriptors. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- drivers/pci/msi/msi.c | 18 ++++++++---------- include/linux/pci.h | 1 + 2 files changed, 9 insertions(+), 10 deletions(-) --- a/drivers/pci/msi/msi.c +++ b/drivers/pci/msi/msi.c @@ -241,14 +241,14 @@ static void free_msi_irqs(struct pci_dev pci_msi_teardown_msi_irqs(dev); list_for_each_entry_safe(entry, tmp, msi_list, list) { - if (entry->pci.msi_attrib.is_msix) { - if (list_is_last(&entry->list, msi_list)) - iounmap(entry->pci.mask_base); - } - list_del(&entry->list); free_msi_entry(entry); } + + if (dev->msix_base) { + iounmap(dev->msix_base); + dev->msix_base = NULL; + } } static void pci_intx_for_msi(struct pci_dev *dev, int enable) @@ -501,10 +501,6 @@ static int msix_setup_entries(struct pci for (i = 0, curmsk = masks; i < nvec; i++) { entry = alloc_msi_entry(&dev->dev, 1, curmsk); if (!entry) { - if (!i) - iounmap(base); - else - free_msi_irqs(dev); /* No enough memory. Don't try again */ ret = -ENOMEM; goto out; @@ -602,12 +598,14 @@ static int msix_capability_init(struct p goto out_disable; } + dev->msix_base = base; + /* Ensure that all table entries are masked. */ msix_mask_all(base, tsize); ret = msix_setup_entries(dev, base, entries, nvec, affd); if (ret) - goto out_disable; + goto out_free; ret = pci_msi_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX); if (ret) --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -473,6 +473,7 @@ struct pci_dev { u8 ptm_granularity; #endif #ifdef CONFIG_PCI_MSI + void __iomem *msix_base; const struct attribute_group **msi_irq_groups; #endif struct pci_vpd vpd;
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: linux-hyperv@vger.kernel.org, Paul Mackerras <paulus@samba.org>, sparclinux@vger.kernel.org, Wei Liu <wei.liu@kernel.org>, Ashok Raj <ashok.raj@intel.com>, Marc Zygnier <maz@kernel.org>, x86@kernel.org, Christian Borntraeger <borntraeger@de.ibm.com>, Bjorn Helgaas <helgaas@kernel.org>, Jason Gunthorpe <jgg@nvidia.com>, linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org, ath11k@lists.infradead.org, Kevin Tian <kevin.tian@intel.com>, Heiko Carstens <hca@linux.ibm.com>, Alex Williamson <alex.williamson@redhat.com>, Megha Dey <megha.dey@intel.com>, Juergen Gross <jgross@suse.com>, Thomas Bogendoerfer <tsbogend@alpha.franken.de>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [patch 19/22] PCI/MSI: Sanitize MSIX table map handling Date: Sat, 27 Nov 2021 02:19:50 +0100 (CET) [thread overview] Message-ID: <20211126223825.205369150@linutronix.de> (raw) Message-ID: <20211127011950.HZxrg_djEE8mTrIN4t7PA2osmbAuw7RzJgZk61SfksU@z> (raw) In-Reply-To: 20211126222700.862407977@linutronix.de Unmapping the MSIX base mapping in the loops which allocate/free MSI desciptors is daft and in the way of allowing runtime expansion of MSI-X descriptors. Store the mapping in struct pci_dev and free it after freeing the MSI-X descriptors. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- drivers/pci/msi/msi.c | 18 ++++++++---------- include/linux/pci.h | 1 + 2 files changed, 9 insertions(+), 10 deletions(-) --- a/drivers/pci/msi/msi.c +++ b/drivers/pci/msi/msi.c @@ -241,14 +241,14 @@ static void free_msi_irqs(struct pci_dev pci_msi_teardown_msi_irqs(dev); list_for_each_entry_safe(entry, tmp, msi_list, list) { - if (entry->pci.msi_attrib.is_msix) { - if (list_is_last(&entry->list, msi_list)) - iounmap(entry->pci.mask_base); - } - list_del(&entry->list); free_msi_entry(entry); } + + if (dev->msix_base) { + iounmap(dev->msix_base); + dev->msix_base = NULL; + } } static void pci_intx_for_msi(struct pci_dev *dev, int enable) @@ -501,10 +501,6 @@ static int msix_setup_entries(struct pci for (i = 0, curmsk = masks; i < nvec; i++) { entry = alloc_msi_entry(&dev->dev, 1, curmsk); if (!entry) { - if (!i) - iounmap(base); - else - free_msi_irqs(dev); /* No enough memory. Don't try again */ ret = -ENOMEM; goto out; @@ -602,12 +598,14 @@ static int msix_capability_init(struct p goto out_disable; } + dev->msix_base = base; + /* Ensure that all table entries are masked. */ msix_mask_all(base, tsize); ret = msix_setup_entries(dev, base, entries, nvec, affd); if (ret) - goto out_disable; + goto out_free; ret = pci_msi_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX); if (ret) --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -473,6 +473,7 @@ struct pci_dev { u8 ptm_granularity; #endif #ifdef CONFIG_PCI_MSI + void __iomem *msix_base; const struct attribute_group **msi_irq_groups; #endif struct pci_vpd vpd;
next prev parent reply other threads:[~2021-11-27 1:32 UTC|newest] Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-27 1:18 [patch 00/22] genirq/msi, PCI/MSI: Spring cleaning - Part 1 Thomas Gleixner 2021-11-27 1:18 ` [patch 01/22] powerpc/4xx: Remove MSI support which never worked Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 02/22] PCI/MSI: Fix pci_irq_vector()/pci_irq_get_attinity() Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 03/22] genirq/msi: Guard sysfs code Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 04/22] genirq/msi: Remove unused domain callbacks Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 05/22] genirq/msi: Fixup includes Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-29 7:33 ` Cédric Le Goater 2021-11-29 21:38 ` Thomas Gleixner 2021-11-30 21:48 ` Cédric Le Goater 2021-11-30 22:10 ` Thomas Gleixner 2021-11-30 22:41 ` Thomas Gleixner 2021-12-01 7:14 ` Cédric Le Goater 2021-12-01 10:48 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 06/22] PCI/MSI: Make pci_msi_domain_write_msg() static Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 07/22] PCI/MSI: Remove msi_desc_to_pci_sysdata() Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 08/22] PCI/sysfs: Use pci_irq_vector() Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 09/22] MIPS: Octeon: Use arch_setup_msi_irq() Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-29 10:21 ` Thomas Bogendoerfer 2021-11-27 1:18 ` [patch 10/22] genirq/msi, treewide: Use a named struct for PCI/MSI attributes Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-29 9:29 ` Kalle Valo 2021-11-27 1:18 ` [patch 11/22] x86/hyperv: Refactor hv_msi_domain_free_irqs() Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-12-02 14:36 ` Wei Liu 2021-11-27 1:18 ` [patch 12/22] PCI/MSI: Make arch_restore_msi_irqs() less horrible Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 13/22] PCI/MSI: Cleanup include zoo Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 14/22] PCI/MSI: Make msix_update_entries() smarter Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 15/22] PCI/MSI: Move code into a separate directory Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 16/22] PCI/MSI: Split out CONFIG_PCI_MSI independent part Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:19 ` [patch 17/22] PCI/MSI: Split out !IRQDOMAIN code Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-29 7:47 ` Cédric Le Goater 2021-11-29 7:51 ` Cédric Le Goater 2021-11-27 1:19 ` [patch 18/22] PCI/MSI: Split out irqdomain code Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner [this message] 2021-11-27 1:19 ` [patch 19/22] PCI/MSI: Sanitize MSIX table map handling Thomas Gleixner 2021-11-27 1:19 ` [patch 20/22] PCI/MSI: Make pci_msi_domain_check_cap() static Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:19 ` [patch 21/22] genirq/msi: Handle PCI/MSI allocation fail in core code Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:19 ` [patch 22/22] PCI/MSI: Move descriptor counting on allocation fail to the legacy code Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:19 ` [patch 00/22] genirq/msi, PCI/MSI: Spring cleaning - Part 1 Thomas Gleixner 2021-11-28 0:08 ` Jason Gunthorpe 2021-11-28 11:15 ` Juergen Gross 2021-11-29 9:52 ` Cédric Le Goater
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211126223825.205369150@linutronix.de \ --to=tglx@linutronix.de \ --cc=alex.williamson@redhat.com \ --cc=ashok.raj@intel.com \ --cc=ath11k@lists.infradead.org \ --cc=borntraeger@de.ibm.com \ --cc=gregkh@linuxfoundation.org \ --cc=hca@linux.ibm.com \ --cc=helgaas@kernel.org \ --cc=jgg@nvidia.com \ --cc=jgross@suse.com \ --cc=kevin.tian@intel.com \ --cc=linux-hyperv@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mips@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=maz@kernel.org \ --cc=megha.dey@intel.com \ --cc=paulus@samba.org \ --cc=sparclinux@vger.kernel.org \ --cc=tsbogend@alpha.franken.de \ --cc=wei.liu@kernel.org \ --cc=x86@kernel.org \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).