diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2011-12-09 17:00:06 -0500 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2011-12-11 13:33:18 -0500 |
commit | 70321d447aa1a7cc2d60db16234f43c5a65630e7 (patch) | |
tree | a97749ef35045fc41585d121f595cb0644b319c2 /kernel/rcutree_plugin.h | |
parent | d493011a376f9df3b8b3da1102509b343b1a4ef2 (diff) |
Revert "rcu: Permit rt_mutex_unlock() with irqs disabled"
This reverts commit 5342e269b2b58ee0b0b4168a94087faaa60d0567.
The approach taken in this patch was deemed too abusive to mutexes,
and thus too likely to result in maintenance problems in the future.
Instead, we will disallow RCU read-side critical sections that partially
overlap with interrupt-disbled code segments.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/rcutree_plugin.h')
-rw-r--r-- | kernel/rcutree_plugin.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h index 8cd9efe7e81f..f55f10ba01f5 100644 --- a/kernel/rcutree_plugin.h +++ b/kernel/rcutree_plugin.h | |||
@@ -1165,8 +1165,6 @@ static void rcu_initiate_boost_trace(struct rcu_node *rnp) | |||
1165 | 1165 | ||
1166 | #endif /* #else #ifdef CONFIG_RCU_TRACE */ | 1166 | #endif /* #else #ifdef CONFIG_RCU_TRACE */ |
1167 | 1167 | ||
1168 | static struct lock_class_key rcu_boost_class; | ||
1169 | |||
1170 | /* | 1168 | /* |
1171 | * Carry out RCU priority boosting on the task indicated by ->exp_tasks | 1169 | * Carry out RCU priority boosting on the task indicated by ->exp_tasks |
1172 | * or ->boost_tasks, advancing the pointer to the next task in the | 1170 | * or ->boost_tasks, advancing the pointer to the next task in the |
@@ -1229,9 +1227,6 @@ static int rcu_boost(struct rcu_node *rnp) | |||
1229 | */ | 1227 | */ |
1230 | t = container_of(tb, struct task_struct, rcu_node_entry); | 1228 | t = container_of(tb, struct task_struct, rcu_node_entry); |
1231 | rt_mutex_init_proxy_locked(&mtx, t); | 1229 | rt_mutex_init_proxy_locked(&mtx, t); |
1232 | /* Avoid lockdep false positives. This rt_mutex is its own thing. */ | ||
1233 | lockdep_set_class_and_name(&mtx.wait_lock, &rcu_boost_class, | ||
1234 | "rcu_boost_mutex"); | ||
1235 | t->rcu_boost_mutex = &mtx; | 1230 | t->rcu_boost_mutex = &mtx; |
1236 | raw_spin_unlock_irqrestore(&rnp->lock, flags); | 1231 | raw_spin_unlock_irqrestore(&rnp->lock, flags); |
1237 | rt_mutex_lock(&mtx); /* Side effect: boosts task t's priority. */ | 1232 | rt_mutex_lock(&mtx); /* Side effect: boosts task t's priority. */ |