From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=158.69.130.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794924675; b=t+Mu9CpMYhsGm4DvytqctAOOPHeD/tIEtxgH1wk6tLdH98qT9H6AFwg2z5hIx+wJN5Rw bf1fMIkrOWvDjxV9ez7UqFnJ3L4YHlV2DKLv9gZClTLMOriuZlJnrZfISoNoWyXvOsNUL zVxFeIgRequmnZ7SoWOh2gisrAFyB8xl2/4Ytg9hlPV0WuKEwd7s0AI8t5CGdApddNj8u ALjuQwut95Px4RIwzAs0yuD+/A/4GixG6b3CT0pUTZmJYtqzFt/q9/6aaNNZCBLokwZJg om5ViBnokkpgXNxU26Q3Xp3m430CL5FEkDn/fUyCs2Pj4WdQgbmFGsEuYDpuflWSlxA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794924675; h=DMARC-Filter:DKIM-Signature:Received:From:To:Cc:Subject:Date: Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=hQMUfAMOJbsO4pkrAPJ2n1M6SsNe4VVTXHqYbtMPO/8=; b=Y5s6CYpCkU5gzLKTxMnHxiTj759ddTjZTXFUrgWNQ11RbMcJLhqhngYXzGSHggysKNyz ddzWyTJ0OxGFVXasBA/MnpvdDa4TEUD0EtmYipabC6WJNyGiKmrnS+CTWC0wJ1ZvpFjXf JF/pxGmpydZkzPi0O9JtcNUOhV5hlNPcDMMcHqA0hqocrC/D71eehOIsOYwtmzNLSLCtg iIEtPAEPILnba4KZ6f85PRboZstz27fCXnR780ikBThFqbIeXt++2tWxv3X6bwpPZ9bdh LGlc29kb8LcVP57vN7MOsSUMUHJ6qJYTAY1GaUgWlWP6TeZNHzp7PFgmZDxF6UpeixA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=efficios.com; spf=pass smtp.mailfrom=efficios.com; dkim=pass header.d=efficios.com header.i=@efficios.com header.a=rsa-sha256 header.s=smtpout1 header.b=iqmTBG1d; arc=none smtp.remote-ip=158.69.130.18 Received: from smtpout.efficios.com (smtpout.efficios.com [158.69.130.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2422D60A260B; Tue, 17 Nov 2026 14:11:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 2422D60A260B Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=efficios.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=efficios.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=efficios.com header.i=@efficios.com header.a=rsa-sha256 header.s=smtpout1 header.b=iqmTBG1d DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=smtpout1; t=1794924665; bh=hQMUfAMOJbsO4pkrAPJ2n1M6SsNe4VVTXHqYbtMPO/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iqmTBG1dg1J2kFEmOFBajMqV1NY/xuJHiD/gHHi1iut4rgByFuu5EZii93gvSqZf3 snQ0zDvKhLX6NXsLQ7d9ZnCmXl2jNMEk5YnYtZYNU85/aP1kah6XJ5icwSzz6cE3aW flN4h1cnORnoyUzA40Vkhz0Ok4ZUpWX5DDYP72RDJym1PH1qEKkYuPYePP5Kl7OlS2 Gp5SKQGUgGhl6mR+91alhIvu4Tvn21iWlyksTsKwsTFzTCXDgN17o43sxL0xwjP870 WJt4VAITFyvr3bK75br1DTRKGRPaJtumbteUj+Mjbcml26xLwx0hqWs2KXiUkiP8Xs f9n/LnSwlKL+w== Received: from thinkos.internal.efficios.com (mtl.efficios.com [216.120.195.104]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4jTRV14knSzR8H; Tue, 17 Nov 2026 09:11:05 -0500 (EST) From: Mathieu Desnoyers To: juri.lelli@redhat.com, peterz@infradead.org, mingo@redhat.com, vincent.guittot@linaro.org Cc: linux-kernel@vger.kernel.org, Mathieu Desnoyers , tglx@kernel.org, will@kernel.org, boqun@kernel.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, vschneid@redhat.com, kprateek.nayak@amd.com, luca.abeni@santannapisa.it, mathieu.poirier@linaro.org, longman@redhat.com, ridong.chen@linux.dev, tj@kernel.org, hannes@cmpxchg.org, mkoutny@suse.com, shuah@kernel.org, bigeasy@linutronix.de, clrkwllms@kernel.org, parri.andrea@gmail.com, m.szyprowski@samsung.com, kayracizmeci@gmail.com, weihengqiuu@gmail.com, cgroups@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-rt-devel@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v7 08/40] sched/deadline: Do not replenish a boost from cleared parameters Date: Tue, 17 Nov 2026 09:10:29 -0500 Message-Id: X-Mailer: git-send-email 2.39.5 In-Reply-To: References: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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) inactive_task_timer() __dl_clear_params() W->dl.dl_runtime = 0 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 runtime, deadline and period once, and by not refilling from cleared ones. They are cleared under the waiter's rq lock, not the owner's. So test all three. The owner stays runnable. It gets no runtime. A negative runtime is reset to 0: the owner's own reservation does not pay for the boost. An owner with no parameters of its own gets a deadline of now. A deadline of 0 would mark its dl_rq as empty. The wakeup of a boosted task already gives that deadline when its donor is cleared. The owner 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. The reset bounds the overrun. But a runtime of 0 still counts as exceeded. So until the deboost, update_curr_dl_se() still requeues the owner at each update. An owner with SCHED_FLAG_DL_OVERRUN still gets SIGXCPU. With a 300ms debug delay before rt_mutex_adjust_pi(), v7.4-rc2 locks up in 8-CPU VMs. A kernel with this patch does not. 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 Signed-off-by: Mathieu Desnoyers Cc: stable@vger.kernel.org Link: https://lore.kernel.org/all/avL8oOtjKqVNR7-l@jlelli-thinkpadt14gen4.remote.csb/ --- kernel/sched/deadline.c | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index e4d7cbf4861d..71b1c155c242 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -807,8 +807,38 @@ 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, and check all three. Refilling from a + * runtime of 0 would loop forever. Leave the entity runnable + * instead: the walk deboosts it, or its task releases the lock. + * + * Add no runtime. Do not keep a negative one: the overrun comes + * from the boost, and the entity's own reservation does not pay for + * it. A task with no parameters of its own gets a deadline of now, + * as a donor's relative deadline of 0 would give. A deadline of 0 + * means an empty dl_rq to inc_dl_deadline(). + */ + if (unlikely(!runtime || !deadline || !period)) { + WARN_ON_ONCE(!is_dl_boosted(dl_se)); + if (!dl_se->dl_deadline) { + dl_se->deadline = rq_clock(rq); + dl_se->runtime = 0; + } + if (dl_se->runtime < 0 || dl_se->dl_yielded) + dl_se->runtime = 0; + 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 +852,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 +866,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