Re: [patch RT 1/4] rtmutex: Make lock_killable work
From: Steven Rostedt
Date: Mon Apr 03 2017 - 11:21:38 EST
On Sat, 01 Apr 2017 12:50:59 +0200
Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote:
> Locking an rt mutex killable does not work because signal handling is
> restricted to TASK_INTERRUPTIBLE.
>
> Use signal_pending_state() unconditionaly.
Does this mean rt mutex killable is not INTERRUPTIBLE? because the
change log seems to just assume that.
In other words, mortals reading this have no idea what you are talking
about ;-)
-- Steve
>
> Cc: rt-stable@xxxxxxxxxxxxxxx
> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> ---
> 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) {
>