Commit f5a98866 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

locking/rtmutex: Decrapify __rt_mutex_init() 



The conditional debug handling is just another layer of obfuscation. Split
the function so rt_mutex_init_proxy_locked() can invoke the inner init and
__rt_mutex_init() gets the full treatment.

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.955697588@linutronix.de
parent 37350e3b

kernel/locking/rtmutex.c

+4 −6
Original line number Diff line number Diff line
@@ -1586,12 +1586,10 @@ void __sched rt_mutex_futex_unlock(struct rt_mutex *lock) 
void __rt_mutex_init(struct rt_mutex *lock, const char *name,

		     struct lock_class_key *key)

{

	lock->owner = NULL;

	raw_spin_lock_init(&lock->wait_lock);

	lock->waiters = RB_ROOT_CACHED;

	debug_check_no_locks_freed((void *)lock, sizeof(*lock));

	lockdep_init_map(&lock->dep_map, name, key, 0);



	if (name && key)

		debug_rt_mutex_init(lock, name, key);

	__rt_mutex_basic_init(lock);

}

EXPORT_SYMBOL_GPL(__rt_mutex_init);
@@ -1612,7 +1610,7 @@ EXPORT_SYMBOL_GPL(__rt_mutex_init); 
void rt_mutex_init_proxy_locked(struct rt_mutex *lock,

				struct task_struct *proxy_owner)

{

	__rt_mutex_init(lock, NULL, NULL);

	__rt_mutex_basic_init(lock);

	rt_mutex_set_owner(lock, proxy_owner);

}

kernel/locking/rtmutex_common.h

+7 −0
Original line number Diff line number Diff line
@@ -100,6 +100,13 @@ enum rtmutex_chainwalk { 
	RT_MUTEX_FULL_CHAINWALK,

};



static inline void __rt_mutex_basic_init(struct rt_mutex *lock)

{

	lock->owner = NULL;

	raw_spin_lock_init(&lock->wait_lock);

	lock->waiters = RB_ROOT_CACHED;

}



/*

 * PI-futex support (proxy locking functions, etc.):

 */