Skip to content

Commit d33d260

Browse files
mu001999KAGA-KOKO
authored andcommitted
rtmutex: Drop rt_mutex::wait_lock before scheduling
rt_mutex_handle_deadlock() is called with rt_mutex::wait_lock held. In the good case it returns with the lock held and in the deadlock case it emits a warning and goes into an endless scheduling loop with the lock held, which triggers the 'scheduling in atomic' warning. Unlock rt_mutex::wait_lock in the dead lock case before issuing the warning and dropping into the schedule for ever loop. [ tglx: Moved unlock before the WARN(), removed the pointless comment, massaged changelog, added Fixes tag ] Fixes: 3d5c934 ("rtmutex: Handle deadlock detection smarter") Signed-off-by: Roland Xu <mu001999@outlook.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/all/ME0P300MB063599BEF0743B8FA339C2CECC802@ME0P300MB0635.AUSP300.PROD.OUTLOOK.COM
1 parent 7c626ce commit d33d260

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

kernel/locking/rtmutex.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1644,6 +1644,7 @@ static int __sched rt_mutex_slowlock_block(struct rt_mutex_base *lock,
16441644
}
16451645

16461646
static void __sched rt_mutex_handle_deadlock(int res, int detect_deadlock,
1647+
struct rt_mutex_base *lock,
16471648
struct rt_mutex_waiter *w)
16481649
{
16491650
/*
@@ -1656,10 +1657,10 @@ static void __sched rt_mutex_handle_deadlock(int res, int detect_deadlock,
16561657
if (build_ww_mutex() && w->ww_ctx)
16571658
return;
16581659

1659-
/*
1660-
* Yell loudly and stop the task right here.
1661-
*/
1660+
raw_spin_unlock_irq(&lock->wait_lock);
1661+
16621662
WARN(1, "rtmutex deadlock detected\n");
1663+
16631664
while (1) {
16641665
set_current_state(TASK_INTERRUPTIBLE);
16651666
rt_mutex_schedule();
@@ -1713,7 +1714,7 @@ static int __sched __rt_mutex_slowlock(struct rt_mutex_base *lock,
17131714
} else {
17141715
__set_current_state(TASK_RUNNING);
17151716
remove_waiter(lock, waiter);
1716-
rt_mutex_handle_deadlock(ret, chwalk, waiter);
1717+
rt_mutex_handle_deadlock(ret, chwalk, lock, waiter);
17171718
}
17181719

17191720
/*

0 commit comments

Comments
 (0)