lockdep: Let lock_is_held_type() detect recursive read as read
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Fri, 3 Sep 2021 08:40:01 +0000 (10:40 +0200)
committerPeter Zijlstra <peterz@infradead.org>
Fri, 17 Sep 2021 13:08:44 +0000 (15:08 +0200)
commit2507003a1d10917c9158077bf6030719d02c941e
tree0e67fa9faffc4191d9d328dc41a161ccaf0d1221
parent12235da8c80a1f9909008e4ca6036d5772b81192
lockdep: Let lock_is_held_type() detect recursive read as read

lock_is_held_type(, 1) detects acquired read locks. It only recognized
locks acquired with lock_acquire_shared(). Read locks acquired with
lock_acquire_shared_recursive() are not recognized because a `2' is
stored as the read value.

Rework the check to additionally recognise lock's read value one and two
as a read held lock.

Fixes: e918188611f07 ("locking: More accurate annotations for read_lock()")
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Boqun Feng <boqun.feng@gmail.com>
Acked-by: Waiman Long <longman@redhat.com>
Link: https://lkml.kernel.org/r/20210903084001.lblecrvz4esl4mrr@linutronix.de
kernel/locking/lockdep.c