lkml.org 
[lkml]   [2021]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 36/63] locking/ww_mutex: Simplify lockdep annotation
    From: Peter Zijlstra <peterz@infradead.org>

    No functional change.

    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

    ---
    kernel/locking/mutex.c | 19 ++++++++++---------
    1 file changed, 10 insertions(+), 9 deletions(-)
    ---
    --- a/kernel/locking/mutex.c
    +++ b/kernel/locking/mutex.c
    @@ -949,6 +949,10 @@ static __always_inline int __sched
    */
    if (ww_ctx->acquired == 0)
    ww_ctx->wounded = 0;
    +
    +#ifdef CONFIG_DEBUG_LOCK_ALLOC
    + nest_lock = &ww_ctx->dep_map;
    +#endif
    }

    preempt_disable();
    @@ -1102,10 +1106,9 @@ static int __sched

    static int __sched
    __ww_mutex_lock(struct mutex *lock, unsigned int state, unsigned int subclass,
    - struct lockdep_map *nest_lock, unsigned long ip,
    - struct ww_acquire_ctx *ww_ctx)
    + unsigned long ip, struct ww_acquire_ctx *ww_ctx)
    {
    - return __mutex_lock_common(lock, state, subclass, nest_lock, ip, ww_ctx, true);
    + return __mutex_lock_common(lock, state, subclass, NULL, ip, ww_ctx, true);
    }

    #ifdef CONFIG_DEBUG_LOCK_ALLOC
    @@ -1185,8 +1188,7 @@ ww_mutex_lock(struct ww_mutex *lock, str

    might_sleep();
    ret = __ww_mutex_lock(&lock->base, TASK_UNINTERRUPTIBLE,
    - 0, ctx ? &ctx->dep_map : NULL, _RET_IP_,
    - ctx);
    + 0, _RET_IP_, ctx);
    if (!ret && ctx && ctx->acquired > 1)
    return ww_mutex_deadlock_injection(lock, ctx);

    @@ -1201,8 +1203,7 @@ ww_mutex_lock_interruptible(struct ww_mu

    might_sleep();
    ret = __ww_mutex_lock(&lock->base, TASK_INTERRUPTIBLE,
    - 0, ctx ? &ctx->dep_map : NULL, _RET_IP_,
    - ctx);
    + 0, _RET_IP_, ctx);

    if (!ret && ctx && ctx->acquired > 1)
    return ww_mutex_deadlock_injection(lock, ctx);
    @@ -1376,7 +1377,7 @@ static noinline int __sched
    static noinline int __sched
    __ww_mutex_lock_slowpath(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
    {
    - return __ww_mutex_lock(&lock->base, TASK_UNINTERRUPTIBLE, 0, NULL,
    + return __ww_mutex_lock(&lock->base, TASK_UNINTERRUPTIBLE, 0,
    _RET_IP_, ctx);
    }

    @@ -1384,7 +1385,7 @@ static noinline int __sched
    __ww_mutex_lock_interruptible_slowpath(struct ww_mutex *lock,
    struct ww_acquire_ctx *ctx)
    {
    - return __ww_mutex_lock(&lock->base, TASK_INTERRUPTIBLE, 0, NULL,
    + return __ww_mutex_lock(&lock->base, TASK_INTERRUPTIBLE, 0,
    _RET_IP_, ctx);
    }

    \
     
     \ /
      Last update: 2021-07-30 16:22    [W:4.020 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site