Commit e969970b authored by J. R. Okajima's avatar J. R. Okajima Committed by Ingo Molnar

locking/lockdep: Factor out the validate_held_lock() helper function

Behaviour should not change.
Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1486053497-9948-2-git-send-email-hooanon05g@gmail.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 41c2c5b8
...@@ -3473,6 +3473,24 @@ static struct held_lock *find_held_lock(struct task_struct *curr, ...@@ -3473,6 +3473,24 @@ static struct held_lock *find_held_lock(struct task_struct *curr,
return ret; return ret;
} }
static int reacquire_held_locks(struct task_struct *curr, unsigned int depth,
int idx)
{
struct held_lock *hlock;
for (hlock = curr->held_locks + idx; idx < depth; idx++, hlock++) {
if (!__lock_acquire(hlock->instance,
hlock_class(hlock)->subclass,
hlock->trylock,
hlock->read, hlock->check,
hlock->hardirqs_off,
hlock->nest_lock, hlock->acquire_ip,
hlock->references, hlock->pin_count))
return 1;
}
return 0;
}
static int static int
__lock_set_class(struct lockdep_map *lock, const char *name, __lock_set_class(struct lockdep_map *lock, const char *name,
struct lock_class_key *key, unsigned int subclass, struct lock_class_key *key, unsigned int subclass,
...@@ -3503,15 +3521,8 @@ __lock_set_class(struct lockdep_map *lock, const char *name, ...@@ -3503,15 +3521,8 @@ __lock_set_class(struct lockdep_map *lock, const char *name,
curr->lockdep_depth = i; curr->lockdep_depth = i;
curr->curr_chain_key = hlock->prev_chain_key; curr->curr_chain_key = hlock->prev_chain_key;
for (; i < depth; i++) { if (reacquire_held_locks(curr, depth, i))
hlock = curr->held_locks + i; return 0;
if (!__lock_acquire(hlock->instance,
hlock_class(hlock)->subclass, hlock->trylock,
hlock->read, hlock->check, hlock->hardirqs_off,
hlock->nest_lock, hlock->acquire_ip,
hlock->references, hlock->pin_count))
return 0;
}
/* /*
* I took it apart and put it back together again, except now I have * I took it apart and put it back together again, except now I have
...@@ -3582,15 +3593,8 @@ __lock_release(struct lockdep_map *lock, int nested, unsigned long ip) ...@@ -3582,15 +3593,8 @@ __lock_release(struct lockdep_map *lock, int nested, unsigned long ip)
curr->lockdep_depth = i; curr->lockdep_depth = i;
curr->curr_chain_key = hlock->prev_chain_key; curr->curr_chain_key = hlock->prev_chain_key;
for (i++; i < depth; i++) { if (reacquire_held_locks(curr, depth, i + 1))
hlock = curr->held_locks + i; return 0;
if (!__lock_acquire(hlock->instance,
hlock_class(hlock)->subclass, hlock->trylock,
hlock->read, hlock->check, hlock->hardirqs_off,
hlock->nest_lock, hlock->acquire_ip,
hlock->references, hlock->pin_count))
return 0;
}
/* /*
* We had N bottles of beer on the wall, we drank one, but now * We had N bottles of beer on the wall, we drank one, but now
......
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