51 lines
1.4 KiB
Diff
51 lines
1.4 KiB
Diff
|
From f0d035135d17c835aeaf8a250a2b00f04e11e761 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
||
|
|
Date: Sat, 1 Apr 2017 12:50:59 +0200
|
||
|
|
Subject: [PATCH 170/365] rtmutex: Make lock_killable work
|
||
|
|
|
||
|
|
Locking an rt mutex killable does not work because signal handling is
|
||
|
|
restricted to TASK_INTERRUPTIBLE.
|
||
|
|
|
||
|
|
Use signal_pending_state() unconditionaly.
|
||
|
|
|
||
|
|
Cc: rt-stable@vger.kernel.org
|
||
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
||
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||
|
|
---
|
||
|
|
kernel/locking/rtmutex.c | 19 +++++++------------
|
||
|
|
1 file changed, 7 insertions(+), 12 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
|
||
|
|
index a019a258aa84..f7eb3c86acdf 100644
|
||
|
|
--- a/kernel/locking/rtmutex.c
|
||
|
|
+++ b/kernel/locking/rtmutex.c
|
||
|
|
@@ -1213,18 +1213,13 @@ __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 (unlikely(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);
|
||
|
|
--
|
||
|
|
2.28.0
|
||
|
|
|