aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/rcupreempt.c
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2009-08-15 12:53:49 -0400
committerIngo Molnar <mingo@elte.hu>2009-08-15 13:02:08 -0400
commit8064d54929f23613e649dc7e14f7a94454487d58 (patch)
treefa2e96f9be7ce412bdcff3731a3d08289dcfd032 /kernel/rcupreempt.c
parent2e597558086dec36d5c33521a36e0f6b1bc3f3a7 (diff)
rcu: Make preemptable RCU scan all CPUs when summing RCU counters
This patch eliminates the counter-moving during CPU-offline notifiers, eliminating potential confusion if counters are scanned during counter-movement process. This confusion could result in premature ending of an RCU grace period. For example, if there are two tasks in RCU read-side critical sections (so that the sum of the counters is two), and the counter for the CPU going offline is -2, then moving the count to another CPU can result in the sum momentarily appearing to be zero. Since there are no memory barriers in either case, many more such scenarios are possible. So just don't move the counts!!! Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: josht@linux.vnet.ibm.com Cc: akpm@linux-foundation.org Cc: mathieu.desnoyers@polymtl.ca Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: hugh.dickins@tiscali.co.uk Cc: benh@kernel.crashing.org LKML-Reference: <12503552312863-git-send-email-> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/rcupreempt.c')
-rw-r--r--kernel/rcupreempt.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/rcupreempt.c b/kernel/rcupreempt.c
index 9b87f5134ed7..2748b89910b6 100644
--- a/kernel/rcupreempt.c
+++ b/kernel/rcupreempt.c
@@ -849,7 +849,7 @@ rcu_try_flip_waitzero(void)
849 /* Check to see if the sum of the "last" counters is zero. */ 849 /* Check to see if the sum of the "last" counters is zero. */
850 850
851 RCU_TRACE_ME(rcupreempt_trace_try_flip_z1); 851 RCU_TRACE_ME(rcupreempt_trace_try_flip_z1);
852 for_each_cpu(cpu, to_cpumask(rcu_cpu_online_map)) 852 for_each_possible_cpu(cpu)
853 sum += RCU_DATA_CPU(cpu)->rcu_flipctr[lastidx]; 853 sum += RCU_DATA_CPU(cpu)->rcu_flipctr[lastidx];
854 if (sum != 0) { 854 if (sum != 0) {
855 RCU_TRACE_ME(rcupreempt_trace_try_flip_ze1); 855 RCU_TRACE_ME(rcupreempt_trace_try_flip_ze1);
@@ -1067,12 +1067,6 @@ void rcu_offline_cpu(int cpu)
1067 /* seen -after- acknowledgement. */ 1067 /* seen -after- acknowledgement. */
1068 } 1068 }
1069 1069
1070 RCU_DATA_ME()->rcu_flipctr[0] += RCU_DATA_CPU(cpu)->rcu_flipctr[0];
1071 RCU_DATA_ME()->rcu_flipctr[1] += RCU_DATA_CPU(cpu)->rcu_flipctr[1];
1072
1073 RCU_DATA_CPU(cpu)->rcu_flipctr[0] = 0;
1074 RCU_DATA_CPU(cpu)->rcu_flipctr[1] = 0;
1075
1076 cpumask_clear_cpu(cpu, to_cpumask(rcu_cpu_online_map)); 1070 cpumask_clear_cpu(cpu, to_cpumask(rcu_cpu_online_map));
1077 1071
1078 spin_unlock_irqrestore(&rcu_ctrlblk.fliplock, flags); 1072 spin_unlock_irqrestore(&rcu_ctrlblk.fliplock, flags);