[PATCH v6 08/37] sched/deadline: Do not replenish a boost from cleared parameters
From: Mathieu Desnoyers
Date: Mon Nov 16 2026 - 14:06:18 EST
When a SCHED_DEADLINE waiter boosts the owner of an rt_mutex, the owner
runs on the waiter's parameters, through dl.pi_se. Commit 2d3d891d3344
("sched/deadline: Add SCHED_DEADLINE inheritance logic") calls this a
temporary solution. The owner is never throttled. When its runtime runs
out, replenish_dl_entity() refills it at once from the waiter's
dl_runtime.
The waiter can leave SCHED_DEADLINE before the chain walk deboosts the
owner. Its parameters can be cleared in between, at its 0-lag time.
replenish_dl_entity() then loops forever on a dl_runtime of 0. It
holds the rq lock with interrupts off, so the owner's CPU locks up.
O is a SCHED_OTHER task that holds the rt_mutex L. W is a SCHED_DEADLINE
task. T is any other task:
CPU 0 (O) CPU 1 (W) CPU 2 (T)
locks L
blocks on L
rt_mutex_setprio(O, W)
O->dl.pi_se = &W->dl
sleeps
task_non_contending()
arms W's inactive timer
sched_setscheduler(W)
W leaves SCHED_DEADLINE
task_rq_unlock(W)
<W's inactive timer>
inactive_task_timer()
__dl_clear_params()
W->dl.dl_runtime = 0
<tick>
update_curr_dl_se()
enqueue_task_dl()
replenish_dl_entity()
runtime += W->dl.dl_runtime
loops forever
rt_mutex_adjust_pi(W)
rt_mutex_setprio(O, W)
spins on O's rq lock
Fix this by reading the inherited parameters once, and by not refilling
from a runtime of 0. The owner stays runnable. Its deadline stays where
it was. It runs until the chain walk deboosts it, or until it releases
the lock. That also covers sysrq-n: normalize_rt_tasks() changes the
waiter without a chain walk. The warning stays for an entity that is not
boosted.
A 300ms debug delay before rt_mutex_adjust_pi() locks up v7.4-rc1 in
8-CPU VMs, but not a kernel with this patch.
The Sashiko AI review of the third posting found the lockup. Juri Lelli
suggested this fix in place of a larger one.
Fixes: a5e7be3b28a2 ("sched/deadline: Clear dl_entity params when setscheduling to different class")
Suggested-by: Juri Lelli <juri.lelli@xxxxxxxxxx>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Link: https://lore.kernel.org/all/avL8oOtjKqVNR7-l@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/
---
kernel/sched/deadline.c | 28 +++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index e4d7cbf4861d..c4ea51059941 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -807,8 +807,26 @@ static void replenish_dl_entity(struct sched_dl_entity *dl_se)
{
struct dl_rq *dl_rq = dl_rq_of_se(dl_se);
struct rq *rq = rq_of_dl_rq(dl_rq);
+ struct sched_dl_entity *pi_se = pi_of(dl_se);
+ u64 runtime = READ_ONCE(pi_se->dl_runtime);
+ u64 deadline = READ_ONCE(pi_se->dl_deadline);
+ u64 period = READ_ONCE(pi_se->dl_period);
- WARN_ON_ONCE(pi_of(dl_se)->dl_runtime <= 0);
+ /*
+ * A boosted entity runs on the parameters of its donor, the top
+ * waiter of an rt_mutex. The donor can leave the class and have them
+ * cleared before the chain walk deboosts this entity. They are
+ * cleared under the donor's rq lock, which can be another one. So
+ * read each of them once. Refilling from a runtime of 0 would loop
+ * forever. Leave the entity runnable instead: the walk deboosts it,
+ * or its task releases the lock.
+ */
+ if (unlikely(!runtime)) {
+ WARN_ON_ONCE(!is_dl_boosted(dl_se));
+ dl_se->dl_yielded = 0;
+ dl_se->dl_throttled = 0;
+ return;
+ }
/*
* This could be the case for a !-dl task that is boosted.
@@ -822,8 +840,8 @@ static void replenish_dl_entity(struct sched_dl_entity *dl_se)
*/
if (dl_se->dl_deadline == 0 ||
(dl_se->dl_defer_armed && dl_entity_overflow(dl_se, rq_clock(rq)))) {
- dl_se->deadline = rq_clock(rq) + pi_of(dl_se)->dl_deadline;
- dl_se->runtime = pi_of(dl_se)->dl_runtime;
+ dl_se->deadline = rq_clock(rq) + deadline;
+ dl_se->runtime = runtime;
}
if (dl_se->dl_yielded && dl_se->runtime > 0)
@@ -836,8 +854,8 @@ static void replenish_dl_entity(struct sched_dl_entity *dl_se)
* arbitrary large.
*/
while (dl_se->runtime <= 0) {
- dl_se->deadline += pi_of(dl_se)->dl_period;
- dl_se->runtime += pi_of(dl_se)->dl_runtime;
+ dl_se->deadline += period;
+ dl_se->runtime += runtime;
}
/*
--
2.47.3