Commit df439342 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar

x86/ioapic: Prevent inconsistent state when moving an interrupt

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: default avatarThomas 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.deSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 3b7c59a1
...@@ -1727,8 +1727,9 @@ static bool io_apic_level_ack_pending(struct mp_chip_data *data) ...@@ -1727,8 +1727,9 @@ static bool io_apic_level_ack_pending(struct mp_chip_data *data)
static inline bool ioapic_irqd_mask(struct irq_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 (unlikely(irqd_is_setaffinity_pending(data))) {
if (!irqd_irq_masked(data))
mask_ioapic_irq(data); mask_ioapic_irq(data);
return true; return true;
} }
...@@ -1766,6 +1767,8 @@ static inline void ioapic_irqd_unmask(struct irq_data *data, bool masked) ...@@ -1766,6 +1767,8 @@ static inline void ioapic_irqd_unmask(struct irq_data *data, bool masked)
*/ */
if (!io_apic_level_ack_pending(data->chip_data)) if (!io_apic_level_ack_pending(data->chip_data))
irq_move_masked_irq(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); unmask_ioapic_irq(data);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment