genirq: Prevent oneshot irq thread race
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 86 lines · tip-bot for Thomas Gleixner
Commit-ID: 0b1adaa031a55e44f5dd942f234bf09d28e8a0d6 Gitweb: http://git.kernel.org/tip/0b1adaa031a55e44f5dd942f234bf09d28e8a0d6 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 9 Mar 2010 19:45:54 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 10 Mar 2010 17:45:14 +0100genirq: Prevent oneshot irq thread race
Lars-Peter pointed out that the oneshot threaded interrupt handler code has the following race:
CPU0 CPU1
hande_level_irq(irq X)
mask_ack_irq(irq X)
handle_IRQ_event(irq X)
wake_up(thread_handler)
thread handler(irq X) runsfinalize_oneshot(irq X)
does not unmask due to !(desc->status &IRQ_MASKED)return from irq
does not unmask due to
(desc->status&IRQ_ONESHOT)This leaves the interrupt line masked forever.
The reason for this is the inconsistent handling of the
IRQ_MASKEDflag. Instead of setting it in the mask function the oneshot support sets the flag after waking up the irq thread.The solution for this is to set/clear the
IRQ_MASKEDstatus whenever we mask/unmask an interrupt line. That's the easy part, but that cleanup opens another race:CPU0 CPU1
hande_level_irq(irq)
mask_ack_irq(irq)
handle_IRQ_event(irq)
wake_up(thread_handler)
thread handler(irq) runsfinalize_oneshot_irq(irq)
unmask(irq)
irq triggers again
handle_level_irq(irq)
mask_ack_irq(irq)
return from irq due toIRQ_INPROGRESSreturn from irq
does not unmask due to
(desc->status&IRQ_ONESHOT)This requires that we synchronize
finalize_oneshot_irq()with the primary handler. IfIRQ_INPROGESSis set we wait until the primary handler on the other CPU has returned before unmasking the interrupt line again.We probably have never seen that problem because it does not happen on UP and on SMP the irqbalancer protects us by pinning the primary handler and the thread to the same CPU.
Reported-by Lars-Peter Clausen <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>--- kernel/irq/chip.c | 31 ++++++++++++++++++++++--------- kernel/irq/manage.c | 18 ++++++++++++++++++ 2 files changed, 40 insertions(+), 9 deletions(-)kernel/irq/chip.c +8
-0@@ -359,6 +359,23 @@ static inline void mask_ack_irq(struct irq_desc *desc, int irq)if (desc->chip->ack) desc->chip->ack (irq); } + desc->status |=IRQ_MASKED ; +} + +static inline void mask_irq (struct irq_desc *desc,int irq) +{ +if (desc->chip->mask) { + desc->chip->mask (irq); + desc->status |=IRQ_MASKED ;
kernel/irq/chip.c static inline void mask_ack_irq(struct irq_desc *desc, int irq) · line 379
Quoted 10 lines
kernel/irq/chip.c +9
-0+ } +} + +static inline void unmask_irq (struct irq_desc *desc,int irq) +{ +if (desc->chip->unmask) { + desc->chip->unmask (irq); + desc->status &= ~IRQ_MASKED ; + } }
this one will cause cris compiling error...
arch/cris/arch-v10/kernel/irq.c:#define mask_irq(irq_nr) (*R_VECT_MASK_CLR = 1 << (irq_nr)); arch/cris/include/arch-v32/arch/irq.h:void mask_irq(int irq); arch/mips/nxp/pnx8550/common/int.c:static inline void mask_irq(unsigned int irq_nr) kernel/irq/chip.c:static inline void mask_irq(struct irq_desc *desc)
because arch/irq.h will be included via linux/irq.h
YH