On 5/1/25 05:27, Alexei Starovoitov wrote:
> From: Alexei Starovoitov <ast@xxxxxxxxxx>
>
> 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.
>
> Signed-off-by: Alexei Starovoitov <ast@xxxxxxxxxx>
> ---
> 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 bf2bf40d7b18..29df45f95843 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)
This cast seems unnecessary. Better not hide mistakes when using the
local_trylock_init() macro.
>
> #define __spinlock_nested_bh_init(lock) \
> do { \
