Skip to content

Commit 81e2073

Browse files
committed
genirq: Disable interrupts for force threaded handlers
With interrupt force threading all device interrupt handlers are invoked from kernel threads. Contrary to hard interrupt context the invocation only disables bottom halfs, but not interrupts. This was an oversight back then because any code like this will have an issue: thread(irq_A) irq_handler(A) spin_lock(&foo->lock); interrupt(irq_B) irq_handler(B) spin_lock(&foo->lock); This has been triggered with networking (NAPI vs. hrtimers) and console drivers where printk() happens from an interrupt which interrupted the force threaded handler. Now people noticed and started to change the spin_lock() in the handler to spin_lock_irqsave() which affects performance or add IRQF_NOTHREAD to the interrupt request which in turn breaks RT. Fix the root cause and not the symptom and disable interrupts before invoking the force threaded handler which preserves the regular semantics and the usefulness of the interrupt force threading as a general debugging tool. For not RT this is not changing much, except that during the execution of the threaded handler interrupts are delayed until the handler returns. Vs. scheduling and softirq processing there is no difference. For RT kernels there is no issue. Fixes: 8d32a30 ("genirq: Provide forced interrupt threading") Reported-by: Johan Hovold <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Johan Hovold <[email protected]> Acked-by: Sebastian Andrzej Siewior <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent ef4cb70 commit 81e2073

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

kernel/irq/manage.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,11 +1142,15 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action)
11421142
irqreturn_t ret;
11431143

11441144
local_bh_disable();
1145+
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
1146+
local_irq_disable();
11451147
ret = action->thread_fn(action->irq, action->dev_id);
11461148
if (ret == IRQ_HANDLED)
11471149
atomic_inc(&desc->threads_handled);
11481150

11491151
irq_finalize_oneshot(desc, action);
1152+
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
1153+
local_irq_enable();
11501154
local_bh_enable();
11511155
return ret;
11521156
}

0 commit comments

Comments
 (0)