Skip to content

Commit

Permalink
[PATCH] lockdep: increase max allowed recursion depth
Browse files Browse the repository at this point in the history
In general, lockdep warnings are intended to be non-fatal, so I have put in
various practical limits on internal data structure failure modes.  We haven't
had a /single/ lockdep-internal crash ever since lockdep went upstream [the
unwinder crashes are outside of lockdep], and that's largely due to the good
internal checks it does.

Recursion within the dependency graph is currently limited to 20, that's
probably not enough on some many-CPU boxes - this patch doubles it to 40.  I
have written the lockdep functions to have as small stackframes as possible,
so 40 should be OK too.  (The practical recursion limit should be somewhere
between 100 and 200 entries.  If we hit that then I'll change the algorithm to
be iteration-based.  Graph walking logic is so easy to program via recursion,
so i'd like to keep recursion as long as possible.)

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Ingo Molnar authored and Linus Torvalds committed Oct 17, 2006
1 parent 623a439 commit ca268c6
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions kernel/lockdep.c
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,8 @@ static noinline int print_circular_bug_tail(void)
return 0;
}

#define RECURSION_LIMIT 40

static int noinline print_infinite_recursion_bug(void)
{
__raw_spin_unlock(&hash_lock);
Expand All @@ -595,7 +597,7 @@ check_noncircular(struct lock_class *source, unsigned int depth)
debug_atomic_inc(&nr_cyclic_check_recursions);
if (depth > max_recursion_depth)
max_recursion_depth = depth;
if (depth >= 20)
if (depth >= RECURSION_LIMIT)
return print_infinite_recursion_bug();
/*
* Check this lock's dependency list:
Expand Down Expand Up @@ -645,7 +647,7 @@ find_usage_forwards(struct lock_class *source, unsigned int depth)

if (depth > max_recursion_depth)
max_recursion_depth = depth;
if (depth >= 20)
if (depth >= RECURSION_LIMIT)
return print_infinite_recursion_bug();

debug_atomic_inc(&nr_find_usage_forwards_checks);
Expand Down Expand Up @@ -684,7 +686,7 @@ find_usage_backwards(struct lock_class *source, unsigned int depth)

if (depth > max_recursion_depth)
max_recursion_depth = depth;
if (depth >= 20)
if (depth >= RECURSION_LIMIT)
return print_infinite_recursion_bug();

debug_atomic_inc(&nr_find_usage_backwards_checks);
Expand Down

0 comments on commit ca268c6

Please sign in to comment.