Attachment 160793 Details for Bug 248352 – mini17.patch

mini17.patch

mini17.patch (text/plain), 2.56 KB, created by IBM Bug Proxy on 2007-08-07 02:55:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: IBM Bug Proxy

Created: 2007-08-07 02:55:27 UTC

Size: 2.56 KB

patch

obsolete

>diff -ruN 2.6.21.5-rt15/include/net/netfilter/nf_conntrack.h 2.6.21.5-rt17/include/net/netfilter/nf_conntrack.h
>--- 2.6.21.5-rt15/include/net/netfilter/nf_conntrack.h	2007-08-06 17:12:19.000000000 -0700
>+++ 2.6.21.5-rt17/include/net/netfilter/nf_conntrack.h	2007-08-06 17:08:37.000000000 -0700
>@@ -262,7 +262,7 @@
> #define NF_CT_STAT_INC_ATOMIC(count)			\
> do {							\
> 	local_bh_disable();				\
>-	__get_cpu_var(nf_conntrack_stat).count++;	\
>+	__raw_get_cpu_var(nf_conntrack_stat).count++;	\
> 	local_bh_enable();				\
> } while (0)
> #define NF_CT_STAT_INC(count) (__raw_get_cpu_var(nf_conntrack_stat).count++)
>diff -ruN 2.6.21.5-rt15/kernel/irq/manage.c 2.6.21.5-rt17/kernel/irq/manage.c
>--- 2.6.21.5-rt15/kernel/irq/manage.c	2007-08-06 17:12:19.000000000 -0700
>+++ 2.6.21.5-rt17/kernel/irq/manage.c	2007-08-06 17:08:38.000000000 -0700
>@@ -761,7 +761,15 @@
> 	struct irq_desc *desc = __desc;
> 
> #ifdef CONFIG_SMP
>-	set_cpus_allowed(current, desc->affinity);
>+	cpumask_t cpus_allowed, mask;
>+
>+	cpus_allowed = desc->affinity;
>+	/*
>+	 * Restrict it to one cpu so we avoid being migrated inside of
>+	 * do_softirq_from_hardirq()
>+	 */
>+	mask = cpumask_of_cpu(first_cpu(desc->affinity));
>+	set_cpus_allowed(current, mask);
> #endif
> 	current->flags |= PF_NOFREEZE | PF_HARDIRQ;
> 
>@@ -785,8 +793,16 @@
> 		/*
> 		 * Did IRQ affinities change?
> 		 */
>-		if (!cpus_equal(current->cpus_allowed, desc->affinity))
>-			set_cpus_allowed(current, desc->affinity);
>+		if (!cpus_equal(cpus_allowed, desc->affinity)) {
>+			cpus_allowed = desc->affinity;
>+			/*
>+			 * Restrict it to one cpu so we avoid being
>+			 * migrated inside of
>+			 * do_softirq_from_hardirq()
>+			 */
>+			mask = cpumask_of_cpu(first_cpu(desc->affinity));
>+			set_cpus_allowed(current, mask);
>+		}
> #endif
> 		schedule();
> 	}
>diff -ruN 2.6.21.5-rt15/kernel/softirq.c 2.6.21.5-rt17/kernel/softirq.c
>--- 2.6.21.5-rt15/kernel/softirq.c	2007-08-06 17:12:20.000000000 -0700
>+++ 2.6.21.5-rt17/kernel/softirq.c	2007-08-06 17:08:38.000000000 -0700
>@@ -426,25 +426,8 @@
> 	current->flags &= ~PF_HARDIRQ;
> 	current->flags |= PF_SOFTIRQ;
> 
>-#ifdef CONFIG_PREEMPT_HARDIRQS
>-	{
>-	cpumask_t save_cpus_allowed, cpus_allowed;
>-
>-	/* Don't let ourselves migrate */
>-	save_cpus_allowed = current->cpus_allowed;
>-	cpu_set(smp_processor_id(), cpus_allowed);
>-	set_cpus_allowed(current, cpus_allowed);
>-#endif
>-
> 	___do_softirq(1);
> 
>-#ifdef CONFIG_PREEMPT_HARDIRQS
>-	/* Put back our original mask. */
>-	WARN_ON(!cpus_equal(current->cpus_allowed, cpus_allowed));
>-	set_cpus_allowed(current, save_cpus_allowed);
>-	}
>-#endif
>-
> #ifndef CONFIG_PREEMPT_SOFTIRQS
> 	trace_softirq_exit();
> #endif

Actions: View

Attachments on bug 248352: 160683 | 160793 | 161080 | 172422