Skip to content

genirq/PCI: Sanitize interrupt injection

Thomas Gleixner linux-pci lkml stable 1 version Applied

Status from this message: The following commit has been merged into the irq/core branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest7 patches 9 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/7genirq/debugfs: Add missing sanity checks to interrupt injectionkernel/irq/debugfs.c+9 -22 replies
2/7genirq: Add protection against unsafe usage of generic_handle_irq()include/linux/irq.h kernel/irq/internals.h kernel/irq/irqdesc.c +1 more+30 -21 reply
3/7x86/apic/vector: Force interupt handler invocation to irq contextarch/x86/kernel/apic/vector.c+6 -00 replies
4/7genirq: Add return value to check_irq_resend()kernel/irq/debugfs.c kernel/irq/internals.h kernel/irq/resend.c+51 -371 reply
5/7genirq: Sanitize state handling in check_irq_resend()kernel/irq/resend.c+14 -81 reply
6/7genirq: Provide interrupt injection mechanisminclude/linux/interrupt.h kernel/irq/Kconfig kernel/irq/chip.c +3 more+61 -372 replies
7/7PCI/AER: Fix the broken interrupt injectiondrivers/pci/pcie/Kconfig drivers/pci/pcie/aer_inject.c+3 -42 replies

Reviews trailers per patch

6 of 7 patches have a Reviewed-by or Acked-by.

PatchMarc ZyngierKuppuswamy Sathyanarayanan
1/7A-b
2/7A-b
3/7
4/7A-b
5/7A-b
6/7A-b R-b T-b
7/7R-b T-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [patch 0/7] genirq/PCI: Sanitize interrupt injection

Kuppuswamy triggered a NULL pointer dereference via the AER error injection mechanism in the low level APIC code.

https://lore.kernel.org/r/f54208d62407901b5de15ce8c3d078c70fc7a1d0.1582313239.git.sathyanarayanan.kuppuswamy@linux.intel.com

It turned out that AER error injection is calling generic_handle_irq() from task context which is unsafe for x86 interrupts which end up being handled by the APIC. The fragile interrupt affinity handling which is imposed by the x86 hardware does not allow to call into this code except from actual interrupt context.

While the pointer could be checked this would just paper over the problem and still be able to trigger warnings or silently corrupting state.

This series addresses the problem:

- Prevent the invocation of generic_handle_irq() from non interrupt context on affected interrupts.

- Add a few missing sanity checks to the existing debugfs injection mechanism

- Convert the debugfs injection into a function which can be invoked from other places.

This provides a halfways safe interface to inject interrupts via the irq_retrigger mechanism which does the injection via IPI.

This interface is solely for debug and testing purposes as it still can make a device interrupts stale on x86 under very obscure and hard to hit circumstances. For debug and error injection testing this is acceptable. For any other use not.

- Change the AER code to use the new interface.

Thanks,

tglx
----

 arch/x86/kernel/apic/vector.c |    6 +
 drivers/pci/pcie/Kconfig      |    1 
 drivers/pci/pcie/aer_inject.c |    6 -
 include/linux/interrupt.h     |    2 
 include/linux/irq.h           |   13 +++
 kernel/irq/Kconfig            |    5 +
 kernel/irq/chip.c             |    2 
 kernel/irq/debugfs.c          |   28 --------
 kernel/irq/internals.h        |   10 ++
 kernel/irq/irqdesc.c          |    6 +
 kernel/irq/resend.c           |  143 +++++++++++++++++++++++++++++++-----------
 11 files changed, 153 insertions(+), 69 deletions(-)