From: "tip-bot2 for Vasily Gorbik" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Vasily Gorbik <gor@linux.ibm.com>,
John Stultz <jstultz@google.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: sched/core] sched/core: Don't steal a proxy-exec donor
Date: Wed, 02 Sep 2026 07:55:03 -0000 [thread overview]
Message-ID: <178833570378.3717435.7645032389663532008.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20260807035232.1881495-3-jstultz@google.com>
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 3dd95f077371f5def65a91c4bb13bd574a62bc3a
Gitweb: https://git.kernel.org/tip/3dd95f077371f5def65a91c4bb13bd574a62bc3a
Author: Vasily Gorbik <gor@linux.ibm.com>
AuthorDate: Fri, 07 Aug 2026 03:52:08
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 02 Sep 2026 09:37:20 +02:00
sched/core: Don't steal a proxy-exec donor
try_steal_cookie() avoids stealing src->core_pick and src->curr before
moving a task with the same cookie via move_queued_task_locked().
With proxy-exec, src->donor is the current scheduling context and may
differ from src->curr. Stealing it migrates a task that the source rq
still treats as current, leaving src's scheduler state for that task
stale. For CFS this means cfs_rq->curr points at the stolen entity,
and the next pick on the source rq hits the WARN_ON_ONCE in
put_prev_entity().
Commit 7de9d4f94638 ("sched: Start blocked_on chain processing in
find_proxy_task()") tweaked the fair class logic so that the donor task
isn't migrated away while we're running the proxy. Do it similarly for
try_steal_cookie() and skip src->donor as well.
Fixes: 7de9d4f94638 ("sched: Start blocked_on chain processing in find_proxy_task()")
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: John Stultz <jstultz@google.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://patch.msgid.link/20260807035232.1881495-3-jstultz@google.com
---
kernel/sched/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 7472450..7adbdcc 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6509,7 +6509,7 @@ static bool try_steal_cookie(int this, int that)
return false;
do {
- if (p == src->core_pick || p == src->curr)
+ if (p == src->core_pick || p == src->curr || p == src->donor)
goto next;
if (!is_cpu_allowed(p, this))
next prev parent reply other threads:[~2026-09-02 7:55 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-07 3:52 [RESEND][PATCH v31 0/9] Sleeping Owner Handling for Proxy Execution (v31) John Stultz
2026-08-07 3:52 ` [RESEND][PATCH v31 1/9] sched/deadline: Ignore proxy-exec sched_yield() John Stultz
2026-08-10 15:56 ` Peter Zijlstra
2026-08-10 19:25 ` John Stultz
2026-08-11 3:55 ` K Prateek Nayak
2026-08-11 6:10 ` K Prateek Nayak
2026-08-11 8:33 ` Juri Lelli
2026-08-07 3:52 ` [RESEND][PATCH v31 2/9] sched/core: Don't steal a proxy-exec donor John Stultz
2026-09-02 7:55 ` tip-bot2 for Vasily Gorbik [this message]
2026-08-07 3:52 ` [RESEND][PATCH v31 3/9] sched/core: Avoid migrating blocked_on tasks John Stultz
2026-09-02 7:55 ` [tip: sched/core] " tip-bot2 for John Stultz
2026-08-07 3:52 ` [RESEND][PATCH v31 4/9] sched/core: Don't proxy-exec unmatched cookie lock owners John Stultz
2026-09-02 7:55 ` [tip: sched/core] " tip-bot2 for Vasily Gorbik
2026-08-07 3:52 ` [RESEND][PATCH v31 5/9] sched: Switch rq->next_class in proxy_reset_donor() John Stultz
2026-09-02 7:54 ` [tip: sched/core] " tip-bot2 for John Stultz
2026-08-07 3:52 ` [RESEND][PATCH v31 6/9] sched: Break out core of attach_tasks() helper into sched.h John Stultz
2026-09-02 7:54 ` [tip: sched/core] " tip-bot2 for John Stultz
2026-08-07 3:52 ` [RESEND][PATCH v31 7/9] sched: Migrate whole chain in proxy_migrate_task() John Stultz
2026-09-02 7:54 ` [tip: sched/core] " tip-bot2 for John Stultz
2026-08-07 3:52 ` [RESEND][PATCH v31 8/9] sched: Add deactivated (sleeping) owner handling to find_proxy_task() John Stultz
2026-08-11 19:08 ` Atul Kumar Pant
2026-08-11 19:56 ` John Stultz
2026-08-12 2:21 ` Atul Kumar Pant
2026-08-13 13:48 ` Peter Zijlstra
2026-08-13 14:24 ` Peter Zijlstra
2026-08-13 14:40 ` Peter Zijlstra
2026-08-07 3:52 ` [RESEND][PATCH v31 9/9] sched: Distinguish proxy activations from wakeups John Stultz
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=178833570378.3717435.7645032389663532008.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=gor@linux.ibm.com \
--cc=jstultz@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=x86@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
all inboxes | Powered by JetHome®