lockdep: add graph depth information to /proc/lockdep
PATCH 1/1 lockdep: add graph depth information to /proc/lockdep
Subject: [patch] lockdep: add graph depth information to /proc/lockdep
From: Jason Baron <[email protected]>
generate locking graph information into /proc/lockdep, for lock hierarchy documentation and visualization purposes.
sample output:
c089fd5c OPS: 138 FD: 14 BD: 1 --..: &tty->termios_mutex
-> [c07a3430] tty_ldisc_lock
-> [c07a37f0] &port_lock_key
-> [c07afdc0] &rq->rq_lock_key#2
the lock classes listed are all the first-hop lock dependencies that lockdep has seen so far.
Signed-off-by Ingo Molnar <[email protected]>
--- include/linux/lockdep.h | 1 + kernel/lockdep.c | 19 ++++++++++++------- kernel/lockdep_proc.c | 41 +++++++++++++++++++++++++++++------------ 3 files changed, 42 insertions(+), 19 deletions(-)
include/linux/lockdep.h +1 -0
@@ -132,6 +132,7 @@ struct lock_list {struct list_head entry;struct lock_class *class;struct stack_trace trace; +int distance; };/*
kernel/lockdep.c +12 -7
@@ -494,7 +494,7 @@ static void print_lock_dependencies(stru* Add a new dependency to the head of the list: */ static int add_lock_to_list (struct lock_class *class,struct lock_class *this, -struct list_head *head,unsigned long ip) +struct list_head *head,unsigned long ip,int distance) {struct lock_list *entry;/*
@@ -506,6 +506,7 @@ static int add_lock_to_list(struct lock_return 0 ; entry->class = this; + entry->distance = distance;if (!save_trace (&entry->trace))return 0 ;
@@ -910,7 +911,7 @@ check_deadlock(struct task_struct *curr,*/ static int check_prev_add (struct task_struct *curr,struct held_lock *prev, -struct held_lock *next) +struct held_lock *next,int distance) {struct lock_list *entry;int ret;
@@ -988,8 +989,11 @@ check_prev_add(struct task_struct *curr,* L2 added to its dependency list, due to the first chain.) */ list_for_each_entry (entry, &prev->class->locks_after, entry) { -if (entry->class == next->class) +if (entry->class == next->class) { +if (distance ==1 ) + entry->distance =1 ;return 2 ; + } }/*
@@ -997,12 +1001,13 @@ check_prev_add(struct task_struct *curr,* to the previous lock's dependency list: */ ret =add_lock_to_list (prev->class, next->class, - &prev->class->locks_after, next->acquire_ip); + &prev->class->locks_after, next->acquire_ip, distance); +if (!ret)return 0 ; ret =add_lock_to_list (next->class, prev->class, - &next->class->locks_before, next->acquire_ip); + &next->class->locks_before, next->acquire_ip, distance);if (!ret)return 0 ;
@@ -1050,13 +1055,14 @@ check_prevs_add(struct task_struct *curr goto out_bug;for (;;) { +int distance = curr->lockdep_depth - depth +1 ; hlock = curr->held_locks + depth-1 ;/* * Only non-recursive-read entries get new dependencies * added: */ if (hlock->read !=2 ) { -if (!check_prev_add (curr, hlock, next)) +if (!check_prev_add (curr, hlock, next, distance))return 0 ;/* * Stop after the first non-trylock entry,
@@ -2849,4 +2855,3 @@ void debug_show_held_locks(struct task_s }EXPORT_SYMBOL_GPL (debug_show_held_locks); -
kernel/lockdep_proc.c +29 -12
57 lines not on this page · raw message