x86/ioapic: Do not unmask io_apic when interrupt is in progress

Ingo Molnar · roxell · commit 000000e3eac5 · 2015-07-18T14:16:05.000+02:00
With threaded interrupts we might see an interrupt in progress on
migration. Do not unmask it when this is the case.

Signed-off-by: Ingo Molnar &lt;mingo@elte.hu&gt;
Signed-off-by: Thomas Gleixner &lt;tglx@linutronix.de&gt;
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
@@ -1891,7 +1891,8 @@ static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
 static inline bool ioapic_irqd_mask(struct irq_data *data, struct irq_cfg *cfg)
 {
 	/* 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) &&
+		     !irqd_irq_inprogress(data))) {
 		mask_ioapic(cfg);
 		return true;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1891,7 +1891,8 @@ static bool io_apic_level_ack_pending(struct irq_cfg *cfg)`
`1891`	`1891`	`static inline bool ioapic_irqd_mask(struct irq_data data, struct irq_cfg cfg)`
`1892`	`1892`	`{`
`1893`	`1893`	`/* If we are moving the irq we need to mask it */`
`1894`		`- if (unlikely(irqd_is_setaffinity_pending(data))) {`
	`1894`	`+ if (unlikely(irqd_is_setaffinity_pending(data) &&`
	`1895`	`+ !irqd_irq_inprogress(data))) {`
`1895`	`1896`	`mask_ioapic(cfg);`
`1896`	`1897`	`return true;`
`1897`	`1898`	`}`