diff options
author | Paul E. McKenney <paul.mckenney@linaro.org> | 2012-07-31 13:12:48 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-09-23 10:42:49 -0400 |
commit | b4270ee356e5ecef5394ab80c0a0301c1676b7f0 (patch) | |
tree | d600c6dcea20363414220b9b369832af97a8a090 | |
parent | 1e3fd2b38cea41f5386bf23440f2cbdd74cf13d0 (diff) |
rcu: Permit RCU_NONIDLE() to be used from interrupt context
There is a need to use RCU from interrupt context, but either before
rcu_irq_enter() is called or after rcu_irq_exit() is called. If the
interrupt occurs from idle, then lockdep-RCU will complain about such
uses, as they appear to be illegal uses of RCU from the idle loop.
In other environments, RCU_NONIDLE() could be used to properly protect
the use of RCU, but RCU_NONIDLE() currently cannot be invoked except
from process context.
This commit therefore modifies RCU_NONIDLE() to permit its use more
globally.
Reported-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
-rw-r--r-- | include/linux/rcupdate.h | 6 | ||||
-rw-r--r-- | kernel/rcutiny.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index 115ead2b5155..0fbbd52e01f9 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h | |||
@@ -210,14 +210,12 @@ extern void exit_rcu(void); | |||
210 | * to nest RCU_NONIDLE() wrappers, but the nesting level is currently | 210 | * to nest RCU_NONIDLE() wrappers, but the nesting level is currently |
211 | * quite limited. If deeper nesting is required, it will be necessary | 211 | * quite limited. If deeper nesting is required, it will be necessary |
212 | * to adjust DYNTICK_TASK_NESTING_VALUE accordingly. | 212 | * to adjust DYNTICK_TASK_NESTING_VALUE accordingly. |
213 | * | ||
214 | * This macro may be used from process-level code only. | ||
215 | */ | 213 | */ |
216 | #define RCU_NONIDLE(a) \ | 214 | #define RCU_NONIDLE(a) \ |
217 | do { \ | 215 | do { \ |
218 | rcu_idle_exit(); \ | 216 | rcu_irq_enter(); \ |
219 | do { a; } while (0); \ | 217 | do { a; } while (0); \ |
220 | rcu_idle_enter(); \ | 218 | rcu_irq_exit(); \ |
221 | } while (0) | 219 | } while (0) |
222 | 220 | ||
223 | /* | 221 | /* |
diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c index e4163c5af1de..2e073a24d250 100644 --- a/kernel/rcutiny.c +++ b/kernel/rcutiny.c | |||
@@ -115,6 +115,7 @@ void rcu_irq_exit(void) | |||
115 | rcu_idle_enter_common(newval); | 115 | rcu_idle_enter_common(newval); |
116 | local_irq_restore(flags); | 116 | local_irq_restore(flags); |
117 | } | 117 | } |
118 | EXPORT_SYMBOL_GPL(rcu_irq_exit); | ||
118 | 119 | ||
119 | /* Common code for rcu_idle_exit() and rcu_irq_enter(), see kernel/rcutree.c. */ | 120 | /* Common code for rcu_idle_exit() and rcu_irq_enter(), see kernel/rcutree.c. */ |
120 | static void rcu_idle_exit_common(long long oldval) | 121 | static void rcu_idle_exit_common(long long oldval) |
@@ -172,6 +173,7 @@ void rcu_irq_enter(void) | |||
172 | rcu_idle_exit_common(oldval); | 173 | rcu_idle_exit_common(oldval); |
173 | local_irq_restore(flags); | 174 | local_irq_restore(flags); |
174 | } | 175 | } |
176 | EXPORT_SYMBOL_GPL(rcu_irq_enter); | ||
175 | 177 | ||
176 | #ifdef CONFIG_DEBUG_LOCK_ALLOC | 178 | #ifdef CONFIG_DEBUG_LOCK_ALLOC |
177 | 179 | ||