[patch RT 1/4] rtmutex: Make lock_killable work

From	Thomas Gleixner <tglx@linutronix.de>
Newsgroups	linux.kernel
Subject	[patch RT 1/4] rtmutex: Make lock_killable work
Date	2017-04-01 13:40 +0200
Message-ID	<trpxU-1Z6-13@gated-at.bofh.it> (permalink)
References	<trpxU-1Z6-11@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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>
---
 kernel/locking/rtmutex.c |   19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -1633,18 +1633,13 @@ static int __sched
 		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;
 		}
 
 		if (ww_ctx && ww_ctx->acquired > 0) {

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[patch RT 1/4] rtmutex: Make lock_killable work Thomas Gleixner <tglx@linutronix.de> - 2017-04-01 13:40 +0200
  Re: [patch RT 1/4] rtmutex: Make lock_killable work Steven Rostedt <rostedt@goodmis.org> - 2017-04-03 17:30 +0200
    Re: [patch RT 1/4] rtmutex: Make lock_killable work Peter Zijlstra <peterz@infradead.org> - 2017-04-04 09:20 +0200
      Re: [patch RT 1/4] rtmutex: Make lock_killable work Steven Rostedt <rostedt@goodmis.org> - 2017-04-04 15:30 +0200

csiph-web