PCI/keystone: Fix race in installing chained IRQ handler
A message that is not in the archive (sent off-list or not yet received): [email protected]
Murali Karicheri
Tested-byQuoted 61 lines · tip-bot for Thomas Gleixner
Commit-ID: 2cf5a03cb29debb00681a8af1dfa9179b43404d1 Gitweb: http://git.kernel.org/tip/2cf5a03cb29debb00681a8af1dfa9179b43404d1 Author: Thomas Gleixner <[email protected]> AuthorDate: Sun, 21 Jun 2015 20:16:09 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 25 Jun 2015 11:57:01 +0200PCI/keystone: Fix race in installing chained IRQ handler
Fix a race where a pending interrupt could be received and the handler called before the handler's data has been setup, by converting to
irq_set_chained_handler_and_data().Search and conversion was done with coccinelle:
@@
expression E1, E2, E3;
@@
((quoted diff) +0
-2-if (irq_set_chained_handler(E1, E3) != 0) - BUG();|
-irq_set_chained_handler(E1, E3);
)(quoted diff) +1
-1-irq_set_handler_data(E1, E2); +irq_set_chained_handler_and_data(E1, E3, E2);@@
expression E1, E2, E3;
@@
((quoted diff) +0
-2-if (irq_set_chained_handler(E1, E3) != 0) - BUG();|
-irq_set_chained_handler(E1, E3);
...
)(quoted diff) +1
-1-irq_set_handler_data(E1, E2); +irq_set_chained_handler_and_data(E1, E3, E2);Reported-by Russell King <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>Cc Julia Lawall <[email protected]>Cc Murali Karicheri <[email protected]>Cc Bjorn Helgaas <[email protected]>--- drivers/pci/host/pci-keystone.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)drivers/pci/host/pci-keystone.c +0
-0@@ -223,10 +223,9 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie)/* MSI IRQ */ if (IS_ENABLED (CONFIG_PCI_MSI )) {for (i =0 ; i < ks_pcie->num_msi_host_irqs; i++) {
drivers/pci/host/pci-keystone.c static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie) · line 231
Quoted 10 lines
drivers/pci/host/pci-keystone.c +3
-4-irq_set_chained_handler (ks_pcie->msi_host_irqs[i], - ks_pcie_msi_irq_handler); -irq_set_handler_data (ks_pcie->msi_host_irqs[i], - ks_pcie); +irq_set_chained_handler_and_data (ks_pcie->msi_host_irqs[i], + ks_pcie_msi_irq_handler, + ks_pcie); } } }
Thomas,
Thanks for the patch.
Tested-by Murali Karicheri <[email protected]>
Signature · 2 lines
Murali Karicheri Linux Kernel, Keystone