rtmutex: Plug preempt count leak in rt_mutex_futex_unlock()
mark_wakeup_next_waiter() already disables preemption, doing so again
leaves us with an unpaired preempt_disable().
Fixes: 2a1c602994
("rtmutex: Deboost before waking up the top waiter")
Signed-off-by: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: xlpang@redhat.com
Cc: rostedt@goodmis.org
Link: http://lkml.kernel.org/r/1491379707.6538.2.camel@gmx.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
19830e5524
commit
def34eaae5
|
@ -1581,13 +1581,13 @@ bool __sched __rt_mutex_futex_unlock(struct rt_mutex *lock,
|
||||||
return false; /* done */
|
return false; /* done */
|
||||||
}
|
}
|
||||||
|
|
||||||
mark_wakeup_next_waiter(wake_q, lock);
|
|
||||||
/*
|
/*
|
||||||
* We've already deboosted, retain preempt_disabled when dropping
|
* We've already deboosted, mark_wakeup_next_waiter() will
|
||||||
* the wait_lock to avoid inversion until the wakeup. Matched
|
* retain preempt_disabled when we drop the wait_lock, to
|
||||||
* by rt_mutex_postunlock();
|
* avoid inversion prior to the wakeup. preempt_disable()
|
||||||
|
* therein pairs with rt_mutex_postunlock().
|
||||||
*/
|
*/
|
||||||
preempt_disable();
|
mark_wakeup_next_waiter(wake_q, lock);
|
||||||
|
|
||||||
return true; /* call postunlock() */
|
return true; /* call postunlock() */
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue