lkml.org 
[lkml]   [2018]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 3/2] rtmutex: Use waiter debug init,free magic numbers
    ... we already use these for regular mutexes, rtmutex can
    also use it, and while at it rename the whole thing since
    this is specific to waiters.

    Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
    ---
    include/linux/poison.h | 4 ++--
    kernel/locking/mutex-debug.c | 4 ++--
    kernel/locking/rtmutex-debug.c | 4 ++--
    3 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/include/linux/poison.h b/include/linux/poison.h
    index 15927ebc22f2..99119d34857e 100644
    --- a/include/linux/poison.h
    +++ b/include/linux/poison.h
    @@ -79,8 +79,8 @@
    #define ATM_POISON 0xdeadbeef

    /********** kernel/mutexes **********/
    -#define MUTEX_DEBUG_INIT 0x11
    -#define MUTEX_DEBUG_FREE 0x22
    +#define MUTEX_WAITER_DEBUG_INIT 0x11
    +#define MUTEX_WAITER_DEBUG_FREE 0x22
    #define MUTEX_POISON_WW_CTX ((void *) 0x500 + POISON_POINTER_DELTA)

    /********** lib/flex_array.c **********/
    diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
    index 9aa713629387..79b71421d763 100644
    --- a/kernel/locking/mutex-debug.c
    +++ b/kernel/locking/mutex-debug.c
    @@ -29,7 +29,7 @@
    */
    void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
    {
    - memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));
    + memset(waiter, MUTEX_WAITER_DEBUG_INIT, sizeof(*waiter));
    waiter->magic = waiter;
    INIT_LIST_HEAD(&waiter->list);
    }
    @@ -45,7 +45,7 @@ void debug_mutex_wake_waiter(struct mutex *lock, struct mutex_waiter *waiter)
    void debug_mutex_free_waiter(struct mutex_waiter *waiter)
    {
    DEBUG_LOCKS_WARN_ON(!list_empty(&waiter->list));
    - memset(waiter, MUTEX_DEBUG_FREE, sizeof(*waiter));
    + memset(waiter, MUTEX_WAITER_DEBUG_FREE, sizeof(*waiter));
    }

    void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
    diff --git a/kernel/locking/rtmutex-debug.c b/kernel/locking/rtmutex-debug.c
    index fd4fe1f5b458..95e9d8efce60 100644
    --- a/kernel/locking/rtmutex-debug.c
    +++ b/kernel/locking/rtmutex-debug.c
    @@ -157,14 +157,14 @@ void debug_rt_mutex_proxy_unlock(struct rt_mutex *lock)

    void debug_rt_mutex_init_waiter(struct rt_mutex_waiter *waiter)
    {
    - memset(waiter, 0x11, sizeof(*waiter));
    + memset(waiter, MUTEX_WAITER_DEBUG_INIT, sizeof(*waiter));
    waiter->deadlock_task_pid = NULL;
    }

    void debug_rt_mutex_free_waiter(struct rt_mutex_waiter *waiter)
    {
    put_pid(waiter->deadlock_task_pid);
    - memset(waiter, 0x22, sizeof(*waiter));
    + memset(waiter, MUTEX_WAITER_DEBUG_FREE, sizeof(*waiter));
    }

    void debug_rt_mutex_init(struct rt_mutex *lock, const char *name, struct lock_class_key *key)
    --
    2.13.6
    \
     
     \ /
      Last update: 2018-04-20 17:40    [W:3.190 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site