locking/rtmutex: Remove rtmutex deadlock tester leftovers

The following debug members of 'struct rtmutex' are unused:

 - save_state: No users

 - file,line: Printed if ::name is NULL. This is only used for non-futex
	      locks so ::name is never NULL

 - magic:     Assigned to NULL by rt_mutex_destroy(), no further usage

Remove them along with unused inline and macro leftovers related to
the long gone deadlock tester.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210326153943.195064296@linutronix.de

diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
index 32f4a3538c3cc4515ac5ee16200f67e961e850c8..48b334b9eb87074cb05733f69110c18a339874e6 100644 (file)
--- a/include/linux/rtmutex.h
+++ b/include/linux/rtmutex.h
@@ -32,10 +32,7 @@ struct rt_mutex {
        struct rb_root_cached   waiters;
        struct task_struct      *owner;
 #ifdef CONFIG_DEBUG_RT_MUTEXES
-       int                     save_state;
-       const char              *name, *file;
-       int                     line;
-       void                    *magic;
+       const char              *name;
 #endif
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
        struct lockdep_map      dep_map;
@@ -60,7 +57,7 @@ struct hrtimer_sleeper;
 
 #ifdef CONFIG_DEBUG_RT_MUTEXES
 # define __DEBUG_RT_MUTEX_INITIALIZER(mutexname) \
-       , .name = #mutexname, .file = __FILE__, .line = __LINE__
+       , .name = #mutexname
 
 # define rt_mutex_init(mutex) \
 do { \

diff --git a/kernel/locking/rtmutex-debug.c b/kernel/locking/rtmutex-debug.c
index 36e69100e8e0620850d957f668f3045e962bb2d9..7e411b946d4c36ba83e0a44e4485d442054e23c1 100644 (file)
--- a/kernel/locking/rtmutex-debug.c
+++ b/kernel/locking/rtmutex-debug.c
@@ -42,12 +42,7 @@ static void printk_task(struct task_struct *p)
 
 static void printk_lock(struct rt_mutex *lock, int print_owner)
 {
-       if (lock->name)
-               printk(" [%p] {%s}\n",
-                       lock, lock->name);
-       else
-               printk(" [%p] {%s:%d}\n",
-                       lock, lock->file, lock->line);
+       printk(" [%p] {%s}\n", lock, lock->name);
 
        if (print_owner && rt_mutex_owner(lock)) {
                printk(".. ->owner: %p\n", lock->owner);

diff --git a/kernel/locking/rtmutex-debug.h b/kernel/locking/rtmutex-debug.h
index fc549713bba3f4749807cee8964d178cb286080e..772c9b012b62377f0207fd8fda8a703fd9fe0355 100644 (file)
--- a/kernel/locking/rtmutex-debug.h
+++ b/kernel/locking/rtmutex-debug.h
@@ -22,8 +22,6 @@ extern void debug_rt_mutex_deadlock(enum rtmutex_chainwalk chwalk,
                                    struct rt_mutex_waiter *waiter,
                                    struct rt_mutex *lock);
 extern void debug_rt_mutex_print_deadlock(struct rt_mutex_waiter *waiter);
-# define debug_rt_mutex_reset_waiter(w)                        \
-       do { (w)->deadlock_lock = NULL; } while (0)
 
 static inline bool debug_rt_mutex_detect_deadlock(struct rt_mutex_waiter *waiter,
                                                  enum rtmutex_chainwalk walk)

diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index ca93e5d7b026e5bc2ac202e4a6b518f6ccce5fc7..11abc60d147810a5e848d6c3dd0a677f2c25410c 100644 (file)
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -1594,9 +1594,6 @@ void __sched rt_mutex_futex_unlock(struct rt_mutex *lock)
 void rt_mutex_destroy(struct rt_mutex *lock)
 {
        WARN_ON(rt_mutex_is_locked(lock));
-#ifdef CONFIG_DEBUG_RT_MUTEXES
-       lock->magic = NULL;
-#endif
 }
 EXPORT_SYMBOL_GPL(rt_mutex_destroy);
 

diff --git a/kernel/locking/rtmutex.h b/kernel/locking/rtmutex.h
index 732f96abf4623c603998de94cef00e5c1770fb73..4dbdec15f1a035dfa3facf6e9420058aa8957a48 100644 (file)
--- a/kernel/locking/rtmutex.h
+++ b/kernel/locking/rtmutex.h
@@ -11,7 +11,6 @@
  * Non-debug version.
  */
 
-#define rt_mutex_deadlock_check(l)                     (0)
 #define debug_rt_mutex_init_waiter(w)                  do { } while (0)
 #define debug_rt_mutex_free_waiter(w)                  do { } while (0)
 #define debug_rt_mutex_lock(l)                         do { } while (0)
@@ -21,7 +20,6 @@
 #define debug_rt_mutex_init(m, n, k)                   do { } while (0)
 #define debug_rt_mutex_deadlock(d, a ,l)               do { } while (0)
 #define debug_rt_mutex_print_deadlock(w)               do { } while (0)
-#define debug_rt_mutex_reset_waiter(w)                 do { } while (0)
 
 static inline void rt_mutex_print_deadlock(struct rt_mutex_waiter *w)
 {

diff --git a/kernel/locking/rtmutex_common.h b/kernel/locking/rtmutex_common.h
index a5007f00c1b7f007bacd70c3083eaa25b1e57fef..aa047436dadfbceb59b82fc96bd7dca647307a7b 100644 (file)
--- a/kernel/locking/rtmutex_common.h
+++ b/kernel/locking/rtmutex_common.h
@@ -30,7 +30,6 @@ struct rt_mutex_waiter {
        struct task_struct      *task;
        struct rt_mutex         *lock;
 #ifdef CONFIG_DEBUG_RT_MUTEXES
-       unsigned long           ip;
        struct pid              *deadlock_task_pid;
        struct rt_mutex         *deadlock_lock;
 #endif