lkml.org 
[lkml]   [2017]   [Nov]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH RT 2/8] rtmutex: Make lock_killable work
    4.4.97-rt111-rc1 stable review patch.
    If anyone has any objections, please let me know.

    ------------------

    From: Thomas Gleixner <tglx@linutronix.de>

    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>
    Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
    ---
    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 0e9a6260441d..552dc6dd3a79 100644
    --- a/kernel/locking/rtmutex.c
    +++ b/kernel/locking/rtmutex.c
    @@ -1672,18 +1672,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;
    }

    if (ww_ctx && ww_ctx->acquired > 0) {
    --
    2.13.2

    \
     
     \ /
      Last update: 2017-11-21 17:08    [W:2.242 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site