Skip to content

Commit d1f0301

Browse files
committed
genirq: Make force irq threading setup more robust
The support of force threading interrupts which are set up with both a primary and a threaded handler wreckaged the setup of regular requested threaded interrupts (primary handler == NULL). The reason is that it does not check whether the primary handler is set to the default handler which wakes the handler thread. Instead it replaces the thread handler with the primary handler as it would do with force threaded interrupts which have been requested via request_irq(). So both the primary and the thread handler become the same which then triggers the warnon that the thread handler tries to wakeup a not configured secondary thread. Fortunately this only happens when the driver omits the IRQF_ONESHOT flag when requesting the threaded interrupt, which is normaly caught by the sanity checks when force irq threading is disabled. Fix it by skipping the force threading setup when a regular threaded interrupt is requested. As a consequence the interrupt request which lacks the IRQ_ONESHOT flag is rejected correctly instead of silently wreckaging it. Fixes: 2a1d3ab ("genirq: Handle force threading of irqs with primary and thread handler") Reported-by: Kurt Kanzenbach <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Tested-by: Kurt Kanzenbach <[email protected]> Cc: [email protected]
1 parent 6b47037 commit d1f0301

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

kernel/irq/manage.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1068,14 +1068,21 @@ static int irq_setup_forced_threading(struct irqaction *new)
10681068
if (new->flags & (IRQF_NO_THREAD | IRQF_PERCPU | IRQF_ONESHOT))
10691069
return 0;
10701070

1071+
/*
1072+
* No further action required for interrupts which are requested as
1073+
* threaded interrupts already
1074+
*/
1075+
if (new->handler == irq_default_primary_handler)
1076+
return 0;
1077+
10711078
new->flags |= IRQF_ONESHOT;
10721079

10731080
/*
10741081
* Handle the case where we have a real primary handler and a
10751082
* thread handler. We force thread them as well by creating a
10761083
* secondary action.
10771084
*/
1078-
if (new->handler != irq_default_primary_handler && new->thread_fn) {
1085+
if (new->handler && new->thread_fn) {
10791086
/* Allocate the secondary action */
10801087
new->secondary = kzalloc(sizeof(struct irqaction), GFP_KERNEL);
10811088
if (!new->secondary)

0 commit comments

Comments
 (0)