From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: Bjorn Helgaas <helgaas@kernel.org>, Marc Zygnier <maz@kernel.org>, Alex Williamson <alex.williamson@redhat.com>, Kevin Tian <kevin.tian@intel.com>, Jason Gunthorpe <jgg@nvidia.com>, Megha Dey <megha.dey@intel.com>, Ashok Raj <ashok.raj@intel.com>, linux-pci@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-s390@vger.kernel.org, Heiko Carstens <hca@linux.ibm.com>, Christian Borntraeger <borntraeger@de.ibm.com>, Jon Mason <jdmason@kudzu.us>, Dave Jiang <dave.jiang@intel.com>, Allen Hubbe <allenbh@gmail.com>, linux-ntb@googlegroups.com Subject: [patch 28/32] genirq/msi: Convert to new functions Date: Sat, 27 Nov 2021 02:23:10 +0100 (CET) [thread overview] Message-ID: <20211126232735.966439698@linutronix.de> (raw) In-Reply-To: 20211126230957.239391799@linutronix.de Use the new iterator functions and add locking where required. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- kernel/irq/msi.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -354,6 +354,7 @@ struct msi_desc *msi_next_desc(struct de int __msi_get_virq(struct device *dev, unsigned int index) { struct msi_desc *desc; + int ret = -ENOENT; bool pcimsi; if (!dev->msi.data) @@ -361,11 +362,12 @@ int __msi_get_virq(struct device *dev, u pcimsi = msi_device_has_property(dev, MSI_PROP_PCI_MSI); - for_each_msi_entry(desc, dev) { + msi_lock_descs(dev); + msi_for_each_desc_from(desc, dev, MSI_DESC_ASSOCIATED, index) { /* PCI-MSI has only one descriptor for multiple interrupts. */ if (pcimsi) { - if (desc->irq && index < desc->nvec_used) - return desc->irq + index; + if (index < desc->nvec_used) + ret = desc->irq + index; break; } @@ -373,10 +375,13 @@ int __msi_get_virq(struct device *dev, u * PCI-MSIX and platform MSI use a descriptor per * interrupt. */ - if (desc->msi_index == index) - return desc->irq; + if (desc->msi_index == index) { + ret = desc->irq; + break; + } } - return -ENOENT; + msi_unlock_descs(dev); + return ret; } EXPORT_SYMBOL_GPL(__msi_get_virq); @@ -407,7 +412,7 @@ static const struct attribute_group **ms int i; /* Determine how many msi entries we have */ - for_each_msi_entry(entry, dev) + msi_for_each_desc(entry, dev, MSI_DESC_ALL) num_msi += entry->nvec_used; if (!num_msi) return NULL; @@ -417,7 +422,7 @@ static const struct attribute_group **ms if (!msi_attrs) return ERR_PTR(-ENOMEM); - for_each_msi_entry(entry, dev) { + msi_for_each_desc(entry, dev, MSI_DESC_ALL) { for (i = 0; i < entry->nvec_used; i++) { msi_dev_attr = kzalloc(sizeof(*msi_dev_attr), GFP_KERNEL); if (!msi_dev_attr) @@ -838,7 +843,7 @@ static bool msi_check_reservation_mode(s * Checking the first MSI descriptor is sufficient. MSIX supports * masking and MSI does so when the can_mask attribute is set. */ - desc = first_msi_entry(dev); + desc = msi_first_desc(dev); return desc->pci.msi_attrib.is_msix || desc->pci.msi_attrib.can_mask; }
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: Bjorn Helgaas <helgaas@kernel.org>, Marc Zygnier <maz@kernel.org>, Alex Williamson <alex.williamson@redhat.com>, Kevin Tian <kevin.tian@intel.com>, Jason Gunthorpe <jgg@nvidia.com>, Megha Dey <megha.dey@intel.com>, Ashok Raj <ashok.raj@intel.com>, linux-pci@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-s390@vger.kernel.org, Heiko Carstens <hca@linux.ibm.com>, Christian Borntraeger <borntraeger@de.ibm.com>, Jon Mason <jdmason@kudzu.us>, Dave Jiang <dave.jiang@intel.com>, Allen Hubbe <allenbh@gmail.com>, linux-ntb@googlegroups.com Subject: [patch 28/32] genirq/msi: Convert to new functions Date: Sat, 27 Nov 2021 02:24:12 +0100 (CET) [thread overview] Message-ID: <20211126232735.966439698@linutronix.de> (raw) Message-ID: <20211127012412.4FMuMWSDfoNPv-unPnVHR7mdkRLGsRAfSq_K5jPBqpY@z> (raw) In-Reply-To: 20211126230957.239391799@linutronix.de Use the new iterator functions and add locking where required. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- kernel/irq/msi.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -354,6 +354,7 @@ struct msi_desc *msi_next_desc(struct de int __msi_get_virq(struct device *dev, unsigned int index) { struct msi_desc *desc; + int ret = -ENOENT; bool pcimsi; if (!dev->msi.data) @@ -361,11 +362,12 @@ int __msi_get_virq(struct device *dev, u pcimsi = msi_device_has_property(dev, MSI_PROP_PCI_MSI); - for_each_msi_entry(desc, dev) { + msi_lock_descs(dev); + msi_for_each_desc_from(desc, dev, MSI_DESC_ASSOCIATED, index) { /* PCI-MSI has only one descriptor for multiple interrupts. */ if (pcimsi) { - if (desc->irq && index < desc->nvec_used) - return desc->irq + index; + if (index < desc->nvec_used) + ret = desc->irq + index; break; } @@ -373,10 +375,13 @@ int __msi_get_virq(struct device *dev, u * PCI-MSIX and platform MSI use a descriptor per * interrupt. */ - if (desc->msi_index == index) - return desc->irq; + if (desc->msi_index == index) { + ret = desc->irq; + break; + } } - return -ENOENT; + msi_unlock_descs(dev); + return ret; } EXPORT_SYMBOL_GPL(__msi_get_virq); @@ -407,7 +412,7 @@ static const struct attribute_group **ms int i; /* Determine how many msi entries we have */ - for_each_msi_entry(entry, dev) + msi_for_each_desc(entry, dev, MSI_DESC_ALL) num_msi += entry->nvec_used; if (!num_msi) return NULL; @@ -417,7 +422,7 @@ static const struct attribute_group **ms if (!msi_attrs) return ERR_PTR(-ENOMEM); - for_each_msi_entry(entry, dev) { + msi_for_each_desc(entry, dev, MSI_DESC_ALL) { for (i = 0; i < entry->nvec_used; i++) { msi_dev_attr = kzalloc(sizeof(*msi_dev_attr), GFP_KERNEL); if (!msi_dev_attr) @@ -838,7 +843,7 @@ static bool msi_check_reservation_mode(s * Checking the first MSI descriptor is sufficient. MSIX supports * masking and MSI does so when the can_mask attribute is set. */ - desc = first_msi_entry(dev); + desc = msi_first_desc(dev); return desc->pci.msi_attrib.is_msix || desc->pci.msi_attrib.can_mask; }
next prev parent reply other threads:[~2021-11-27 1:31 UTC|newest] Thread overview: 184+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-27 1:22 [patch 00/32] genirq/msi, PCI/MSI: Spring cleaning - Part 2 Thomas Gleixner 2021-11-27 1:22 ` [patch 01/32] genirq/msi: Move descriptor list to struct msi_device_data Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 12:19 ` Greg Kroah-Hartman 2021-11-27 1:22 ` [patch 02/32] genirq/msi: Add mutex for MSI list protection Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 03/32] genirq/msi: Provide msi_domain_alloc/free_irqs_descs_locked() Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 04/32] genirq/msi: Provide a set of advanced MSI accessors and iterators Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-28 1:00 ` Jason Gunthorpe 2021-11-28 19:22 ` Thomas Gleixner 2021-11-29 9:26 ` Thomas Gleixner 2021-11-29 14:01 ` Jason Gunthorpe 2021-11-29 14:46 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 05/32] genirq/msi: Provide msi_alloc_msi_desc() and a simple allocator Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 06/32] genirq/msi: Provide domain flags to allocate/free MSI descriptors automatically Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 07/32] genirq/msi: Count the allocated MSI descriptors Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 12:19 ` Greg Kroah-Hartman 2021-11-27 19:22 ` Thomas Gleixner 2021-11-27 19:45 ` Thomas Gleixner 2021-11-28 11:07 ` Greg Kroah-Hartman 2021-11-28 19:23 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 08/32] PCI/MSI: Protect MSI operations Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 09/32] PCI/MSI: Use msi_add_msi_desc() Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 10/32] PCI/MSI: Let core code free MSI descriptors Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 11/32] PCI/MSI: Use msi_on_each_desc() Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 12/32] x86/pci/xen: Use msi_for_each_desc() Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 13/32] xen/pcifront: Rework MSI handling Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 14/32] s390/pci: Rework MSI descriptor walk Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-29 10:31 ` Niklas Schnelle 2021-11-29 13:04 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 15/32] powerpc/4xx/hsta: Rework MSI handling Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 16/32] powerpc/cell/axon_msi: Convert to msi_on_each_desc() Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 17/32] powerpc/pasemi/msi: Convert to msi_on_each_dec() Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 18/32] powerpc/fsl_msi: Use msi_for_each_desc() Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 19/32] powerpc/mpic_u3msi: Use msi_for_each-desc() Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner 2021-11-27 1:22 ` [patch 20/32] PCI: hv: Rework MSI handling Thomas Gleixner 2021-11-27 1:24 ` Thomas Gleixner 2021-11-27 1:23 ` [patch 21/32] NTB/msi: Convert to msi_on_each_desc() Thomas Gleixner 2021-11-27 1:24 ` Thomas Gleixner 2021-11-29 18:21 ` Logan Gunthorpe 2021-11-29 20:51 ` Thomas Gleixner 2021-11-29 22:27 ` Logan Gunthorpe 2021-11-29 22:50 ` Dave Jiang 2021-11-29 23:31 ` Jason Gunthorpe 2021-11-29 23:52 ` Logan Gunthorpe 2021-11-30 0:01 ` Jason Gunthorpe 2021-11-30 0:29 ` Thomas Gleixner 2021-11-30 19:21 ` Logan Gunthorpe 2021-11-30 19:48 ` Thomas Gleixner 2021-11-30 20:14 ` Logan Gunthorpe 2021-11-30 20:28 ` Jason Gunthorpe 2021-11-30 21:23 ` Thomas Gleixner 2021-12-01 0:17 ` Jason Gunthorpe 2021-12-01 10:16 ` Thomas Gleixner 2021-12-01 13:00 ` Jason Gunthorpe 2021-12-01 17:35 ` Thomas Gleixner 2021-12-01 18:14 ` Jason Gunthorpe 2021-12-01 18:46 ` Logan Gunthorpe 2021-12-01 20:21 ` Thomas Gleixner 2021-12-02 0:01 ` Thomas Gleixner 2021-12-02 13:55 ` Jason Gunthorpe 2021-12-02 14:23 ` Greg Kroah-Hartman 2021-12-02 14:45 ` Jason Gunthorpe 2021-12-02 19:25 ` Thomas Gleixner 2021-12-02 20:00 ` Jason Gunthorpe 2021-12-02 22:31 ` Thomas Gleixner 2021-12-03 0:37 ` Jason Gunthorpe 2021-12-03 15:07 ` Thomas Gleixner 2021-12-03 16:41 ` Jason Gunthorpe 2021-12-04 14:20 ` Thomas Gleixner 2021-12-05 14:16 ` Thomas Gleixner 2021-12-06 14:43 ` Jason Gunthorpe 2021-12-06 15:47 ` Thomas Gleixner 2021-12-06 17:00 ` Jason Gunthorpe 2021-12-06 20:28 ` Thomas Gleixner 2021-12-06 21:06 ` Jason Gunthorpe 2021-12-06 22:21 ` Thomas Gleixner 2021-12-06 14:19 ` Jason Gunthorpe 2021-12-06 15:06 ` Thomas Gleixner 2021-12-09 6:26 ` Tian, Kevin 2021-12-09 9:03 ` Thomas Gleixner 2021-12-09 12:17 ` Tian, Kevin 2021-12-09 15:57 ` Thomas Gleixner 2021-12-10 7:37 ` Tian, Kevin 2021-12-09 5:41 ` Tian, Kevin 2021-12-09 5:47 ` Jason Wang 2021-12-01 16:28 ` Dave Jiang 2021-12-01 18:41 ` Thomas Gleixner 2021-12-01 18:47 ` Dave Jiang 2021-12-01 20:25 ` Thomas Gleixner 2021-12-01 21:21 ` Dave Jiang 2021-12-01 21:44 ` Thomas Gleixner 2021-12-01 21:49 ` Dave Jiang 2021-12-01 22:03 ` Thomas Gleixner 2021-12-01 22:53 ` Dave Jiang 2021-12-01 23:57 ` Thomas Gleixner 2021-12-09 5:23 ` Tian, Kevin 2021-12-09 8:37 ` Thomas Gleixner 2021-12-09 12:31 ` Tian, Kevin 2021-12-09 16:21 ` Jason Gunthorpe 2021-12-09 20:32 ` Thomas Gleixner 2021-12-09 20:58 ` Jason Gunthorpe 2021-12-09 22:09 ` Thomas Gleixner 2021-12-10 0:26 ` Thomas Gleixner 2021-12-10 7:29 ` Tian, Kevin 2021-12-10 12:13 ` Thomas Gleixner 2021-12-11 8:06 ` Tian, Kevin 2021-12-10 12:39 ` Jason Gunthorpe 2021-12-10 19:00 ` Thomas Gleixner 2021-12-11 7:44 ` Tian, Kevin 2021-12-11 13:04 ` Thomas Gleixner 2021-12-12 1:56 ` Tian, Kevin 2021-12-12 20:55 ` Thomas Gleixner 2021-12-12 23:37 ` Jason Gunthorpe 2021-12-13 7:50 ` Tian, Kevin 2022-09-15 9:24 ` Tian, Kevin 2022-09-20 14:09 ` Jason Gunthorpe 2022-09-21 7:57 ` Tian, Kevin 2022-09-21 12:48 ` Jason Gunthorpe 2022-09-22 5:11 ` Tian, Kevin 2022-09-22 12:13 ` Jason Gunthorpe 2022-09-22 22:42 ` Tian, Kevin 2022-09-23 13:26 ` Jason Gunthorpe 2021-12-11 7:52 ` Tian, Kevin 2021-12-12 0:12 ` Thomas Gleixner 2021-12-12 2:14 ` Tian, Kevin 2021-12-12 20:50 ` Thomas Gleixner 2021-12-12 23:42 ` Jason Gunthorpe 2021-12-10 7:36 ` Tian, Kevin 2021-12-10 12:30 ` Jason Gunthorpe 2021-12-12 6:44 ` Mika Penttilä 2021-12-12 23:27 ` Jason Gunthorpe 2021-12-01 14:52 ` Thomas Gleixner 2021-12-01 15:11 ` Jason Gunthorpe 2021-12-01 18:37 ` Thomas Gleixner 2021-12-01 18:47 ` Jason Gunthorpe 2021-12-01 20:26 ` Thomas Gleixner 2022-12-05 18:25 ` [tip: irq/core] PCI/MSI: Provide post-enable dynamic allocation interfaces for MSI-X tip-bot2 for Thomas Gleixner 2022-12-05 21:41 ` tip-bot2 for Thomas Gleixner 2021-11-27 1:23 ` [patch 22/32] soc: ti: ti_sci_inta_msi: Rework MSI descriptor allocation Thomas Gleixner 2021-11-27 1:24 ` Thomas Gleixner 2021-11-27 1:23 ` [patch 23/32] soc: ti: ti_sci_inta_msi: Remove ti_sci_inta_msi_domain_free_irqs() Thomas Gleixner 2021-11-27 1:24 ` Thomas Gleixner 2021-11-27 1:23 ` [patch 24/32] bus: fsl-mc-msi: Simplify MSI descriptor handling Thomas Gleixner 2021-11-27 1:24 ` Thomas Gleixner 2021-11-27 1:23 ` [patch 25/32] platform-msi: Let core code handle MSI descriptors Thomas Gleixner 2021-11-27 1:24 ` Thomas Gleixner 2021-11-27 1:23 ` [patch 26/32] platform-msi: Simplify platform device MSI code Thomas Gleixner 2021-11-27 1:24 ` Thomas Gleixner 2021-11-27 1:23 ` [patch 27/32] genirq/msi: Make interrupt allocation less convoluted Thomas Gleixner 2021-11-27 1:24 ` Thomas Gleixner 2021-11-27 1:23 ` Thomas Gleixner [this message] 2021-11-27 1:24 ` [patch 28/32] genirq/msi: Convert to new functions Thomas Gleixner 2021-11-27 1:23 ` [patch 29/32] genirq/msi: Mop up old interfaces Thomas Gleixner 2021-11-27 1:24 ` Thomas Gleixner 2021-11-27 1:23 ` [patch 30/32] genirq/msi: Add abuse prevention comment to msi header Thomas Gleixner 2021-11-27 1:24 ` Thomas Gleixner 2021-11-27 1:23 ` [patch 31/32] genirq/msi: Simplify sysfs handling Thomas Gleixner 2021-11-27 1:24 ` Thomas Gleixner 2021-11-27 12:32 ` Greg Kroah-Hartman 2021-11-27 19:31 ` Thomas Gleixner 2021-11-28 11:07 ` Greg Kroah-Hartman 2021-11-28 19:33 ` Thomas Gleixner 2021-11-27 1:23 ` [patch 32/32] genirq/msi: Convert storage to xarray Thomas Gleixner 2021-11-27 1:24 ` Thomas Gleixner 2021-11-27 12:33 ` Greg Kroah-Hartman 2021-11-27 1:23 ` [patch 00/32] genirq/msi, PCI/MSI: Spring cleaning - Part 2 Thomas Gleixner
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=20211126232735.966439698@linutronix.de \ --to=tglx@linutronix.de \ --cc=alex.williamson@redhat.com \ --cc=allenbh@gmail.com \ --cc=ashok.raj@intel.com \ --cc=borntraeger@de.ibm.com \ --cc=dave.jiang@intel.com \ --cc=gregkh@linuxfoundation.org \ --cc=hca@linux.ibm.com \ --cc=helgaas@kernel.org \ --cc=jdmason@kudzu.us \ --cc=jgg@nvidia.com \ --cc=kevin.tian@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-ntb@googlegroups.com \ --cc=linux-pci@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=maz@kernel.org \ --cc=megha.dey@intel.com \ /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).