Commit 2d445c3e authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Ingo Molnar
Browse files

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: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210326153943.195064296@linutronix.de
parent c15380b7

include/linux/rtmutex.h

+2 −5
Original line number Diff line number Diff line
@@ -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 { \

kernel/locking/rtmutex-debug.c

+1 −6
Original line number Diff line number Diff line
@@ -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);

kernel/locking/rtmutex-debug.h

+0 −2
Original line number Diff line number Diff line
@@ -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)

kernel/locking/rtmutex.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

kernel/locking/rtmutex.h

+0 −2
Original line number Diff line number Diff line
@@ -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)

{