Skip to content

Commit 9ae0522

Browse files
committed
PCI/AER: Fix the broken interrupt injection
The AER error injection mechanism just blindly abuses generic_handle_irq() which is really not meant for consumption by random drivers. The include of linux/irq.h should have been a red flag in the first place. Driver code, unless implementing interrupt chips or low level hypervisor functionality has absolutely no business with that. Invoking generic_handle_irq() from non interrupt handling context can have nasty side effects at least on x86 due to the hardware trainwreck which makes interrupt affinity changes a fragile beast. Sathyanarayanan triggered a NULL pointer dereference in the low level APIC code that way. While the particular pointer could be checked this would only paper over the issue because there are other ways to trigger warnings or silently corrupt state. Invoke the new irq_inject_interrupt() mechanism, which has the necessary sanity checks in place and injects the interrupt via the irq_retrigger() mechanism, which is at least halfways safe vs. the fragile x86 affinity change mechanics. It's safe on x86 as it does not corrupt state, but it still can cause a premature completion of an interrupt affinity change causing the interrupt line to become stale. Very unlikely, but possible. For regular operations this is a non issue as AER error injection is meant for debugging and testing and not for usage on production systems. People using this should better know what they are doing. Fixes: 390e2db ("PCI/AER: Abstract AER interrupt handling") Reported-by: [email protected] Signed-off-by: Thomas Gleixner <[email protected]> Tested-by: Kuppuswamy Sathyanarayanan <[email protected]> Reviewed-by: Kuppuswamy Sathyanarayanan <[email protected]> Cc: Bjorn Helgaas <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent acd26bc commit 9ae0522

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

drivers/pci/pcie/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ config PCIEAER
3434
config PCIEAER_INJECT
3535
tristate "PCI Express error injection support"
3636
depends on PCIEAER
37+
select GENERIC_IRQ_INJECTION
3738
help
3839
This enables PCI Express Root Port Advanced Error Reporting
3940
(AER) software error injector.

drivers/pci/pcie/aer_inject.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <linux/module.h>
1818
#include <linux/init.h>
19-
#include <linux/irq.h>
19+
#include <linux/interrupt.h>
2020
#include <linux/miscdevice.h>
2121
#include <linux/pci.h>
2222
#include <linux/slab.h>
@@ -468,9 +468,7 @@ static int aer_inject(struct aer_error_inj *einj)
468468
}
469469
pci_info(edev->port, "Injecting errors %08x/%08x into device %s\n",
470470
einj->cor_status, einj->uncor_status, pci_name(dev));
471-
local_irq_disable();
472-
generic_handle_irq(edev->irq);
473-
local_irq_enable();
471+
ret = irq_inject_interrupt(edev->irq);
474472
} else {
475473
pci_err(rpdev, "AER device not found\n");
476474
ret = -ENODEV;

0 commit comments

Comments
 (0)