diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2009-10-25 22:03:50 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-10-26 04:40:29 -0400 |
commit | 9b1d82fa1611706fa7ee1505f290160a18caf95d (patch) | |
tree | 7b2eed068360465d0b028d345eb318b1a8217305 /include | |
parent | 0edf1a683e499191b27a067956ae9f5fa6e046c6 (diff) |
rcu: "Tiny RCU", The Bloatwatch Edition
This patch is a version of RCU designed for !SMP provided for a
small-footprint RCU implementation. In particular, the
implementation of synchronize_rcu() is extremely lightweight and
high performance. It passes rcutorture testing in each of the
four relevant configurations (combinations of NO_HZ and PREEMPT)
on x86. This saves about 1K bytes compared to old Classic RCU
(which is no longer in mainline), and more than three kilobytes
compared to Hierarchical RCU (updated to 2.6.30):
CONFIG_TREE_RCU:
text data bss dec filename
183 4 0 187 kernel/rcupdate.o
2783 520 36 3339 kernel/rcutree.o
3526 Total (vs 4565 for v7)
CONFIG_TREE_PREEMPT_RCU:
text data bss dec filename
263 4 0 267 kernel/rcupdate.o
4594 776 52 5422 kernel/rcutree.o
5689 Total (6155 for v7)
CONFIG_TINY_RCU:
text data bss dec filename
96 4 0 100 kernel/rcupdate.o
734 24 0 758 kernel/rcutiny.o
858 Total (vs 848 for v7)
The above is for x86. Your mileage may vary on other platforms.
Further compression is possible, but is being procrastinated.
Changes from v7 (http://lkml.org/lkml/2009/10/9/388)
o Apply Lai Jiangshan's review comments (aside from
might_sleep() in synchronize_sched(), which is covered by SMP builds).
o Fix up expedited primitives.
Changes from v6 (http://lkml.org/lkml/2009/9/23/293).
o Forward ported to put it into the 2.6.33 stream.
o Added lockdep support.
o Make lightweight rcu_barrier.
Changes from v5 (http://lkml.org/lkml/2009/6/23/12).
o Ported to latest pre-2.6.32 merge window kernel.
- Renamed rcu_qsctr_inc() to rcu_sched_qs().
- Renamed rcu_bh_qsctr_inc() to rcu_bh_qs().
- Provided trivial rcu_cpu_notify().
- Provided trivial exit_rcu().
- Provided trivial rcu_needs_cpu().
- Fixed up the rcu_*_enter/exit() functions in linux/hardirq.h.
o Removed the dependence on EMBEDDED, with a view to making
TINY_RCU default for !SMP at some time in the future.
o Added (trivial) support for expedited grace periods.
Changes from v4 (http://lkml.org/lkml/2009/5/2/91) include:
o Squeeze the size down a bit further by removing the
->completed field from struct rcu_ctrlblk.
o This permits synchronize_rcu() to become the empty function.
Previous concerns about rcutorture were unfounded, as
rcutorture correctly handles a constant value from
rcu_batches_completed() and rcu_batches_completed_bh().
Changes from v3 (http://lkml.org/lkml/2009/3/29/221) include:
o Changed rcu_batches_completed(), rcu_batches_completed_bh()
rcu_enter_nohz(), rcu_exit_nohz(), rcu_nmi_enter(), and
rcu_nmi_exit(), to be static inlines, as suggested by David
Howells. Doing this saves about 100 bytes from rcutiny.o.
(The numbers between v3 and this v4 of the patch are not directly
comparable, since they are against different versions of Linux.)
Changes from v2 (http://lkml.org/lkml/2009/2/3/333) include:
o Fix whitespace issues.
o Change short-circuit "||" operator to instead be "+" in order
to fix performance bug noted by "kraai" on LWN.
(http://lwn.net/Articles/324348/)
Changes from v1 (http://lkml.org/lkml/2009/1/13/440) include:
o This version depends on EMBEDDED as well as !SMP, as suggested
by Ingo.
o Updated rcu_needs_cpu() to unconditionally return zero,
permitting the CPU to enter dynticks-idle mode at any time.
This works because callbacks can be invoked upon entry to
dynticks-idle mode.
o Paul is now OK with this being included, based on a poll at
the Kernel Miniconf at linux.conf.au, where about ten people said
that they cared about saving 900 bytes on single-CPU systems.
o Applies to both mainline and tip/core/rcu.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: David Howells <dhowells@redhat.com>
Acked-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: dipankar@in.ibm.com
Cc: mathieu.desnoyers@polymtl.ca
Cc: dvhltc@us.ibm.com
Cc: niv@us.ibm.com
Cc: peterz@infradead.org
Cc: rostedt@goodmis.org
Cc: Valdis.Kletnieks@vt.edu
Cc: avi@redhat.com
Cc: mtosatti@redhat.com
LKML-Reference: <12565226351355-git-send-email->
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/hardirq.h | 24 | ||||
-rw-r--r-- | include/linux/rcupdate.h | 6 | ||||
-rw-r--r-- | include/linux/rcutiny.h | 97 |
3 files changed, 127 insertions, 0 deletions
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h index 6d527ee82b2b..d5b387669dab 100644 --- a/include/linux/hardirq.h +++ b/include/linux/hardirq.h | |||
@@ -139,10 +139,34 @@ static inline void account_system_vtime(struct task_struct *tsk) | |||
139 | #endif | 139 | #endif |
140 | 140 | ||
141 | #if defined(CONFIG_NO_HZ) | 141 | #if defined(CONFIG_NO_HZ) |
142 | #if defined(CONFIG_TINY_RCU) | ||
143 | extern void rcu_enter_nohz(void); | ||
144 | extern void rcu_exit_nohz(void); | ||
145 | |||
146 | static inline void rcu_irq_enter(void) | ||
147 | { | ||
148 | rcu_exit_nohz(); | ||
149 | } | ||
150 | |||
151 | static inline void rcu_irq_exit(void) | ||
152 | { | ||
153 | rcu_enter_nohz(); | ||
154 | } | ||
155 | |||
156 | static inline void rcu_nmi_enter(void) | ||
157 | { | ||
158 | } | ||
159 | |||
160 | static inline void rcu_nmi_exit(void) | ||
161 | { | ||
162 | } | ||
163 | |||
164 | #else | ||
142 | extern void rcu_irq_enter(void); | 165 | extern void rcu_irq_enter(void); |
143 | extern void rcu_irq_exit(void); | 166 | extern void rcu_irq_exit(void); |
144 | extern void rcu_nmi_enter(void); | 167 | extern void rcu_nmi_enter(void); |
145 | extern void rcu_nmi_exit(void); | 168 | extern void rcu_nmi_exit(void); |
169 | #endif | ||
146 | #else | 170 | #else |
147 | # define rcu_irq_enter() do { } while (0) | 171 | # define rcu_irq_enter() do { } while (0) |
148 | # define rcu_irq_exit() do { } while (0) | 172 | # define rcu_irq_exit() do { } while (0) |
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index 3ebd0b7bcb08..6dd71fa48429 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h | |||
@@ -68,11 +68,17 @@ extern int sched_expedited_torture_stats(char *page); | |||
68 | /* Internal to kernel */ | 68 | /* Internal to kernel */ |
69 | extern void rcu_init(void); | 69 | extern void rcu_init(void); |
70 | extern void rcu_scheduler_starting(void); | 70 | extern void rcu_scheduler_starting(void); |
71 | #ifndef CONFIG_TINY_RCU | ||
71 | extern int rcu_needs_cpu(int cpu); | 72 | extern int rcu_needs_cpu(int cpu); |
73 | #else | ||
74 | static inline int rcu_needs_cpu(int cpu) { return 0; } | ||
75 | #endif | ||
72 | extern int rcu_scheduler_active; | 76 | extern int rcu_scheduler_active; |
73 | 77 | ||
74 | #if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU) | 78 | #if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU) |
75 | #include <linux/rcutree.h> | 79 | #include <linux/rcutree.h> |
80 | #elif CONFIG_TINY_RCU | ||
81 | #include <linux/rcutiny.h> | ||
76 | #else | 82 | #else |
77 | #error "Unknown RCU implementation specified to kernel configuration" | 83 | #error "Unknown RCU implementation specified to kernel configuration" |
78 | #endif | 84 | #endif |
diff --git a/include/linux/rcutiny.h b/include/linux/rcutiny.h new file mode 100644 index 000000000000..891073c264dc --- /dev/null +++ b/include/linux/rcutiny.h | |||
@@ -0,0 +1,97 @@ | |||
1 | /* | ||
2 | * Read-Copy Update mechanism for mutual exclusion, the Bloatwatch edition. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program; if not, write to the Free Software | ||
16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
17 | * | ||
18 | * Copyright IBM Corporation, 2008 | ||
19 | * | ||
20 | * Author: Paul E. McKenney <paulmck@linux.vnet.ibm.com> | ||
21 | * | ||
22 | * For detailed explanation of Read-Copy Update mechanism see - | ||
23 | * Documentation/RCU | ||
24 | */ | ||
25 | |||
26 | #ifndef __LINUX_TINY_H | ||
27 | #define __LINUX_TINY_H | ||
28 | |||
29 | #include <linux/cache.h> | ||
30 | |||
31 | void rcu_sched_qs(int cpu); | ||
32 | void rcu_bh_qs(int cpu); | ||
33 | |||
34 | #define __rcu_read_lock() preempt_disable() | ||
35 | #define __rcu_read_unlock() preempt_enable() | ||
36 | #define __rcu_read_lock_bh() local_bh_disable() | ||
37 | #define __rcu_read_unlock_bh() local_bh_enable() | ||
38 | #define call_rcu_sched call_rcu | ||
39 | |||
40 | #define rcu_init_sched() do { } while (0) | ||
41 | extern void rcu_check_callbacks(int cpu, int user); | ||
42 | extern void __rcu_init(void); | ||
43 | |||
44 | /* | ||
45 | * Return the number of grace periods. | ||
46 | */ | ||
47 | static inline long rcu_batches_completed(void) | ||
48 | { | ||
49 | return 0; | ||
50 | } | ||
51 | |||
52 | /* | ||
53 | * Return the number of bottom-half grace periods. | ||
54 | */ | ||
55 | static inline long rcu_batches_completed_bh(void) | ||
56 | { | ||
57 | return 0; | ||
58 | } | ||
59 | |||
60 | extern int rcu_expedited_torture_stats(char *page); | ||
61 | |||
62 | static inline void synchronize_rcu_expedited(void) | ||
63 | { | ||
64 | synchronize_sched(); | ||
65 | } | ||
66 | |||
67 | static inline void synchronize_rcu_bh_expedited(void) | ||
68 | { | ||
69 | synchronize_sched(); | ||
70 | } | ||
71 | |||
72 | struct notifier_block; | ||
73 | extern int rcu_cpu_notify(struct notifier_block *self, | ||
74 | unsigned long action, void *hcpu); | ||
75 | |||
76 | #ifdef CONFIG_NO_HZ | ||
77 | |||
78 | extern void rcu_enter_nohz(void); | ||
79 | extern void rcu_exit_nohz(void); | ||
80 | |||
81 | #else /* #ifdef CONFIG_NO_HZ */ | ||
82 | |||
83 | static inline void rcu_enter_nohz(void) | ||
84 | { | ||
85 | } | ||
86 | |||
87 | static inline void rcu_exit_nohz(void) | ||
88 | { | ||
89 | } | ||
90 | |||
91 | #endif /* #else #ifdef CONFIG_NO_HZ */ | ||
92 | |||
93 | static inline void exit_rcu(void) | ||
94 | { | ||
95 | } | ||
96 | |||
97 | #endif /* __LINUX_RCUTINY_H */ | ||