Skip to content

Commit

Permalink
lockdep: Print a nicer description for simple irq lock inversions
Browse files Browse the repository at this point in the history
Lockdep output can be pretty cryptic, having nicer output
can save a lot of head scratching. When a simple irq inversion
scenario is detected by lockdep (lock A taken in interrupt
context but also in thread context without disabling interrupts)
we now get the following (hopefully more informative) output:

other info that might help us debug this:
 Possible unsafe locking scenario:

       CPU0
       ----
  lock(lockA);
  <Interrupt>
    lock(lockA);

 *** DEADLOCK ***

Signed-off-by: Steven Rostedt <[email protected]>
Acked-by: Peter Zijlstra <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Andrew Morton <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
  • Loading branch information
Steven Rostedt authored and Ingo Molnar committed Apr 22, 2011
1 parent 6be8c39 commit 282b5c2
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions kernel/lockdep.c
Original file line number Diff line number Diff line change
Expand Up @@ -2158,6 +2158,24 @@ static void check_chain_key(struct task_struct *curr)
#endif
}

static void
print_usage_bug_scenario(struct held_lock *lock)
{
struct lock_class *class = hlock_class(lock);

printk(" Possible unsafe locking scenario:\n\n");
printk(" CPU0\n");
printk(" ----\n");
printk(" lock(");
__print_lock_name(class);
printk(");\n");
printk(" <Interrupt>\n");
printk(" lock(");
__print_lock_name(class);
printk(");\n");
printk("\n *** DEADLOCK ***\n\n");
}

static int
print_usage_bug(struct task_struct *curr, struct held_lock *this,
enum lock_usage_bit prev_bit, enum lock_usage_bit new_bit)
Expand Down Expand Up @@ -2186,6 +2204,8 @@ print_usage_bug(struct task_struct *curr, struct held_lock *this,

print_irqtrace_events(curr);
printk("\nother info that might help us debug this:\n");
print_usage_bug_scenario(this);

lockdep_print_held_locks(curr);

printk("\nstack backtrace:\n");
Expand Down

0 comments on commit 282b5c2

Please sign in to comment.