Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Thomas Gleixner 2021-03-26 16:29:44 +01:00 committed by Ingo Molnar
parent c2c360ed7f
commit a51a327f3b
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/locking/rtmutex.c
View File

@ -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)) if (try_to_take_rt_mutex(lock, current, waiter))
break; break;
/* if (timeout && !timeout->task) {
* TASK_INTERRUPTIBLE checks for signals and ret = -ETIMEDOUT;
* timeout. Ignored otherwise. break;
*/ }
if (likely(state == TASK_INTERRUPTIBLE)) { if (signal_pending_state(state, current)) {
/* Signal pending? */ ret = -EINTR;
if (signal_pending(current)) break;
ret = -EINTR;
if (timeout && !timeout->task)
ret = -ETIMEDOUT;
if (ret)
break;
} }
raw_spin_unlock_irq(&lock->wait_lock); raw_spin_unlock_irq(&lock->wait_lock);