lkml.org 
[lkml]   [2021]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: locking/core] locking/rtmutex: Clean up signal handling in __rt_mutex_slowlock()
    The following commit has been merged into the locking/core branch of tip:

    Commit-ID: a51a327f3bcdcb1a37ed9325ad07e1456cd4d426
    Gitweb: https://git.kernel.org/tip/a51a327f3bcdcb1a37ed9325ad07e1456cd4d426
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Fri, 26 Mar 2021 16:29:44 +01:00
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitterDate: Mon, 29 Mar 2021 15:57:05 +02:00

    locking/rtmutex: Clean up signal handling in __rt_mutex_slowlock()

    The signal handling in __rt_mutex_slowlock() is open coded.

    Use signal_pending_state() instead.

    Aside of the cleanup this also prepares for the RT lock substituions which
    require support for TASK_KILLABLE.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Link: https://lore.kernel.org/r/20210326153944.533811987@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 c68542d..4068181 100644
    --- a/kernel/locking/rtmutex.c
    +++ b/kernel/locking/rtmutex.c
    @@ -1146,18 +1146,13 @@ static int __sched __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 (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);
    \
     
     \ /
      Last update: 2021-03-29 18:25    [W:4.153 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site