Commit 909e1d16 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'locking_urgent_for_v5.16_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull locking fix from Borislav Petkov:

 - Fix the rtmutex condition checking when the optimistic spinning of a
   waiter needs to be terminated

* tag 'locking_urgent_for_v5.16_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/rtmutex: Fix incorrect condition in rtmutex_spin_on_owner()
parents c36d891d 8f556a32

kernel/locking/rtmutex.c

+1 −1
Original line number Diff line number Diff line
@@ -1380,7 +1380,7 @@ static bool rtmutex_spin_on_owner(struct rt_mutex_base *lock, 
		 *  - the VCPU on which owner runs is preempted

		 */

		if (!owner->on_cpu || need_resched() ||

		    rt_mutex_waiter_is_top_waiter(lock, waiter) ||

		    !rt_mutex_waiter_is_top_waiter(lock, waiter) ||

		    vcpu_is_preempted(task_cpu(owner))) {

			res = false;

			break;