tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

authored by

Sebastian Andrzej Siewior and committed by
Peter Zijlstra 2507003a 12235da8

+1 -1
+1 -1
kernel/locking/lockdep.c
··· 5366 5366 struct held_lock *hlock = curr->held_locks + i; 5367 5367 5368 5368 if (match_held_lock(hlock, lock)) { 5369 - if (read == -1 || hlock->read == read) 5369 + if (read == -1 || !!hlock->read == read) 5370 5370 return LOCK_STATE_HELD; 5371 5371 5372 5372 return LOCK_STATE_NOT_HELD;