aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2009-08-24 12:42:01 -0400
committerIngo Molnar <mingo@elte.hu>2009-08-24 14:37:04 -0400
commit33f76148ced0e0618062e302d2a9614efdbd4a06 (patch)
tree82a5c2719301bcb9f20b0597b77e91529f9ec2df
parent7c614d6461399acca5c0ba444f5db49cb332fc08 (diff)
rcu: Add CPU-offline processing for single-node configurations
Add preemptable-RCU plugin to handle the CPU-offline processing. An additional plugin is forthcoming to handle multinode RCU trees, but this current plugin works for configurations up to 32 CPUs (64 CPUs for 64-bit kernels). Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: akpm@linux-foundation.org Cc: mathieu.desnoyers@polymtl.ca Cc: josht@linux.vnet.ibm.com Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org LKML-Reference: <12511321213336-git-send-email-> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/rcutree.c2
-rw-r--r--kernel/rcutree_plugin.h24
2 files changed, 26 insertions, 0 deletions
diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index cc0255714075..000b07609876 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -84,6 +84,7 @@ extern long rcu_batches_completed_sched(void);
84static void cpu_quiet_msk(unsigned long mask, struct rcu_state *rsp, 84static void cpu_quiet_msk(unsigned long mask, struct rcu_state *rsp,
85 struct rcu_node *rnp, unsigned long flags); 85 struct rcu_node *rnp, unsigned long flags);
86static void cpu_quiet_msk_finish(struct rcu_state *rsp, unsigned long flags); 86static void cpu_quiet_msk_finish(struct rcu_state *rsp, unsigned long flags);
87static void __rcu_offline_cpu(int cpu, struct rcu_state *rsp);
87static void __rcu_process_callbacks(struct rcu_state *rsp, 88static void __rcu_process_callbacks(struct rcu_state *rsp,
88 struct rcu_data *rdp); 89 struct rcu_data *rdp);
89static void __call_rcu(struct rcu_head *head, 90static void __call_rcu(struct rcu_head *head,
@@ -920,6 +921,7 @@ static void rcu_offline_cpu(int cpu)
920{ 921{
921 __rcu_offline_cpu(cpu, &rcu_sched_state); 922 __rcu_offline_cpu(cpu, &rcu_sched_state);
922 __rcu_offline_cpu(cpu, &rcu_bh_state); 923 __rcu_offline_cpu(cpu, &rcu_bh_state);
924 rcu_preempt_offline_cpu(cpu);
923} 925}
924 926
925#else /* #ifdef CONFIG_HOTPLUG_CPU */ 927#else /* #ifdef CONFIG_HOTPLUG_CPU */
diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
index cd2ab67400c6..201334cdc200 100644
--- a/kernel/rcutree_plugin.h
+++ b/kernel/rcutree_plugin.h
@@ -259,6 +259,18 @@ static int rcu_preempted_readers(struct rcu_node *rnp)
259 return !list_empty(&rnp->blocked_tasks[rnp->gpnum & 0x1]); 259 return !list_empty(&rnp->blocked_tasks[rnp->gpnum & 0x1]);
260} 260}
261 261
262#ifdef CONFIG_HOTPLUG_CPU
263
264/*
265 * Do CPU-offline processing for preemptable RCU.
266 */
267static void rcu_preempt_offline_cpu(int cpu)
268{
269 __rcu_offline_cpu(cpu, &rcu_preempt_state);
270}
271
272#endif /* #ifdef CONFIG_HOTPLUG_CPU */
273
262/* 274/*
263 * Check for a quiescent state from the current CPU. When a task blocks, 275 * Check for a quiescent state from the current CPU. When a task blocks,
264 * the task is recorded in the corresponding CPU's rcu_node structure, 276 * the task is recorded in the corresponding CPU's rcu_node structure,
@@ -395,6 +407,18 @@ static int rcu_preempted_readers(struct rcu_node *rnp)
395 return 0; 407 return 0;
396} 408}
397 409
410#ifdef CONFIG_HOTPLUG_CPU
411
412/*
413 * Because preemptable RCU does not exist, it never needs CPU-offline
414 * processing.
415 */
416static void rcu_preempt_offline_cpu(int cpu)
417{
418}
419
420#endif /* #ifdef CONFIG_HOTPLUG_CPU */
421
398/* 422/*
399 * Because preemptable RCU does not exist, it never has any callbacks 423 * Because preemptable RCU does not exist, it never has any callbacks
400 * to check. 424 * to check.