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 11/22] x86/hyperv: Refactor hv_msi_domain_free_irqs() Date: Sat, 27 Nov 2021 02:18:51 +0100 (CET) [thread overview] Message-ID: <20211126223824.737214551@linutronix.de> (raw) In-Reply-To: 20211126222700.862407977@linutronix.de No point in looking up things over and over. Just look up the associated irq data and work from there. No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Wei Liu <wei.liu@kernel.org> Cc: x86@kernel.org Cc: linux-hyperv@vger.kernel.org --- arch/x86/hyperv/irqdomain.c | 55 +++++++++++++------------------------------- 1 file changed, 17 insertions(+), 38 deletions(-) --- a/arch/x86/hyperv/irqdomain.c +++ b/arch/x86/hyperv/irqdomain.c @@ -253,64 +253,43 @@ static int hv_unmap_msi_interrupt(struct return hv_unmap_interrupt(hv_build_pci_dev_id(dev).as_uint64, old_entry); } -static void hv_teardown_msi_irq_common(struct pci_dev *dev, struct msi_desc *msidesc, int irq) +static void hv_teardown_msi_irq(struct pci_dev *dev, struct irq_data *irqd) { - u64 status; struct hv_interrupt_entry old_entry; - struct irq_desc *desc; - struct irq_data *data; struct msi_msg msg; + u64 status; - desc = irq_to_desc(irq); - if (!desc) { - pr_debug("%s: no irq desc\n", __func__); - return; - } - - data = &desc->irq_data; - if (!data) { - pr_debug("%s: no irq data\n", __func__); - return; - } - - if (!data->chip_data) { + if (!irqd->chip_data) { pr_debug("%s: no chip data\n!", __func__); return; } - old_entry = *(struct hv_interrupt_entry *)data->chip_data; + old_entry = *(struct hv_interrupt_entry *)irqd->chip_data; entry_to_msi_msg(&old_entry, &msg); - kfree(data->chip_data); - data->chip_data = NULL; + kfree(irqd->chip_data); + irqd->chip_data = NULL; status = hv_unmap_msi_interrupt(dev, &old_entry); - if (status != HV_STATUS_SUCCESS) { + if (status != HV_STATUS_SUCCESS) pr_err("%s: hypercall failed, status %lld\n", __func__, status); - return; - } } -static void hv_msi_domain_free_irqs(struct irq_domain *domain, struct device *dev) +static void hv_msi_free_irq(struct irq_domain *domain, + struct msi_domain_info *info, unsigned int virq) { - int i; - struct msi_desc *entry; - struct pci_dev *pdev; + struct irq_data *irqd = irq_get_irq_data(virq); + struct msi_desc *desc; - if (WARN_ON_ONCE(!dev_is_pci(dev))) + if (!irqd) return; - pdev = to_pci_dev(dev); + desc = irq_data_get_msi_desc(irqd); + if (!desc || !desc->irq || WARN_ON_ONCE(!dev_is_pci(desc->dev))) + return; - for_each_pci_msi_entry(entry, pdev) { - if (entry->irq) { - for (i = 0; i < entry->nvec_used; i++) { - hv_teardown_msi_irq_common(pdev, entry, entry->irq + i); - irq_domain_free_irqs(entry->irq + i, 1); - } - } - } + hv_teardown_msi_irq(to_pci_dev(desc->dev), irqd); } /* @@ -329,7 +308,7 @@ static struct irq_chip hv_pci_msi_contro }; static struct msi_domain_ops pci_msi_domain_ops = { - .domain_free_irqs = hv_msi_domain_free_irqs, + .msi_free = hv_msi_free_irq, .msi_prepare = pci_msi_prepare, };
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 11/22] x86/hyperv: Refactor hv_msi_domain_free_irqs() Date: Sat, 27 Nov 2021 02:19:37 +0100 (CET) [thread overview] Message-ID: <20211126223824.737214551@linutronix.de> (raw) Message-ID: <20211127011937.AL8kY12_fSx4zBqgMxVLZgDsxn7eJ9H47gTcbf5NEUk@z> (raw) In-Reply-To: 20211126222700.862407977@linutronix.de No point in looking up things over and over. Just look up the associated irq data and work from there. No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Wei Liu <wei.liu@kernel.org> Cc: x86@kernel.org Cc: linux-hyperv@vger.kernel.org --- arch/x86/hyperv/irqdomain.c | 55 +++++++++++++------------------------------- 1 file changed, 17 insertions(+), 38 deletions(-) --- a/arch/x86/hyperv/irqdomain.c +++ b/arch/x86/hyperv/irqdomain.c @@ -253,64 +253,43 @@ static int hv_unmap_msi_interrupt(struct return hv_unmap_interrupt(hv_build_pci_dev_id(dev).as_uint64, old_entry); } -static void hv_teardown_msi_irq_common(struct pci_dev *dev, struct msi_desc *msidesc, int irq) +static void hv_teardown_msi_irq(struct pci_dev *dev, struct irq_data *irqd) { - u64 status; struct hv_interrupt_entry old_entry; - struct irq_desc *desc; - struct irq_data *data; struct msi_msg msg; + u64 status; - desc = irq_to_desc(irq); - if (!desc) { - pr_debug("%s: no irq desc\n", __func__); - return; - } - - data = &desc->irq_data; - if (!data) { - pr_debug("%s: no irq data\n", __func__); - return; - } - - if (!data->chip_data) { + if (!irqd->chip_data) { pr_debug("%s: no chip data\n!", __func__); return; } - old_entry = *(struct hv_interrupt_entry *)data->chip_data; + old_entry = *(struct hv_interrupt_entry *)irqd->chip_data; entry_to_msi_msg(&old_entry, &msg); - kfree(data->chip_data); - data->chip_data = NULL; + kfree(irqd->chip_data); + irqd->chip_data = NULL; status = hv_unmap_msi_interrupt(dev, &old_entry); - if (status != HV_STATUS_SUCCESS) { + if (status != HV_STATUS_SUCCESS) pr_err("%s: hypercall failed, status %lld\n", __func__, status); - return; - } } -static void hv_msi_domain_free_irqs(struct irq_domain *domain, struct device *dev) +static void hv_msi_free_irq(struct irq_domain *domain, + struct msi_domain_info *info, unsigned int virq) { - int i; - struct msi_desc *entry; - struct pci_dev *pdev; + struct irq_data *irqd = irq_get_irq_data(virq); + struct msi_desc *desc; - if (WARN_ON_ONCE(!dev_is_pci(dev))) + if (!irqd) return; - pdev = to_pci_dev(dev); + desc = irq_data_get_msi_desc(irqd); + if (!desc || !desc->irq || WARN_ON_ONCE(!dev_is_pci(desc->dev))) + return; - for_each_pci_msi_entry(entry, pdev) { - if (entry->irq) { - for (i = 0; i < entry->nvec_used; i++) { - hv_teardown_msi_irq_common(pdev, entry, entry->irq + i); - irq_domain_free_irqs(entry->irq + i, 1); - } - } - } + hv_teardown_msi_irq(to_pci_dev(desc->dev), irqd); } /* @@ -329,7 +308,7 @@ static struct irq_chip hv_pci_msi_contro }; static struct msi_domain_ops pci_msi_domain_ops = { - .domain_free_irqs = hv_msi_domain_free_irqs, + .msi_free = hv_msi_free_irq, .msi_prepare = pci_msi_prepare, };
next prev parent reply other threads:[~2021-11-27 1:25 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 ` Thomas Gleixner [this message] 2021-11-27 1:19 ` [patch 11/22] x86/hyperv: Refactor hv_msi_domain_free_irqs() 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 ` [patch 19/22] PCI/MSI: Sanitize MSIX table map handling Thomas Gleixner 2021-11-27 1:19 ` 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=20211126223824.737214551@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).