Skip to contentSkip to conversation

locking fix

GIT PULL Merged Ingo Molnar 2 participants 2 messages Feb 11, 2023 Locking primitives

lore
Share & tools
lore

Ingo Molnar

author
#0 lore raw

Linus,

Please pull the latest locking/urgent git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-urgent-2023-02-11

# HEAD: db370a8b9f67ae5f17e3d5482493294467784504 rtmutex: Ensure that the top waiter is always woken up

Fix an rtmutex missed-wakeup bug.

Thanks,

Ingo

------------------>
Wander Lairson Costa (1):
rtmutex: Ensure that the top waiter is always woken up

 kernel/locking/rtmutex.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/locking/rtmutex.c +3 -2
index 010cf4e6d0b8..728f434de2bb 100644
@@ -901,8 +901,9 @@ static int __sched rt_mutex_adjust_prio_chain(struct task_struct *task,
 		 * then we need to wake the new top waiter up to try
 		 * to get the lock.
 		 */
-		if (prerequeue_top_waiter != rt_mutex_top_waiter(lock))
-			wake_up_state(waiter->task, waiter->wake_state);
+		top_waiter = rt_mutex_top_waiter(lock);
+		if (prerequeue_top_waiter != top_waiter)
+			wake_up_state(top_waiter->task, top_waiter->wake_state);
 		raw_spin_unlock_irq(&lock->wait_lock);
 		return 0;
 	}
merge bot Merged
#1 lore raw
The pull request you sent on Sat, 11 Feb 2023 09:54:28 +0100:

The pull request you sent on Sat, 11 Feb 2023 09:54:28 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-urgent-2023-02-11

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/338c84730406c30185d54b565d670e7e7c96967b

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html