Skip to contentSkip to conversation

genirq: Fix handling of nested shared IRQs

PATCH In review Charles Keepax 2 participants 3 messages Mar 6, 2017 – Mar 7, 2017 IRQ

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 genirq: Fix handling of nested shared IRQs

When an IRQ is nested the nested handler is called directly from within the threaded handler of the parent IRQ, however, the code in handle_nested_irq only calls a single handler. This means when a shared IRQ is nested only the first of the shared IRQ handlers will be run. This patch adds a loop to move through and process all the handlers associated with the IRQ in handle_nested_irq.

---
 kernel/irq/chip.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
kernel/irq/chip.c +6 -3
index be3c34e..c6c7f11 100644
@@ -348,9 +348,12 @@ void handle_nested_irq(unsigned int irq)
 	irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS);
 	raw_spin_unlock_irq(&desc->lock);
 
-	action_ret = action->thread_fn(action->irq, action->dev_id);
-	if (!noirqdebug)
-		note_interrupt(desc, action_ret);
+	do {
+		action_ret = action->thread_fn(action->irq, action->dev_id);
+		if (!noirqdebug)
+			note_interrupt(desc, action_ret);
+		action = action->next;
+	} while (action);
 
 	raw_spin_lock_irq(&desc->lock);
 	irqd_clear(&desc->irq_data, IRQD_IRQ_INPROGRESS);
Signature · 1 line
2.1.4
#1 lore raw
Quoted 6 lines · Charles Keepax

When an IRQ is nested the nested handler is called directly from within the threaded handler of the parent IRQ, however, the code in handle_nested_irq only calls a single handler. This means when a shared IRQ is nested only the first of the shared IRQ handlers will be run. This patch adds a loop to move through and process all the handlers associated with the IRQ in handle_nested_irq.

That was never meant to deal with nested shaed interrupts, so the $subject is misleading. This is not a fix, it's a functional extension.

Aside of that, please structure the changelog in paragraphs instead of one big lump.

1) Context
2) Problem
3) Solution

See also Documentation/process/submitting-patches.rst and please search there for "This patch" .....

kernel/irq/chip.c void handle_nested_irq(unsigned int irq) · line 351

Quoted 8 lines
kernel/irq/chip.c +1 -3
@@ -348,9 +348,12 @@ void handle_nested_irq(unsigned int irq)
 	irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS);
 	raw_spin_unlock_irq(&desc->lock);
 
-	action_ret = action->thread_fn(action->irq, action->dev_id);
-	if (!noirqdebug)
-		note_interrupt(desc, action_ret);
+	do {

for_each_action_of_desc() please

kernel/irq/chip.c void handle_nested_irq(unsigned int irq) · line 354

Quoted 3 lines
kernel/irq/chip.c +3 -0
+		action_ret = action->thread_fn(action->irq, action->dev_id);
+		if (!noirqdebug)
+			note_interrupt(desc, action_ret);

That's wrong. See __handle_irq_event_percpu() for the correct handling of shared interrupts vs. note_interrupt()

Thanks,

tglx

#2 lore raw
Quoted 33 lines · Thomas Gleixner
Quoted 6 lines · Charles Keepax

When an IRQ is nested the nested handler is called directly from within the threaded handler of the parent IRQ, however, the code in handle_nested_irq only calls a single handler. This means when a shared IRQ is nested only the first of the shared IRQ handlers will be run. This patch adds a loop to move through and process all the handlers associated with the IRQ in handle_nested_irq.

That was never meant to deal with nested shaed interrupts, so the $subject is misleading. This is not a fix, it's a functional extension.

Aside of that, please structure the changelog in paragraphs instead of one big lump.

1) Context
2) Problem
3) Solution

See also Documentation/process/submitting-patches.rst and please search there for "This patch" .....

kernel/irq/chip.c void handle_nested_irq(unsigned int irq) · line 351

Quoted 8 lines
kernel/irq/chip.c +1 -3
@@ -348,9 +348,12 @@ void handle_nested_irq(unsigned int irq)
 	irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS);
 	raw_spin_unlock_irq(&desc->lock);
 
-	action_ret = action->thread_fn(action->irq, action->dev_id);
-	if (!noirqdebug)
-		note_interrupt(desc, action_ret);
+	do {

for_each_action_of_desc() please

Quoted 7 lines

kernel/irq/chip.c void handle_nested_irq(unsigned int irq) · line 354

Quoted 3 lines
kernel/irq/chip.c +3 -0
+		action_ret = action->thread_fn(action->irq, action->dev_id);
+		if (!noirqdebug)
+			note_interrupt(desc, action_ret);

That's wrong. See __handle_irq_event_percpu() for the correct handling of shared interrupts vs. note_interrupt()

Thanks for the pointers, I will look at those and respin the patch.

Thanks,
Charles