Commit 9c35dd7f authored by Jarek Poplawski's avatar Jarek Poplawski Committed by Linus Torvalds

[PATCH] lockdep: debug_show_all_locks & debug_show_held_locks vs. debug_locks

lockdep's data shouldn't be used when debug_locks == 0 because it's not
updated after this, so it's more misleading than helpful.

PS: probably lockdep's current-> fields should be reset after it turns
debug_locks off: so, after printing a bug report, but before return from
exported functions, but there are really a lot of these possibilities (e.g.
 after DEBUG_LOCKS_WARN_ON), so, something could be missed.  (Of course
direct use of this fields isn't recommended either.)
Reported-by: default avatarFolkert van Heusden <folkert@vanheusden.com>
Inspired-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: default avatarJarek Poplawski <jarkao2@o2.pl>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b4337692
...@@ -2742,6 +2742,10 @@ void debug_show_all_locks(void) ...@@ -2742,6 +2742,10 @@ void debug_show_all_locks(void)
int count = 10; int count = 10;
int unlock = 1; int unlock = 1;
if (unlikely(!debug_locks)) {
printk("INFO: lockdep is turned off.\n");
return;
}
printk("\nShowing all locks held in the system:\n"); printk("\nShowing all locks held in the system:\n");
/* /*
...@@ -2785,6 +2789,10 @@ EXPORT_SYMBOL_GPL(debug_show_all_locks); ...@@ -2785,6 +2789,10 @@ EXPORT_SYMBOL_GPL(debug_show_all_locks);
void debug_show_held_locks(struct task_struct *task) void debug_show_held_locks(struct task_struct *task)
{ {
if (unlikely(!debug_locks)) {
printk("INFO: lockdep is turned off.\n");
return;
}
lockdep_print_held_locks(task); lockdep_print_held_locks(task);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment