Commit 00f0f294 authored Oct 17, 2019 by Thomas Gleixner Committed by Greg Kroah-Hartman Dec 31, 2019

x86/ioapic: Prevent inconsistent state when moving an interrupt



[ Upstream commit df4393424af3fbdcd5c404077176082a8ce459c4 ]

There is an issue with threaded interrupts which are marked ONESHOT
and using the fasteoi handler:

  if (IS_ONESHOT())
    mask_irq();
  ....
  cond_unmask_eoi_irq()
    chip->irq_eoi();
      if (setaffinity_pending) {
         mask_ioapic();
         ...
	 move_affinity();
	 unmask_ioapic();
      }

So if setaffinity is pending the interrupt will be moved and then
unconditionally unmasked at the ioapic level, which is wrong in two
aspects:

 1) It should be kept masked up to the point where the threaded handler
    finished.

 2) The physical chip state and the software masked state are inconsistent

Guard both the mask and the unmask with a check for the software masked
state. If the line is marked masked then the ioapic line is also masked, so
both mask_ioapic() and unmask_ioapic() can be skipped safely.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sebastian Siewior <bigeasy@linutronix.de>
Fixes: 3aa551c9 ("genirq: add threaded interrupt handler support")
Link: https://lkml.kernel.org/r/20191017101938.321393687@linutronix.de


Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent f9d405a4

arch/x86/kernel/apic/io_apic.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -1724,8 +1724,9 @@ static bool io_apic_level_ack_pending(struct mp_chip_data *data)

		static inline bool ioapic_irqd_mask(struct irq_data *data)
		{
		/* If we are moving the irq we need to mask it */
		/* If we are moving the IRQ we need to mask it */
		if (unlikely(irqd_is_setaffinity_pending(data))) {
		if (!irqd_irq_masked(data))
		mask_ioapic_irq(data);
		return true;
		}
		@@ -1763,6 +1764,8 @@ static inline void ioapic_irqd_unmask(struct irq_data *data, bool masked)
		*/
		if (!io_apic_level_ack_pending(data->chip_data))
		irq_move_masked_irq(data);
		/* If the IRQ is masked in the core, leave it: */
		if (!irqd_irq_masked(data))
		unmask_ioapic_irq(data);
		}
		}