genirq fixes for 2.6.31
Linus,
Please pull the latest irq-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq-fixes-for-linus
The affinity problem went unnoticed in reviews and testing and just exploded nicely in the preempt-rt tree where we force thread all interrupts.
Thanks,
tglx
------------------>
Thomas Gleixner (1):
genirq: Delegate irq affinity setting to the irq thread
include/linux/interrupt.h | 2 + kernel/irq/internals.h | 3 +- kernel/irq/manage.c | 50 +++++++++++++++++++++++++++++++++++++++----- kernel/irq/migration.c | 2 +- 4 files changed, 48 insertions(+), 9 deletions(-)
include/linux/interrupt.h +2 -0
@@ -64,11 +64,13 @@* IRQTF_RUNTHREAD - signals that the interrupt handler thread should run * IRQTF_DIED - handler thread died * IRQTF_WARNED - warning "IRQ_WAKE_THREAD w/o thread_fn" has been printed +* IRQTF_AFFINITY - irq thread is requested to adjust affinity */ enum {IRQTF_RUNTHREAD ,IRQTF_DIED ,IRQTF_WARNED , +IRQTF_AFFINITY , };typedef irqreturn_t (*irq_handler_t )(int ,void *);
kernel/irq/internals.h +1 -2
@@ -42,8 +42,7 @@ static inline void unregister_handler_proc(unsigned int irq,extern int irq_select_affinity_usr (unsigned int irq); -extern void -irq_set_thread_affinity (struct irq_desc *desc,const struct cpumask *cpumask); +extern void irq_set_thread_affinity (struct irq_desc *desc);/* * Debugging printout:
kernel/irq/manage.c +44 -6
91 lines not on this page · raw message
kernel/irq/migration.c +1 -1
@@ -45,7 +45,7 @@ void move_masked_irq(int irq) < nr_cpu_ids))if (!desc->chip->set_affinity (irq, desc->pending_mask)) {cpumask_copy (desc->affinity, desc->pending_mask); -irq_set_thread_affinity (desc, desc->pending_mask); +irq_set_thread_affinity (desc); }cpumask_clear (desc->pending_mask);
kernel/irq/manage.c static int irq_thread(void *data) · line 501
Quoted 13 lines · Thomas Gleixner
kernel/irq/manage.c +3
-0+/* * Interrupt handler thread */ static int irq_thread (void *data)@@ -458,6 +494,8 @@ static int irq_thread(void *data)while (!irq_wait_for_interrupt (action)) { +irq_thread_check_affinity (desc, action); +atomic_inc (&desc->threads_active);spin_lock_irq (&desc->lock);
Any chance we could do this in a way that doesn't break the build for CONFIG_SMP=n? :)
Should this call simply be wrapped in an #ifdef, or should the function be defined for !SMP?
Signature · 1 line
Kevin Winchester
Quoted 13 lines · Kevin Winchester
Quoted 12 lines · Thomas Gleixner
(quoted diff) +3
-0+/* * Interrupt handler thread */ static int irq_thread(void *data)@@ -458,6 +494,8 @@ static int irq_thread(void *data) while (!irq_wait_for_interrupt(action)) { + irq_thread_check_affinity(desc, action); + atomic_inc(&desc->threads_active);
Quoted 6 lines
Review static int irq_thread(void *data) · line 501
Quoted 1 line
(quoted diff) +0
-0spin_lock_irq(&desc->lock);Any chance we could do this in a way that doesn't break the build for
CONFIG_SMP=n? :)Should this call simply be wrapped in an #ifdef, or should the function be defined for !SMP?
Actually, I guess the function is defined always, but it references desc->affinity unconditionally.
Perhaps something like the following (likely whitespace damaged) patch:
kernel/irq/manage.c +11 -0
@@ -451,6 +451,8 @@ static int irq_wait_for_interrupt(struct irqaction *action)return -1 ; } +#ifdef CONFIG_SMP +/* * Check whether we need to change the affinity of the interrupt thread. */
@@ -479,6 +481,15 @@ irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action) free_cpumask_var(mask); } +#else + +static void +irq_thread_check_affinity (struct irq_desc *desc,struct irqaction *action) +{ +} + +#endif +/* * Interrupt handler thread */
PATCH 1/1 irq: Add compiling definition of irq_thread_check_affinity for !CONFIG_SMP
In reply to Thomas GleixnerThe addition and use of irq_thread_check_affinity neglected the fact that struct irq_desc does not have an affinity member when CONFIG_SMP=n.
Fix this by adding an empty definition of the method for !SMP.
---
I'll try not to be lazy and send a real patch. Please let me know if I've done it wrong.
kernel/irq/manage.c +35 -28
@@ -190,11 +190,46 @@ int irq_select_affinity_usr(unsigned int irq) return ret; } +/* +* Check whether we need to change the affinity of the interrupt thread. +*/ +static void +irq_thread_check_affinity (struct irq_desc *desc,struct irqaction *action) +{ +cpumask_var_t mask; + +if (!test_and_clear_bit (IRQTF_AFFINITY , &action->thread_flags)) +return ; + +/* +* In case we are out of memory we set IRQTF_AFFINITY again and +* try again next time +*/ +if (!alloc_cpumask_var (&mask,GFP_KERNEL )) { +set_bit (IRQTF_AFFINITY , &action->thread_flags); +return ; + } + +spin_lock_irq (&desc->lock); +cpumask_copy (mask, desc->affinity); +spin_unlock_irq (&desc->lock); + +set_cpus_allowed_ptr (current, mask); +free_cpumask_var (mask); +} +#else +static inline int setup_affinity (unsigned int irq,struct irq_desc *desc) {return 0 ; } + +static void +irq_thread_check_affinity (struct irq_desc *desc,struct irqaction *action) +{ +} +#endif void __disable_irq (struct irq_desc *desc,unsigned int irq,bool suspend)
@@ -452,34 +487,6 @@ static int irq_wait_for_interrupt(struct irqaction *action) }/* -* Check whether we need to change the affinity of the interrupt thread. -*/ -static void -irq_thread_check_affinity (struct irq_desc *desc,struct irqaction *action) -{ -cpumask_var_t mask; - -if (!test_and_clear_bit (IRQTF_AFFINITY , &action->thread_flags)) -return ; - -/* -* In case we are out of memory we set IRQTF_AFFINITY again and -* try again next time -*/ -if (!alloc_cpumask_var (&mask,GFP_KERNEL )) { -set_bit (IRQTF_AFFINITY , &action->thread_flags); -return ; - } - -spin_lock_irq (&desc->lock); -cpumask_copy (mask, desc->affinity); -spin_unlock_irq (&desc->lock); - -set_cpus_allowed_ptr (current, mask); -free_cpumask_var (mask); -} - -/* * Interrupt handler thread */ static int irq_thread (void *data)