mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [patch V2 00/15] locking/rtmutex: Spring cleaning
@ 2021-03-26 15:29 Thomas Gleixner
  2021-03-26 15:29 ` [patch V2 01/15] locking/rtmutex: Remove rt_mutex_timed_lock() Thomas Gleixner
                   ` (15 more replies)
  0 siblings, 16 replies; 33+ messages in thread
From: Thomas Gleixner @ 2021-03-26 15:29 UTC (permalink / raw)
  To: LKML
  Cc: Peter Zijlstra, Ingo Molnar, Will Deacon, Waiman Long,
	Boqun Feng, Steven Rostedt, Sebastian Andrzej Siewior

This is V2 of this cleanup. V1 can be found here:

   https://lore.kernel.org/r/87h7kydka0.ffs@nanos.tec.linutronix.de

While working on the rtmutex related RT bits we noticed quite some
inconsistencies and bitrot in the rtmutex code.

The series is based on

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core

and also available from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git rtmutex

as a combo.

Changes vs. V1:
  - Fix the fallout reported by 0day and Sebastian
  - Make the open coded replacements work for real
  - Add the signal cleanup which I missed last time

Thanks,

	tglx
---
 a/kernel/locking/rtmutex-debug.c |  182 -----------------
 a/kernel/locking/rtmutex-debug.h |   37 ---
 a/kernel/locking/rtmutex.h       |   35 ---
 include/linux/rtmutex.h          |   35 ---
 kernel/locking/Makefile          |    2 
 kernel/locking/rtmutex.c         |  402 ++++++++++++++-------------------------
 kernel/locking/rtmutex_common.h  |  104 +++++-----
 7 files changed, 202 insertions(+), 595 deletions(-)

^ permalink raw reply	[flat|nested] 33+ messages in thread
* [patch 08/14] locking/rtmutex: Remove pointless CONFIG_RT_MUTEXES=n stubs
@ 2021-03-23 21:30 Thomas Gleixner
  2021-03-24  7:22 ` [tip: locking/core] " tip-bot2 for Thomas Gleixner
  0 siblings, 1 reply; 33+ messages in thread
From: Thomas Gleixner @ 2021-03-23 21:30 UTC (permalink / raw)
  To: LKML
  Cc: Peter Zijlstra, Ingo Molnar, Will Deacon, Waiman Long,
	Boqun Feng, Steven Rostedt, Sebastian Andrzej Siewior

None of these functions is used when CONFIG_RT_MUTEXES=n.

Remove the gunk. Remove pointless comments and clean up the coding style
mess while at it.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 kernel/locking/rtmutex_common.h |   56 +++++++---------------------------------
 1 file changed, 11 insertions(+), 45 deletions(-)

--- a/kernel/locking/rtmutex_common.h
+++ b/kernel/locking/rtmutex_common.h
@@ -23,29 +23,25 @@
  * @tree_entry:		pi node to enqueue into the mutex waiters tree
  * @pi_tree_entry:	pi node to enqueue into the mutex owner waiters tree
  * @task:		task reference to the blocked task
+ * @lock:		Pointer to the rt_mutex on which the waiter blocks
+ * @prio:		Priority of the waiter
+ * @deadline:		Deadline of the waiter if applicable
  */
 struct rt_mutex_waiter {
-	struct rb_node          tree_entry;
-	struct rb_node          pi_tree_entry;
+	struct rb_node		tree_entry;
+	struct rb_node		pi_tree_entry;
 	struct task_struct	*task;
 	struct rt_mutex		*lock;
-	int prio;
-	u64 deadline;
+	int			prio;
+	u64			deadline;
 };
 
-/*
- * Various helpers to access the waiters-tree:
- */
-
-#ifdef CONFIG_RT_MUTEXES
-
 static inline int rt_mutex_has_waiters(struct rt_mutex *lock)
 {
 	return !RB_EMPTY_ROOT(&lock->waiters.rb_root);
 }
 
-static inline struct rt_mutex_waiter *
-rt_mutex_top_waiter(struct rt_mutex *lock)
+static inline struct rt_mutex_waiter *rt_mutex_top_waiter(struct rt_mutex *lock)
 {
 	struct rb_node *leftmost = rb_first_cached(&lock->waiters);
 	struct rt_mutex_waiter *w = NULL;
@@ -62,42 +58,12 @@ static inline int task_has_pi_waiters(st
 	return !RB_EMPTY_ROOT(&p->pi_waiters.rb_root);
 }
 
-static inline struct rt_mutex_waiter *
-task_top_pi_waiter(struct task_struct *p)
-{
-	return rb_entry(p->pi_waiters.rb_leftmost,
-			struct rt_mutex_waiter, pi_tree_entry);
-}
-
-#else
-
-static inline int rt_mutex_has_waiters(struct rt_mutex *lock)
-{
-	return false;
-}
-
-static inline struct rt_mutex_waiter *
-rt_mutex_top_waiter(struct rt_mutex *lock)
-{
-	return NULL;
-}
-
-static inline int task_has_pi_waiters(struct task_struct *p)
-{
-	return false;
-}
-
-static inline struct rt_mutex_waiter *
-task_top_pi_waiter(struct task_struct *p)
+static inline struct rt_mutex_waiter *task_top_pi_waiter(struct task_struct *p)
 {
-	return NULL;
+	return rb_entry(p->pi_waiters.rb_leftmost, struct rt_mutex_waiter,
+			pi_tree_entry);
 }
 
-#endif
-
-/*
- * lock->owner state tracking:
- */
 #define RT_MUTEX_HAS_WAITERS	1UL
 
 static inline struct task_struct *rt_mutex_owner(struct rt_mutex *lock)


^ permalink raw reply	[flat|nested] 33+ messages in thread

end of thread, other threads:[~2021-03-29 16:25 UTC | newest]

Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-26 15:29 [patch V2 00/15] locking/rtmutex: Spring cleaning Thomas Gleixner
2021-03-26 15:29 ` [patch V2 01/15] locking/rtmutex: Remove rt_mutex_timed_lock() Thomas Gleixner
2021-03-29 16:24   ` [tip: locking/core] " tip-bot2 for Sebastian Andrzej Siewior
2021-03-26 15:29 ` [patch V2 02/15] locking/rtmutex: Remove rtmutex deadlock tester leftovers Thomas Gleixner
2021-03-29 16:24   ` [tip: locking/core] " tip-bot2 for Sebastian Andrzej Siewior
2021-03-26 15:29 ` [patch V2 03/15] locking/rtmutex: Remove output from deadlock detector Thomas Gleixner
2021-03-29 16:24   ` [tip: locking/core] " tip-bot2 for Sebastian Andrzej Siewior
2021-03-26 15:29 ` [patch V2 04/15] locking/rtmutex: Consolidate rt_mutex_init() Thomas Gleixner
2021-03-29 16:24   ` [tip: locking/core] " tip-bot2 for Sebastian Andrzej Siewior
2021-03-26 15:29 ` [patch V2 05/15] locking/rtmutex: Remove empty and unused debug stubs Thomas Gleixner
2021-03-29 16:24   ` [tip: locking/core] " tip-bot2 for Thomas Gleixner
2021-03-26 15:29 ` [patch V2 06/15] locking/rtmutex: Move rt_mutex_debug_task_free() to rtmutex.c Thomas Gleixner
2021-03-29 16:24   ` [tip: locking/core] " tip-bot2 for Thomas Gleixner
2021-03-26 15:29 ` [patch V2 07/15] locking/rtmutex: Inline chainwalk depth check Thomas Gleixner
2021-03-29 16:24   ` [tip: locking/core] " tip-bot2 for Thomas Gleixner
2021-03-26 15:29 ` [patch V2 08/15] locking/rtmutex: Remove pointless CONFIG_RT_MUTEXES=n stubs Thomas Gleixner
2021-03-29 16:24   ` [tip: locking/core] " tip-bot2 for Thomas Gleixner
2021-03-26 15:29 ` [patch V2 09/15] locking/rtmutex: Decrapify __rt_mutex_init() Thomas Gleixner
2021-03-29 16:24   ` [tip: locking/core] " tip-bot2 for Thomas Gleixner
2021-03-26 15:29 ` [patch V2 10/15] locking/rtmutex: Move debug functions as inlines into common header Thomas Gleixner
2021-03-29 16:24   ` [tip: locking/core] " tip-bot2 for Thomas Gleixner
2021-03-26 15:29 ` [patch V2 11/15] locking/rtmutex: Make text section and inlining consistent Thomas Gleixner
2021-03-29 16:24   ` [tip: locking/core] " tip-bot2 for Thomas Gleixner
2021-03-26 15:29 ` [patch V2 12/15] locking/rtmutex: Consolidate the fast/slowpath invocation Thomas Gleixner
2021-03-29 16:24   ` [tip: locking/core] " tip-bot2 for Thomas Gleixner
2021-03-26 15:29 ` [patch V2 13/15] locking/rtmutex: Fix misleading comment in rt_mutex_postunlock() Thomas Gleixner
2021-03-29 16:24   ` [tip: locking/core] " tip-bot2 for Thomas Gleixner
2021-03-26 15:29 ` [patch V2 14/15] locking/rtmutex: Restrict the trylock WARN_ON() to debug Thomas Gleixner
2021-03-29 16:24   ` [tip: locking/core] " tip-bot2 for Thomas Gleixner
2021-03-26 15:29 ` [patch V2 15/15] locking/rtmutex: Cleanup signal handling in __rt_mutex_slowlock() Thomas Gleixner
2021-03-29 16:24   ` [tip: locking/core] locking/rtmutex: Clean up " tip-bot2 for Thomas Gleixner
2021-03-29  9:24 ` [patch V2 00/15] locking/rtmutex: Spring cleaning Peter Zijlstra
  -- strict thread matches above, loose matches on Subject: below --
2021-03-23 21:30 [patch 08/14] locking/rtmutex: Remove pointless CONFIG_RT_MUTEXES=n stubs Thomas Gleixner
2021-03-24  7:22 ` [tip: locking/core] " tip-bot2 for Thomas Gleixner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®