History

rcu: Add lockdep-RCU checks for simple self-deadlock

It is illegal to have a grace period within a same-flavor RCU read-side critical section, so this commit adds lockdep-RCU checks to splat when such abuse is encountered. This commit does not detect more elaborate RCU deadlock situations. These situations might be a job for lockdep enhancements.

Paul E. McKenney committed 14 years ago

Commit fe15d701 parent 18fec7d5 files · +27 −0Browse files

Unified · Split

5 files
  1. kernel/rcutiny.c +4 −0
  2. kernel/rcutiny_plugin.h +5 −0
  3. kernel/rcutree.c +8 −0
  4. kernel/rcutree_plugin.h +4 −0
  5. kernel/srcu.c +6 −0
kernel/rcutiny.c+4−0
@@ -319,6 +319,10 @@ static void rcu_process_callbacks(struct softirq_action *unused) · 318 unmodified lines
319319 */
320320 void synchronize_sched(void)
321321 {
322+ rcu_lockdep_assert(!lock_is_held(&rcu_bh_lock_map) &&
323+ !lock_is_held(&rcu_lock_map) &&
324+ !lock_is_held(&rcu_sched_lock_map),
325+ "Illegal synchronize_sched() in RCU read-side critical section");
322326 cond_resched();
323327 }
324328 EXPORT_SYMBOL_GPL(synchronize_sched);
kernel/rcutiny_plugin.h+5−0
@@ -706,6 +706,11 @@ EXPORT_SYMBOL_GPL(call_rcu); · 705 unmodified lines
706706 */
707707 void synchronize_rcu(void)
708708 {
709+ rcu_lockdep_assert(!lock_is_held(&rcu_bh_lock_map) &&
710+ !lock_is_held(&rcu_lock_map) &&
711+ !lock_is_held(&rcu_sched_lock_map),
712+ "Illegal synchronize_rcu() in RCU read-side critical section");
713+
709714 #ifdef CONFIG_DEBUG_LOCK_ALLOC
710715 if (!rcu_scheduler_active)
711716 return;
kernel/rcutree.c+8−0
@@ -1816,6 +1816,10 @@ EXPORT_SYMBOL_GPL(call_rcu_bh); · 1815 unmodified lines
18161816 */
18171817 void synchronize_sched(void)
18181818 {
1819+ rcu_lockdep_assert(!lock_is_held(&rcu_bh_lock_map) &&
1820+ !lock_is_held(&rcu_lock_map) &&
1821+ !lock_is_held(&rcu_sched_lock_map),
1822+ "Illegal synchronize_sched() in RCU-sched read-side critical section");
18191823 if (rcu_blocking_is_gp())
18201824 return;
18211825 wait_rcu_gp(call_rcu_sched);
@@ -1833,6 +1837,10 @@ EXPORT_SYMBOL_GPL(synchronize_sched); · 11 unmodified lines
18331837 */
18341838 void synchronize_rcu_bh(void)
18351839 {
1840+ rcu_lockdep_assert(!lock_is_held(&rcu_bh_lock_map) &&
1841+ !lock_is_held(&rcu_lock_map) &&
1842+ !lock_is_held(&rcu_sched_lock_map),
1843+ "Illegal synchronize_rcu_bh() in RCU-bh read-side critical section");
18361844 if (rcu_blocking_is_gp())
18371845 return;
18381846 wait_rcu_gp(call_rcu_bh);
kernel/rcutree_plugin.h+4−0
@@ -688,6 +688,10 @@ EXPORT_SYMBOL_GPL(call_rcu); · 687 unmodified lines
688688 */
689689 void synchronize_rcu(void)
690690 {
691+ rcu_lockdep_assert(!lock_is_held(&rcu_bh_lock_map) &&
692+ !lock_is_held(&rcu_lock_map) &&
693+ !lock_is_held(&rcu_sched_lock_map),
694+ "Illegal synchronize_rcu() in RCU read-side critical section");
691695 if (!rcu_scheduler_active)
692696 return;
693697 wait_rcu_gp(call_rcu);
kernel/srcu.c+6−0
@@ -172,6 +172,12 @@ static void __synchronize_srcu(struct srcu_struct *sp, void (*sync_func)(void)) · 171 unmodified lines
172172 {
173173 int idx;
174174
175+ rcu_lockdep_assert(!lock_is_held(&sp->dep_map) &&
176+ !lock_is_held(&rcu_bh_lock_map) &&
177+ !lock_is_held(&rcu_lock_map) &&
178+ !lock_is_held(&rcu_sched_lock_map),
179+ "Illegal synchronize_srcu() in same-type SRCU (or RCU) read-side critical section");
180+
175181 idx = sp->completed;
176182 mutex_lock(&sp->mutex);
177183

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t