F_St"^n > *Un!6_5Džc[ `Dbe thߑ]2.K*FA 4:p?+E O9u !X 1ʍT٬>l) ^ǵ @KNKs Aaې?p,85{uL׈qYMZ+P56V+&-ʦr?(b=V8Rtxg ❥[Du"nl&.9ò^øI79K3xRczj pX %X&n4(, /U4_[ h׶х ~I>RG;%kp ]jƝNS'15m&q>Ģb6nI!bRjq bLCߪ]ac7-b!p2[iΛ˪/_L# 51nH/q]_(-S-Ze\Rϴ44_~n>?^qB$aB0: Kcv+ ZLmN]Eu8 OT)O*"tn;'%ii%a$U#^ Rʫ5_5X?866 @6Onw;RND>sc"U#ޔp6'1ԇcs9YjweSauTl$D[ߪ]:+Ⓨ?_V]LAF 1lgwV0ρ30,!%UQm\s-zYxd;Z8iP6p` ^P?UUËTF8sS 9\UMKIjw &oZL@m!UUA.Atg+ WEU~r}ˡ @-N/' .`՝2UA-*ǫNF {'Opl->YwA6cCI6 5XEM6M_xC3U{hH)DžAy![J\7Lbݧ3;>u >RRBˌ^9Gi\(GuU.kTm}L,.@{J`=4J!֝)rӭ9ISsnXp*=?Y:N=6 x cpumask_of_cpu(new_cpu); - spin_unlock_irqrestore(&desc->lock, flags); + set_pending_irq(irq, cpumask_of_cpu(new_cpu)); } } @@ -534,16 +529,12 @@ tryanotherirq: cpus_and(tmp, target_cpu_mask, allowed_mask); if (!cpus_empty(tmp)) { - irq_desc_t *desc = irq_desc + selected_irq; - unsigned long flags; Dprintk("irq = %d moved to cpu = %d\n", selected_irq, min_loaded); /* mark for change destination */ - spin_lock_irqsave(&desc->lock, flags); - pending_irq_cpumask[selected_irq] = - cpumask_of_cpu(min_loaded); - spin_unlock_irqrestore(&desc->lock, flags); + set_pending_irq(selected_irq, cpumask_of_cpu(min_loaded)); + /* Since we made a change, come back sooner to * check for more variation. */ @@ -575,6 +566,7 @@ static int balanced_irq(void *unused) /* push everything to CPU 0 to give us a starting point. */ for (i = 0 ; i < NR_IRQS ; i++) { pending_irq_cpumask[i] = cpumask_of_cpu(0); + set_pending_irq(i, cpumask_of_cpu(0)); } for ( ; ; ) { diff -puN include/linux/irq.h~x86-x86_64-deferred-handling-of-writes-to-proc-irq-xx-smp_affinitypatch-added-to-mm-tree-fix-5 include/linux/irq.h --- 25/include/linux/irq.h~x86-x86_64-deferred-handling-of-writes-to-proc-irq-xx-smp_affinitypatch-added-to-mm-tree-fix-5 2005-05-03 19:13:04.000000000 -0700 +++ 25-akpm/include/linux/irq.h 2005-05-03 19:13:04.000000000 -0700 @@ -67,6 +67,9 @@ typedef struct irq_desc { unsigned int irq_count; /* For detecting broken interrupts */ unsigned int irqs_unhandled; spinlock_t lock; +#if defined (CONFIG_GENERIC_PENDING_IRQ) || defined (CONFIG_IRQBALANCE) + unsigned int move_irq; /* Flag need to re-target intr dest*/ +#endif } ____cacheline_aligned irq_desc_t; extern irq_desc_t irq_desc [NR_IRQS]; @@ -78,7 +81,6 @@ irq_descp (int irq) return irq_desc + irq; } - #include /* the arch dependent stuff */ extern int setup_irq(unsigned int irq, struct irqaction * new); @@ -101,19 +103,33 @@ static inline void set_native_irq_info(i #if defined (CONFIG_GENERIC_PENDING_IRQ) || defined (CONFIG_IRQBALANCE) extern cpumask_t pending_irq_cpumask[NR_IRQS]; -#endif -#ifdef CONFIG_GENERIC_PENDING_IRQ +static inline void set_pending_irq(unsigned int irq, cpumask_t mask) +{ + irq_desc_t *desc = irq_desc + irq; + unsigned long flags; + + spin_lock_irqsave(&desc->lock, flags); + desc->move_irq = 1; + pending_irq_cpumask[irq] = mask; + spin_unlock_irqrestore(&desc->lock, flags); +} + static inline void move_native_irq(int irq) { cpumask_t tmp; irq_desc_t *desc = irq_descp(irq); + if (likely (!desc->move_irq)) + return; + + desc->move_irq = 0; + if (likely(cpus_empty(pending_irq_cpumask[irq]))) return; - if (unlikely(!desc->handler->set_affinity)) + if (!desc->handler->set_affinity) return; /* note - we hold the desc->lock */ @@ -165,10 +181,11 @@ static inline void set_irq_info(int irq, } #endif // CONFIG_PCI_MSI -#else // CONFIG_GENERIC_PENDING_IRQ +#else // CONFIG_GENERIC_PENDING_IRQ || CONFIG_IRQBALANCE #define move_irq(x) #define move_native_irq(x) +#define set_pending_irq(x,y) static inline void set_irq_info(int irq, cpumask_t mask) { set_native_irq_info(irq, mask); diff -puN kernel/irq/proc.c~x86-x86_64-deferred-handling-of-writes-to-proc-irq-xx-smp_affinitypatch-added-to-mm-tree-fix-5 kernel/irq/proc.c --- 25/kernel/irq/proc.c~x86-x86_64-deferred-handling-of-writes-to-proc-irq-xx-smp_affinitypatch-added-to-mm-tree-fix-5 2005-05-03 19:13:04.000000000 -0700 +++ 25-akpm/kernel/irq/proc.c 2005-05-03 19:13:04.000000000 -0700 @@ -22,16 +22,11 @@ static struct proc_dir_entry *smp_affini #ifdef CONFIG_GENERIC_PENDING_IRQ void proc_set_irq_affinity(unsigned int irq, cpumask_t mask_val) { - irq_desc_t *desc = irq_descp(irq); - unsigned long flags; - /* * Save these away for later use. Re-progam when the * interrupt is pending */ - spin_lock_irqsave(&desc->lock, flags); - pending_irq_cpumask[irq] = mask_val; - spin_unlock_irqrestore(&desc->lock, flags); + set_pending_irq(irq, mask_val); } #else void proc_set_irq_affinity(unsigned int irq, cpumask_t mask_val) _