lkml.org 
[lkml]   [2018]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 15/15] lockdep tests: Test dynamic key registration
    Date
    Make sure that the lockdep_register_key() and lockdep_unregister_key()
    code is tested when running the lockdep tests.

    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Waiman Long <longman@redhat.com>
    Cc: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: Bart Van Assche <bvanassche@acm.org>
    ---
    tools/lib/lockdep/include/liblockdep/common.h | 2 ++
    tools/lib/lockdep/include/liblockdep/mutex.h | 11 ++++++-----
    tools/lib/lockdep/tests/ABBA.c | 9 +++++++++
    3 files changed, 17 insertions(+), 5 deletions(-)

    diff --git a/tools/lib/lockdep/include/liblockdep/common.h b/tools/lib/lockdep/include/liblockdep/common.h
    index d640a9761f09..a81d91d4fc78 100644
    --- a/tools/lib/lockdep/include/liblockdep/common.h
    +++ b/tools/lib/lockdep/include/liblockdep/common.h
    @@ -45,6 +45,8 @@ void lock_acquire(struct lockdep_map *lock, unsigned int subclass,
    void lock_release(struct lockdep_map *lock, int nested,
    unsigned long ip);
    void lockdep_reset_lock(struct lockdep_map *lock);
    +void lockdep_register_key(struct lock_class_key *key);
    +void lockdep_unregister_key(struct lock_class_key *key);
    extern void debug_check_no_locks_freed(const void *from, unsigned long len);

    #define STATIC_LOCKDEP_MAP_INIT(_name, _key) \
    diff --git a/tools/lib/lockdep/include/liblockdep/mutex.h b/tools/lib/lockdep/include/liblockdep/mutex.h
    index 2073d4e1f2f0..783dd0df06f9 100644
    --- a/tools/lib/lockdep/include/liblockdep/mutex.h
    +++ b/tools/lib/lockdep/include/liblockdep/mutex.h
    @@ -7,6 +7,7 @@

    struct liblockdep_pthread_mutex {
    pthread_mutex_t mutex;
    + struct lock_class_key key;
    struct lockdep_map dep_map;
    };

    @@ -27,11 +28,10 @@ static inline int __mutex_init(liblockdep_pthread_mutex_t *lock,
    return pthread_mutex_init(&lock->mutex, __mutexattr);
    }

    -#define liblockdep_pthread_mutex_init(mutex, mutexattr) \
    -({ \
    - static struct lock_class_key __key; \
    - \
    - __mutex_init((mutex), #mutex, &__key, (mutexattr)); \
    +#define liblockdep_pthread_mutex_init(mutex, mutexattr) \
    +({ \
    + lockdep_register_key(&(mutex)->key); \
    + __mutex_init((mutex), #mutex, &(mutex)->key, (mutexattr)); \
    })

    static inline int liblockdep_pthread_mutex_lock(liblockdep_pthread_mutex_t *lock)
    @@ -55,6 +55,7 @@ static inline int liblockdep_pthread_mutex_trylock(liblockdep_pthread_mutex_t *l
    static inline int liblockdep_pthread_mutex_destroy(liblockdep_pthread_mutex_t *lock)
    {
    lockdep_reset_lock(&lock->dep_map);
    + lockdep_unregister_key(&lock->key);
    return pthread_mutex_destroy(&lock->mutex);
    }

    diff --git a/tools/lib/lockdep/tests/ABBA.c b/tools/lib/lockdep/tests/ABBA.c
    index 623313f54720..543789bc3e37 100644
    --- a/tools/lib/lockdep/tests/ABBA.c
    +++ b/tools/lib/lockdep/tests/ABBA.c
    @@ -14,4 +14,13 @@ void main(void)

    pthread_mutex_destroy(&b);
    pthread_mutex_destroy(&a);
    +
    + pthread_mutex_init(&a, NULL);
    + pthread_mutex_init(&b, NULL);
    +
    + LOCK_UNLOCK_2(a, b);
    + LOCK_UNLOCK_2(b, a);
    +
    + pthread_mutex_destroy(&b);
    + pthread_mutex_destroy(&a);
    }
    --
    2.20.0.rc2.403.gdbc3b29805-goog
    \
     
     \ /
      Last update: 2018-12-11 23:15    [W:2.112 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site