Commit f2513cde authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar

lockdep: Fix lock_is_held() on recursion

The main lock_is_held() user is lockdep_assert_held(), avoid false
assertions in lockdep_off() sections by unconditionally reporting the
lock is taken.

[ the reason this is important is a lockdep_assert_held() in ttwu()
  which triggers a warning under lockdep_off() as in printk() which
  can trigger another wakeup and lock up due to spinlock
  recursion, as reported and heroically debugged by Arne Jansen ]
Reported-and-tested-by: default avatarArne Jansen <lists@die-jansens.de>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: <stable@kernel.org>
Link: http://lkml.kernel.org/r/1307398759.2497.966.camel@laptopSigned-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f339b9dc
...@@ -3426,7 +3426,7 @@ int lock_is_held(struct lockdep_map *lock) ...@@ -3426,7 +3426,7 @@ int lock_is_held(struct lockdep_map *lock)
int ret = 0; int ret = 0;
if (unlikely(current->lockdep_recursion)) if (unlikely(current->lockdep_recursion))
return ret; return 1; /* avoid false negative lockdep_assert_held() */
raw_local_irq_save(flags); raw_local_irq_save(flags);
check_flags(flags); check_flags(flags);
......
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