locking/rtmutex: Clean up signal handling in __rt_mutex_slowlock()

The signal handling in __rt_mutex_slowlock() is open coded.

Use signal_pending_state() instead.

Aside of the cleanup this also prepares for the RT lock substituions which
require support for TASK_KILLABLE.

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/20210326153944.533811987@linutronix.de

diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index c68542dbbd0a79b0132946b2b2801117e738e048..406818196a9f7484f3a40d967fac65dd9551247d 100644 (file)
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -1146,18 +1146,13 @@ static int __sched __rt_mutex_slowlock(struct rt_mutex *lock, int state,
                if (try_to_take_rt_mutex(lock, current, waiter))
                        break;
 
-               /*
-                * TASK_INTERRUPTIBLE checks for signals and
-                * timeout. Ignored otherwise.
-                */
-               if (likely(state == TASK_INTERRUPTIBLE)) {
-                       /* Signal pending? */
-                       if (signal_pending(current))
-                               ret = -EINTR;
-                       if (timeout && !timeout->task)
-                               ret = -ETIMEDOUT;
-                       if (ret)
-                               break;
+               if (timeout && !timeout->task) {
+                       ret = -ETIMEDOUT;
+                       break;
+               }
+               if (signal_pending_state(state, current)) {
+                       ret = -EINTR;
+                       break;
                }
 
                raw_spin_unlock_irq(&lock->wait_lock);