The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: sashiko-bot@kernel.org
To: "Mathieu Desnoyers" <mathieu.desnoyers@efficios.com>
Cc: linux-rt-devel@lists.linux.dev, tj@kernel.org,
	hannes@cmpxchg.org, mkoutny@suse.com,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH v9 21/33] rtmutex: Continue the walk when the owner's top waiter changes lock
Date: Fri, 20 Nov 2026 14:20:44 +0000	[thread overview]
Message-ID: <sashiko-outbox-225348@kernel.org> (raw)
In-Reply-To: <6438d828d974eeda3fc9bdf8a2caeb4392e96cd6.1795181240.git.mathieu.desnoyers@efficios.com>

Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [High] rtmutex: premature chain walk stop in
  rt_mutex_adjust_prio_chain()
--

commit f337380aa6d8b1a73b3aab01c70615b369f151be
Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

rtmutex: Continue the walk when the owner's top waiter changes lock

This commit removes the top_waiter != task_top_pi_waiter(task) check in
rt_mutex_adjust_prio_chain() so the PI chain walk continues when the
previous step changes the owner's top PI waiter to a waiter on another
lock.

> diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
> index c78dfe9c93fc5..c06261259a563 100644
> --- a/kernel/locking/rtmutex.c
> +++ b/kernel/locking/rtmutex.c
> @@ -821,23 +821,15 @@ static int __sched rt_mutex_adjust_prio_chain(struct task_struct *task,
>  	 * Drop out, when the task has no waiters. Note,
>  	 * top_waiter can be NULL, when we are in the deboosting
>  	 * mode!
> +	 *
> +	 * Do not compare top_waiter with the top pi waiter of the
> +	 * task here. The previous step can have made a waiter on
> +	 * another lock the top pi waiter of the task. The priority of
> +	 * the task changed then, and the next owner must follow. The
> +	 * test below tells whether there is something to pass on.
>  	 */
> -	if (top_waiter) {
> -		if (!task_has_pi_waiters(task))
> -			goto out_unlock_pi;
> -		/*
> -		 * If deadlock detection is off, we stop here if we
> -		 * are not the top pi waiter of the task. If deadlock
> -		 * detection is enabled we continue, but stop the
> -		 * requeueing in the chain walk.
> -		 */
> -		if (top_waiter != task_top_pi_waiter(task)) {
> -			if (!detect_deadlock)
> -				goto out_unlock_pi;
> -			else
> -				requeue = false;
> -		}
> -	}
> +	if (top_waiter && !task_has_pi_waiters(task))
> +		goto out_unlock_pi;
>  
>  	/*
>  	 * If the waiter priority is the same as the task priority

[Severity: High]
Can this !task_has_pi_waiters(task) check still stop a deboost chain walk
early and leave the next owner with a stale priority or dangling
SCHED_DEADLINE donor?

The comment assumes top_waiter is NULL in deboosting mode, which is only
true on the first step: at the end of step 1, rt_mutex_adjust_prio_chain()
sets top_waiter = rt_mutex_top_waiter(lock) before dropping task->pi_lock
and lock->wait_lock.

Suppose O (SCHED_OTHER) holds L2, M (SCHED_OTHER) holds L1 and blocks on
L2, and W (SCHED_DEADLINE) and X (SCHED_OTHER) both block on L1, so M and
O inherit W's deadline donor (&W->dl):

CPU0 (W)                          CPU1 (X)
sched_setscheduler(SCHED_OTHER)
  rt_mutex_adjust_pi(W)
    rt_mutex_adjust_prio_chain()
      /* step 1: task = W, lock = L1 */
      /* requeues W behind X on L1 */
      /* deboosts M to SCHED_OTHER */
      top_waiter = X_waiter
      unlock(M->pi_lock, L1->wait_lock)
                                  /* X times out on L1 */
                                  remove_waiter(L1, X_waiter)
                                    /* M->pi_waiters is now empty */
                                    unlock(M->pi_lock, L1->wait_lock)
      /* step 2: task = M, lock = L2 */
      lock(M->pi_lock)
      if (top_waiter &&
          !task_has_pi_waiters(M))
        goto out_unlock_pi;
/* W times out on L1 */
remove_waiter(L1, W_waiter)
  /* !is_top_waiter: returns */
/* W exits and frees task_struct */
                                  /* O still has O->dl.pi_se == &W->dl */
                                  /* before X's walk reaches O */
                                  replenish_dl_entity()  <-- use-after-free

Because step 1 demoted W below X on L1, W's own remove_waiter() sees
!is_top_waiter and returns without walking the chain, while O stays
boosted to W's deadline parameters (and can even preempt X's chain walk on
the same CPU) after W exits.

Removing the if (top_waiter && !task_has_pi_waiters(task)) check as well
lets rt_waiter_up_to_date(waiter, task) below stop the walk when the
waiter is already unboosted, while requeueing an out-of-date waiter when M
was just deboosted.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/cover.1795181240.git.mathieu.desnoyers@efficios.com?part=21

  reply	other threads:[~2026-11-20 14:20 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-20 13:55 [PATCH v9 00/33] sched/deadline: bandwidth accounting fixes and selftests Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 01/33] sched/deadline: Keep departing bandwidth across a root domain rebuild Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 02/33] sched/deadline: Rebuild the root domains' accounting from the task list Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 03/33] sched/deadline: Record the root domain holding a task's bandwidth Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 04/33] sched/deadline: Leave a dying task out of a rebuild of the accounting Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 05/33] selftests/sched: Test SCHED_DEADLINE bandwidth across a root domain rebuild Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 06/33] selftests/sched: Test the root domain rebuild in deadline_bw_test Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 07/33] sched/deadline: Move a task's bandwidth only where room was made Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 08/33] cgroup/cpuset: Wait for an attach before rebuilding the sched domains Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 09/33] sched: Make deadline policy and affinity changes wait for a cpuset attach Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 10/33] cgroup/cpuset: Give back the bandwidth an attach did not move Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 11/33] cgroup/cpuset: Reserve the bandwidth in the root domain a task moves to Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 12/33] selftests/sched: Test cpuset moves in deadline_bw_test Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 13/33] sched/deadline: Make a rebuild count a task in the root domain it runs in Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 14/33] sched/deadline: Move a task's bandwidth to " Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 15/33] sched/deadline: Keep a task in the root domain that counts its bandwidth Mathieu Desnoyers
2026-11-20 14:12   ` sashiko-bot
2026-11-20 13:55 ` [PATCH v9 16/33] sched/deadline: Keep the last CPU a task has in its root domain Mathieu Desnoyers
2026-11-20 14:31   ` sashiko-bot
2026-11-20 13:55 ` [PATCH v9 17/33] cgroup/cpuset: Refuse to take a deadline task out of " Mathieu Desnoyers
2026-11-20 14:32   ` sashiko-bot
2026-11-20 13:55 ` [PATCH v9 18/33] selftests/sched: Test the root domain of a task in deadline_bw_test Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 19/33] sched/deadline: Count only active CPUs when spreading extra_bw Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 20/33] rtmutex: Continue the chain walk when a waiter's deadline donor changes Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 21/33] rtmutex: Continue the walk when the owner's top waiter changes lock Mathieu Desnoyers
2026-11-20 14:20   ` sashiko-bot [this message]
2026-11-20 13:55 ` [PATCH v9 22/33] selftests/sched: Test the rtmutex chain walk in deadline_bw_test Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 23/33] sched/deadline: Reset the donor's runtime at a deboost in the class Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 24/33] sched/deadline: Replenish a throttled task boosted while asleep Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 25/33] sched/deadline: Count the bandwidth a boosted task is given Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 26/33] sched/deadline: Start a period for a task that enters the class blocked Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 27/33] sched/deadline: Start a period at a deboost out of the class Mathieu Desnoyers
2026-11-20 14:27   ` sashiko-bot
2026-11-20 13:55 ` [PATCH v9 28/33] selftests/sched: Test deadline boosts in deadline_bw_test Mathieu Desnoyers
2026-11-20 14:26   ` sashiko-bot
2026-11-20 13:55 ` [PATCH v9 29/33] sched/deadline: Cancel the replenishment timer with the parameters Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 30/33] sched/deadline: Cap the runtime left of a constrained task at dl_runtime Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 31/33] sched/deadline: Check the runtime of a task that comes back runnable Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 32/33] sched/deadline: Check the runtime of a task whose parameters change Mathieu Desnoyers
2026-11-20 13:55 ` [PATCH v9 33/33] selftests/sched: Test parameter changes in deadline_bw_test Mathieu Desnoyers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=sashiko-outbox-225348@kernel.org \
    --to=sashiko-bot@kernel.org \
    --cc=hannes@cmpxchg.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rt-devel@lists.linux.dev \
    --cc=mathieu.desnoyers@efficios.com \
    --cc=mkoutny@suse.com \
    --cc=sashiko-reviews@lists.linux.dev \
    --cc=tj@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox