locking/rtmutex: Set proper wait context for lockdep

[ Upstream commit b41cda03765580caf7723b8c1b672d191c71013f ]

RT mutexes belong to the LD_WAIT_SLEEP class. Make them so.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210815211302.031014562@linutronix.de
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
index d1672de9ca89ede91cc8d637c8f021b02423b81c..87b325aec5085fe381a9ef1f55f74cebbe21b680 100644 (file)
--- a/include/linux/rtmutex.h
+++ b/include/linux/rtmutex.h
@@ -52,17 +52,22 @@ do { \
 } while (0)
 
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
-#define __DEP_MAP_RT_MUTEX_INITIALIZER(mutexname) \
-       , .dep_map = { .name = #mutexname }
+#define __DEP_MAP_RT_MUTEX_INITIALIZER(mutexname)      \
+       .dep_map = {                                    \
+               .name = #mutexname,                     \
+               .wait_type_inner = LD_WAIT_SLEEP,       \
+       }
 #else
 #define __DEP_MAP_RT_MUTEX_INITIALIZER(mutexname)
 #endif
 
-#define __RT_MUTEX_INITIALIZER(mutexname) \
-       { .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \
-       , .waiters = RB_ROOT_CACHED \
-       , .owner = NULL \
-       __DEP_MAP_RT_MUTEX_INITIALIZER(mutexname)}
+#define __RT_MUTEX_INITIALIZER(mutexname)                              \
+{                                                                      \
+       .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(mutexname.wait_lock),     \
+       .waiters = RB_ROOT_CACHED,                                      \
+       .owner = NULL,                                                  \
+       __DEP_MAP_RT_MUTEX_INITIALIZER(mutexname)                       \
+}
 
 #define DEFINE_RT_MUTEX(mutexname) \
        struct rt_mutex mutexname = __RT_MUTEX_INITIALIZER(mutexname)

diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index 3c20afbc19e13a4f8bc878fd562e28913fb59cd1..ae5afba2162b70941bf13517b3885b539f9ede8c 100644 (file)
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -1556,7 +1556,7 @@ void __sched __rt_mutex_init(struct rt_mutex *lock, const char *name,
                     struct lock_class_key *key)
 {
        debug_check_no_locks_freed((void *)lock, sizeof(*lock));
-       lockdep_init_map(&lock->dep_map, name, key, 0);
+       lockdep_init_map_wait(&lock->dep_map, name, key, 0, LD_WAIT_SLEEP);
 
        __rt_mutex_basic_init(lock);
 }