On Wed, Sep 03, 2025 at 02:59:43PM +0200, Vlastimil Babka wrote: > From: Alexei Starovoitov <[email protected]> > > lockdep_is_held() macro assumes that "struct lockdep_map dep_map;" > is a top level field of any lock that participates in LOCKDEP. > Make it so for local_trylock_t. > > Reviewed-by: Sebastian Andrzej Siewior <[email protected]> > Signed-off-by: Alexei Starovoitov <[email protected]> > Signed-off-by: Vlastimil Babka <[email protected]> > ---
Looks good to me, Reviewed-by: Harry Yoo <[email protected]> > include/linux/local_lock_internal.h | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/include/linux/local_lock_internal.h > b/include/linux/local_lock_internal.h > index > d80b5306a2c0ccf95a3405b6b947b5f1f9a3bd38..949de37700dbc10feafc06d0b52382cf2e00c694 > 100644 > --- a/include/linux/local_lock_internal.h > +++ b/include/linux/local_lock_internal.h > @@ -17,7 +17,10 @@ typedef struct { > > /* local_trylock() and local_trylock_irqsave() only work with > local_trylock_t */ > typedef struct { > - local_lock_t llock; > +#ifdef CONFIG_DEBUG_LOCK_ALLOC > + struct lockdep_map dep_map; > + struct task_struct *owner; > +#endif > u8 acquired; > } local_trylock_t; > > @@ -31,7 +34,7 @@ typedef struct { > .owner = NULL, > > # define LOCAL_TRYLOCK_DEBUG_INIT(lockname) \ > - .llock = { LOCAL_LOCK_DEBUG_INIT((lockname).llock) }, > + LOCAL_LOCK_DEBUG_INIT(lockname) > > static inline void local_lock_acquire(local_lock_t *l) > { > @@ -81,7 +84,7 @@ do { > \ > local_lock_debug_init(lock); \ > } while (0) > > -#define __local_trylock_init(lock) __local_lock_init(lock.llock) > +#define __local_trylock_init(lock) __local_lock_init((local_lock_t *)lock) > > #define __spinlock_nested_bh_init(lock) \ > do { \ > > -- > 2.51.0 > -- Cheers, Harry / Hyeonggon
