futex: Remove rt_mutex_deadlock_account_*() (fffa954f) · Commits · 戴 / test

kernel/locking/rtmutex-debug.c

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -174,12 +174,3 @@ void debug_rt_mutex_init(struct rt_mutex lock, const char name)
	lock->name = name;		lock->name = name;
	}		}

	void
	rt_mutex_deadlock_account_lock(struct rt_mutex lock, struct task_struct task)
	{
	}

	void rt_mutex_deadlock_account_unlock(struct task_struct *task)
	{
	}

kernel/locking/rtmutex-debug.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -9,9 +9,6 @@
	* This file contains macros used solely by rtmutex.c. Debug version.		* This file contains macros used solely by rtmutex.c. Debug version.
	*/		*/

	extern void
	rt_mutex_deadlock_account_lock(struct rt_mutex lock, struct task_struct task);
	extern void rt_mutex_deadlock_account_unlock(struct task_struct *task);
	extern void debug_rt_mutex_init_waiter(struct rt_mutex_waiter *waiter);		extern void debug_rt_mutex_init_waiter(struct rt_mutex_waiter *waiter);
	extern void debug_rt_mutex_free_waiter(struct rt_mutex_waiter *waiter);		extern void debug_rt_mutex_free_waiter(struct rt_mutex_waiter *waiter);
	extern void debug_rt_mutex_init(struct rt_mutex lock, const char name);		extern void debug_rt_mutex_init(struct rt_mutex lock, const char name);

kernel/locking/rtmutex.c

+18 −29

Original line number	Original line	Diff line number	Diff line
	@@ -938,8 +938,6 @@ takeit:
	*/		*/
	rt_mutex_set_owner(lock, task);		rt_mutex_set_owner(lock, task);

	rt_mutex_deadlock_account_lock(lock, task);

	return 1;		return 1;
	}		}

	@@ -1342,8 +1340,6 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,

	debug_rt_mutex_unlock(lock);		debug_rt_mutex_unlock(lock);

	rt_mutex_deadlock_account_unlock(current);

	/*		/*
	* We must be careful here if the fast path is enabled. If we		* We must be careful here if the fast path is enabled. If we
	* have no waiters queued we cannot set owner to NULL here		* have no waiters queued we cannot set owner to NULL here
	@@ -1409,10 +1405,9 @@ rt_mutex_fastlock(struct rt_mutex *lock, int state,
	struct hrtimer_sleeper *timeout,		struct hrtimer_sleeper *timeout,
	enum rtmutex_chainwalk chwalk))		enum rtmutex_chainwalk chwalk))
	{		{
	if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current))) {		if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))
	rt_mutex_deadlock_account_lock(lock, current);
	return 0;		return 0;
	} else
	return slowfn(lock, state, NULL, RT_MUTEX_MIN_CHAINWALK);		return slowfn(lock, state, NULL, RT_MUTEX_MIN_CHAINWALK);
	}		}

	@@ -1425,10 +1420,9 @@ rt_mutex_timed_fastlock(struct rt_mutex *lock, int state,
	enum rtmutex_chainwalk chwalk))		enum rtmutex_chainwalk chwalk))
	{		{
	if (chwalk == RT_MUTEX_MIN_CHAINWALK &&		if (chwalk == RT_MUTEX_MIN_CHAINWALK &&
	likely(rt_mutex_cmpxchg_acquire(lock, NULL, current))) {		likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))
	rt_mutex_deadlock_account_lock(lock, current);
	return 0;		return 0;
	} else
	return slowfn(lock, state, timeout, chwalk);		return slowfn(lock, state, timeout, chwalk);
	}		}

	@@ -1436,10 +1430,9 @@ static inline int
	rt_mutex_fasttrylock(struct rt_mutex *lock,		rt_mutex_fasttrylock(struct rt_mutex *lock,
	int (slowfn)(struct rt_mutex lock))		int (slowfn)(struct rt_mutex lock))
	{		{
	if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current))) {		if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))
	rt_mutex_deadlock_account_lock(lock, current);
	return 1;		return 1;
	}
	return slowfn(lock);		return slowfn(lock);
	}		}

	@@ -1449,12 +1442,12 @@ rt_mutex_fastunlock(struct rt_mutex *lock,
	struct wake_q_head *wqh))		struct wake_q_head *wqh))
	{		{
	DEFINE_WAKE_Q(wake_q);		DEFINE_WAKE_Q(wake_q);
			bool deboost;

	if (likely(rt_mutex_cmpxchg_release(lock, current, NULL))) {		if (likely(rt_mutex_cmpxchg_release(lock, current, NULL)))
	rt_mutex_deadlock_account_unlock(current);		return;

	} else {		deboost = slowfn(lock, &wake_q);
	bool deboost = slowfn(lock, &wake_q);

	wake_up_q(&wake_q);		wake_up_q(&wake_q);

	@@ -1462,7 +1455,6 @@ rt_mutex_fastunlock(struct rt_mutex *lock,
	if (deboost)		if (deboost)
	rt_mutex_adjust_prio(current);		rt_mutex_adjust_prio(current);
	}		}
	}

	/**		/**
	* rt_mutex_lock - lock a rt_mutex		* rt_mutex_lock - lock a rt_mutex
	@@ -1572,10 +1564,9 @@ EXPORT_SYMBOL_GPL(rt_mutex_unlock);
	bool __sched rt_mutex_futex_unlock(struct rt_mutex *lock,		bool __sched rt_mutex_futex_unlock(struct rt_mutex *lock,
	struct wake_q_head *wqh)		struct wake_q_head *wqh)
	{		{
	if (likely(rt_mutex_cmpxchg_release(lock, current, NULL))) {		if (likely(rt_mutex_cmpxchg_release(lock, current, NULL)))
	rt_mutex_deadlock_account_unlock(current);
	return false;		return false;
	}
	return rt_mutex_slowunlock(lock, wqh);		return rt_mutex_slowunlock(lock, wqh);
	}		}

	@@ -1637,7 +1628,6 @@ void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
	__rt_mutex_init(lock, NULL);		__rt_mutex_init(lock, NULL);
	debug_rt_mutex_proxy_lock(lock, proxy_owner);		debug_rt_mutex_proxy_lock(lock, proxy_owner);
	rt_mutex_set_owner(lock, proxy_owner);		rt_mutex_set_owner(lock, proxy_owner);
	rt_mutex_deadlock_account_lock(lock, proxy_owner);
	}		}

	/**		/**
	@@ -1657,7 +1647,6 @@ void rt_mutex_proxy_unlock(struct rt_mutex *lock,
	{		{
	debug_rt_mutex_proxy_unlock(lock);		debug_rt_mutex_proxy_unlock(lock);
	rt_mutex_set_owner(lock, NULL);		rt_mutex_set_owner(lock, NULL);
	rt_mutex_deadlock_account_unlock(proxy_owner);
	}		}

	/**		/**

kernel/locking/rtmutex.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -11,8 +11,6 @@
	*/		*/

	#define rt_mutex_deadlock_check(l) (0)		#define rt_mutex_deadlock_check(l) (0)
	#define rt_mutex_deadlock_account_lock(m, t) do { } while (0)
	#define rt_mutex_deadlock_account_unlock(l) do { } while (0)
	#define debug_rt_mutex_init_waiter(w) do { } while (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_free_waiter(w) do { } while (0)
	#define debug_rt_mutex_lock(l) do { } while (0)		#define debug_rt_mutex_lock(l) do { } while (0)

Admin message