genirq: cleanup: merge irq_affinity[] into irq_desc[]
Subsystems (4)
PATCH 1/50 genirq: cleanup: merge irq_affinity[] into irq_desc[]
From: Ingo Molnar <[email protected]>
consolidation: remove the irq_affinity[NR_IRQS] array and move it into the irq_desc[NR_IRQS].affinity field.
--- arch/alpha/kernel/irq.c | 2 +- arch/i386/kernel/io_apic.c | 4 ++-- arch/i386/kernel/irq.c | 2 +- arch/ia64/kernel/irq.c | 4 ++-- arch/parisc/kernel/irq.c | 8 ++++---- arch/powerpc/kernel/irq.c | 2 +- arch/powerpc/platforms/pseries/xics.c | 2 +- arch/x86_64/kernel/irq.c | 2 +- include/linux/irq.h | 7 ++++--- kernel/irq/handle.c | 5 ++++- kernel/irq/manage.c | 2 -- kernel/irq/proc.c | 4 ++-- 12 files changed, 23 insertions(+), 21 deletions(-)
arch/alpha/kernel/irq.c +1 -1
@@ -56,7 +56,7 @@ select_smp_affinity(unsigned int irq) cpu = (cpu < (NR_CPUS -1 ) ? cpu +1 :0 ); last_cpu = cpu; - irq_affinity[irq] =cpumask_of_cpu (cpu); + irq_desc[irq].affinity =cpumask_of_cpu (cpu); irq_desc[irq].handler->set_affinity (irq,cpumask_of_cpu (cpu));return 0 ; }
arch/i386/kernel/io_apic.c +2 -2
@@ -340,7 +340,7 @@ static inline void balance_irq(int cpu,if (irqbalance_disabled)return ; -cpus_and (allowed_mask, cpu_online_map, irq_affinity[irq]); +cpus_and (allowed_mask, cpu_online_map, irq_desc[irq].affinity); new_cpu =move (cpu, allowed_mask, now,1 );if (cpu != new_cpu) {set_pending_irq (irq,cpumask_of_cpu (new_cpu));
@@ -529,7 +529,7 @@ tryanotherirq: } } -cpus_and (allowed_mask, cpu_online_map, irq_affinity[selected_irq]); +cpus_and (allowed_mask, cpu_online_map, irq_desc[selected_irq].affinity); target_cpu_mask =cpumask_of_cpu (min_loaded);cpus_and (tmp, target_cpu_mask, allowed_mask);
arch/i386/kernel/irq.c +1 -1
@@ -277,7 +277,7 @@ void fixup_irqs(cpumask_t map)if (irq ==2 )continue ; -cpus_and (mask, irq_affinity[irq], map); +cpus_and (mask, irq_desc[irq].affinity, map);if (any_online_cpu (mask) ==NR_CPUS ) {printk ("Breaking affinity for irq %i\n" , irq); mask = map;
arch/ia64/kernel/irq.c +2 -2
@@ -100,7 +100,7 @@ void set_irq_affinity_info (unsigned intcpu_set (cpu_logical_id (hwid), mask);if (irq <NR_IRQS ) { - irq_affinity[irq] = mask; + irq_desc[irq].affinity = mask;set_irq_info (irq, mask); irq_redir[irq] = (char ) (redir &0xff ); }
@@ -132,7 +132,7 @@ static void migrate_irqs(void)if (desc->status ==IRQ_PER_CPU )continue ; -cpus_and (mask, irq_affinity[irq], cpu_online_map); +cpus_and (mask, irq_desc[irq].affinity, cpu_online_map);if (any_online_cpu (mask) ==NR_CPUS ) {/* * Save it for phase 2 processing
arch/parisc/kernel/irq.c +4 -4
@@ -94,7 +94,7 @@ int cpu_check_affinity(unsigned int irq,if (irq ==TIMER_IRQ || irq ==IPI_IRQ ) {/* Bad linux design decision. The mask has already * been set; we must reset it */ - irq_affinity[irq] =CPU_MASK_ALL ; + irq_desc[irq].affinity =CPU_MASK_ALL ;return -EINVAL ; }
@@ -110,7 +110,7 @@ static void cpu_set_affinity_irq(unsigneif (cpu_check_affinity (irq, &dest))return ; - irq_affinity[irq] = dest; + irq_desc[irq].affinity = dest; }#endif
@@ -265,7 +265,7 @@ int txn_alloc_irq(unsigned int bits_wideunsigned long txn_affinity_addr (unsigned int irq,int cpu) {#ifdef CONFIG_SMP - irq_affinity[irq] =cpumask_of_cpu (cpu); + irq_desc[irq].affinity =cpumask_of_cpu (cpu);#endif return cpu_data[cpu].txn_addr;
@@ -326,7 +326,7 @@ void do_cpu_irq_mask(struct pt_regs *reg/* Work our way from MSb to LSb...same order we alloc EIRs */ for (irq =TIMER_IRQ ; eirr_val && bit; bit>>=1 , irq++) {#ifdef CONFIG_SMP -cpumask_t dest = irq_affinity[irq]; +cpumask_t dest = irq_desc[irq].affinity;#endif if (!(bit & eirr_val))continue ;
arch/powerpc/kernel/irq.c +1 -1
@@ -163,7 +163,7 @@ void fixup_irqs(cpumask_t map)if (irq_desc[irq].status &IRQ_PER_CPU )continue ; -cpus_and (mask, irq_affinity[irq], map); +cpus_and (mask, irq_desc[irq].affinity, map);if (any_online_cpu (mask) ==NR_CPUS ) {printk ("Breaking affinity for irq %i\n" , irq); mask = map;
arch/powerpc/platforms/pseries/xics.c +1 -1
@@ -238,7 +238,7 @@ static int get_irq_server(unsigned int i {unsigned int server;/* For the moment only implement delivery to all cpus or one cpu */ -cpumask_t cpumask = irq_affinity[irq]; +cpumask_t cpumask = irq_desc[irq].affinity;cpumask_t tmp =CPU_MASK_NONE ;if (!distribute_irqs)
arch/x86_64/kernel/irq.c +1 -1
@@ -114,7 +114,7 @@ void fixup_irqs(cpumask_t map)if (irq ==2 )continue ; -cpus_and (mask, irq_affinity[irq], map); +cpus_and (mask, irq_desc[irq].affinity, map);if (any_online_cpu (mask) ==NR_CPUS ) {printk ("Breaking affinity for irq %i\n" , irq); mask = map;
include/linux/irq.h +4 -3
@@ -77,6 +77,9 @@ typedef struct irq_desc {unsigned int irq_count;/* For detecting broken interrupts */ unsigned int irqs_unhandled;spinlock_t lock; +#ifdef CONFIG_SMP +cpumask_t affinity; +#endif #if defined (CONFIG_GENERIC_PENDING_IRQ ) || defined (CONFIG_IRQBALANCE )unsigned int move_irq;/* Flag need to re-target intr dest*/ #endif
@@ -96,12 +99,10 @@ irq_descp (int irq)extern int setup_irq (unsigned int irq,struct irqaction * new);#ifdef CONFIG_GENERIC_HARDIRQS -extern cpumask_t irq_affinity[NR_IRQS ]; -#ifdef CONFIG_SMP static inline void set_native_irq_info (int irq,cpumask_t mask) { - irq_affinity[irq] = mask; + irq_desc[irq].affinity = mask; }#else static inline void set_native_irq_info (int irq,cpumask_t mask)
kernel/irq/handle.c +4 -1
@@ -32,7 +32,10 @@ irq_desc_t irq_desc[NR_IRQS] __cacheline [0 ... NR_IRQS-1] = { .status =IRQ_DISABLED , .handler = &no_irq_type, - .lock =SPIN_LOCK_UNLOCKED + .lock =SPIN_LOCK_UNLOCKED , +#ifdef CONFIG_SMP + .affinity =CPU_MASK_ALL +#endif } };
kernel/irq/manage.c +0 -2
@@ -16,8 +16,6 @@#ifdef CONFIG_SMP -cpumask_t irq_affinity[NR_IRQS ] = { [0 ...NR_IRQS -1 ] =CPU_MASK_ALL }; -#if defined (CONFIG_GENERIC_PENDING_IRQ ) || defined (CONFIG_IRQBALANCE ) cpumask_t __cacheline_aligned pending_irq_cpumask[NR_IRQS];#endif
kernel/irq/proc.c +2 -2
@@ -33,7 +33,7 @@ void proc_set_irq_affinity(unsigned int#else void proc_set_irq_affinity (unsigned int irq,cpumask_t mask_val) { - irq_affinity[irq] = mask_val; + irq_desc[irq].affinity = mask_val; irq_desc[irq].handler->set_affinity (irq, mask_val); }#endif
@@ -41,7 +41,7 @@ void proc_set_irq_affinity(unsigned intstatic int irq_affinity_read_proc (char *page,char **start,off_t off,int count,int *eof,void *data) { -int len =cpumask_scnprintf (page, count, irq_affinity[(long )data]); +int len =cpumask_scnprintf (page, count, irq_desc[(long )data].affinity);if (count - len <2 )return -EINVAL ;
Quoted 14 lines · Ingo Molnar
From: Ingo Molnar <[email protected]>
consolidation: remove the irq_affinity[NR_IRQS] array and move it into the irq_desc[NR_IRQS].affinity field.
Signed-off-by Ingo Molnar <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>---
Index:
linux-genirq.q/arch/powerpc/platforms/pseries/xics.c
===================================================================
arch/powerpc/platforms/pseries/xics.c static int get_irq_server(unsigned int i · line 244
Quoted 8 lines
arch/powerpc/platforms/pseries/xics.c +1
-1@@ -238,7 +238,7 @@ static int get_irq_server(unsigned int i {unsigned int server;/* For the moment only implement delivery to all cpus or one cpu */ -cpumask_t cpumask = irq_affinity[irq]; +cpumask_t cpumask = irq_desc[irq].affinity;cpumask_t tmp =CPU_MASK_NONE ;if (!distribute_irqs)
Assigned unconditionally - outside CONFIG_SMP as I read the code but..
include/linux/irq.h typedef struct irq_desc { · line 82
Quoted 11 lines
Index:
linux-genirq.q/include/linux/irq.h
===================================================================include/linux/irq.h +3
-0@@ -77,6 +77,9 @@ typedef struct irq_desc {unsigned int irq_count;/* For detecting broken interrupts */ unsigned int irqs_unhandled;spinlock_t lock; +#ifdef CONFIG_SMP +cpumask_t affinity; +#endif
But defined only for SMP.
Looks wrong at first look.
Sam
Quoted 13 lines · Sam Ravnborg
arch/powerpc/platforms/pseries/xics.c static int get_irq_server(unsigned int i · line 244
Quoted 10 lines
+++
linux-genirq.q/arch/powerpc/platforms/pseries/xics.carch/powerpc/platforms/pseries/xics.c +1
-1@@ -238,7 +238,7 @@ static int get_irq_server(unsigned int i {unsigned int server;/* For the moment only implement delivery to all cpus or one cpu */ -cpumask_t cpumask = irq_affinity[irq]; +cpumask_t cpumask = irq_desc[irq].affinity;cpumask_t tmp =CPU_MASK_NONE ;if (!distribute_irqs)Assigned unconditionally - outside
CONFIG_SMPas I read the code but..
Quoted 5 lines
include/linux/irq.h typedef struct irq_desc { · line 82
Quoted 3 lines
include/linux/irq.h +3
-0+#ifdef CONFIG_SMP +cpumask_t affinity; +#endif But defined only for SMP. Looks wrong at first look.
but the original array was under SMP too:
--- linux-genirq.q.orig/kernel/irq/manage.c
+++ linux-genirq.q/kernel/irq/manage.c
@@ -16,8 +16,6 @@
#ifdef CONFIG_SMP
-cpumask_t irq_affinity[NR_IRQS] = { [0 ... NR_IRQS-1] = CPU_MASK_ALL };
so if then this is a powerpc bug. (probably pseries is rarely built without SMP support)
Ingo