2018-08-27 14:32:32 +00:00
|
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
|
|
|
Date: Sat, 1 Apr 2017 12:50:59 +0200
|
|
|
|
|
Subject: [PATCH] rtmutex: Make lock_killable work
|
2019-02-27 18:51:46 +00:00
|
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.25-rt16.tar.xz
|
2018-08-27 14:32:32 +00:00
|
|
|
|
|
|
|
|
Locking an rt mutex killable does not work because signal handling is
|
|
|
|
|
restricted to TASK_INTERRUPTIBLE.
|
|
|
|
|
|
|
|
|
|
Use signal_pending_state() unconditionaly.
|
|
|
|
|
|
|
|
|
|
Cc: stable-rt@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(-)
|
|
|
|
|
|
|
|
|
|
--- a/kernel/locking/rtmutex.c
|
|
|
|
|
+++ b/kernel/locking/rtmutex.c
|
|
|
|
|
@@ -1201,18 +1201,13 @@ static int __sched
|
|
|
|
|
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);
|
