From: Martin Kaiser <martin@kaiser.cx>
To: Bjorn Helgaas <helgaas@kernel.org>,
Ley Foon Tan <ley.foon.tan@intel.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
Jingoo Han <jingoohan1@gmail.com>,
Gustavo Pimentel <gustavo.pimentel@synopsys.com>,
Toan Le <toan@os.amperecomputing.com>,
Florian Fainelli <f.fainelli@gmail.com>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH v2 2/2] PCI: dwc: Fix race in removing chained IRQ handler
Date: Wed, 11 Nov 2020 23:01:16 +0100 [thread overview]
Message-ID: <20201111220116.22034-2-martin@kaiser.cx> (raw)
In-Reply-To: <20201111220116.22034-1-martin@kaiser.cx>
Call irq_set_chained_handler_and_data() to clear the chained handler
and the handler's data under irq_desc->lock.
See also 2cf5a03cb29d ("PCI/keystone: Fix race in installing chained
IRQ handler").
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/pci/controller/dwc/pcie-designware-host.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index 44c2a6572199..fc2428165f13 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -258,10 +258,8 @@ int dw_pcie_allocate_domains(struct pcie_port *pp)
void dw_pcie_free_msi(struct pcie_port *pp)
{
- if (pp->msi_irq) {
- irq_set_chained_handler(pp->msi_irq, NULL);
- irq_set_handler_data(pp->msi_irq, NULL);
- }
+ if (pp->msi_irq)
+ irq_set_chained_handler_and_data(pp->msi_irq, NULL, NULL);
irq_domain_remove(pp->msi_domain);
irq_domain_remove(pp->irq_domain);
--
2.20.1
next prev parent reply other threads:[~2020-11-11 22:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-08 19:11 [PATCH] PCI: altera-msi: Remove irq handler and data in one go Martin Kaiser
2020-11-10 21:21 ` Bjorn Helgaas
2020-11-10 21:45 ` Bjorn Helgaas
2020-11-11 21:43 ` Martin Kaiser
2020-11-11 22:16 ` Bjorn Helgaas
2020-11-12 11:28 ` Thomas Gleixner
2020-11-12 13:50 ` Thomas Gleixner
2020-11-12 14:26 ` Bjorn Helgaas
2020-11-12 18:19 ` Thomas Gleixner
2020-11-11 22:01 ` [PATCH v2 1/2] PCI: altera-msi: Fix race in removing chained IRQ handler Martin Kaiser
2020-11-11 22:01 ` Martin Kaiser [this message]
2020-11-12 22:10 ` [PATCH v3 1/3] PCI: altera-msi: remove chained IRQ handler and data in one go Martin Kaiser
2020-11-12 22:10 ` [PATCH v3 2/3] PCI: dwc: " Martin Kaiser
2020-11-12 22:10 ` [PATCH v3 3/3] PCI: xgene-msi: Fix race in installing chained irq handler Martin Kaiser
2020-11-13 16:54 ` [PATCH v3 1/3] PCI: altera-msi: remove chained IRQ handler and data in one go Bjorn Helgaas
2021-01-15 21:24 ` [PATCH v4 1/3] PCI: altera-msi: Remove " Martin Kaiser
2021-01-15 21:24 ` [PATCH v4 2/3] PCI: dwc: " Martin Kaiser
2021-01-15 21:24 ` [PATCH v4 3/3] PCI: xgene-msi: Fix race in installing chained irq handler Martin Kaiser
2021-01-18 15:49 ` [PATCH v4 1/3] PCI: altera-msi: Remove IRQ handler and data in one go Lorenzo Pieralisi
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=20201111220116.22034-2-martin@kaiser.cx \
--to=martin@kaiser.cx \
--cc=f.fainelli@gmail.com \
--cc=gustavo.pimentel@synopsys.com \
--cc=helgaas@kernel.org \
--cc=jingoohan1@gmail.com \
--cc=ley.foon.tan@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=nsaenzjulienne@suse.de \
--cc=toan@os.amperecomputing.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: link
Be 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).