From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: linux-kernel@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>,
syzbot <syzbot+6835d5c11145e4f77057@syzkaller.appspotmail.com>,
Thomas Gleixner <tglx@kernel.org>, Radu Rendec <radu@rendec.net>,
Ingo Molnar <mingo@redhat.com>,
Juri Lelli <juri.lelli@redhat.com>,
Vincent Guittot <vincent.guittot@linaro.org>,
Dietmar Eggemann <dietmar.eggemann@arm.com>,
Steven Rostedt <rostedt@goodmis.org>,
Ben Segall <bsegall@google.com>, Mel Gorman <mgorman@suse.de>,
Valentin Schneider <vschneid@redhat.com>,
K Prateek Nayak <kprateek.nayak@amd.com>
Subject: [PATCH v3] sched: Reset cpumask if __migrate_task() failed for migration_cpu_stop()
Date: Fri, 20 Nov 2026 18:16:58 +0100 [thread overview]
Message-ID: <20261120171658.Cf9qIU-Y@linutronix.de> (raw)
syzbot reported a race of assigning a CPU affinity during CPU hotplug
operation.
After the affinity of an IRQ has been changed, the IRQ-core sets
IRQTF_AFFINITY and wakes the relevant interrupt threads which need to
adjust their affinity mask. The thread will then invoke
set_cpus_allowed_ptr() to update the mask. Based on the new mask a CPU
is chosen on which the thread should run.
It is verified that this CPU is online however there is no guarantee
that this CPU remains online while affine_move_task() is moving _this_
task. Since the current task requests the migration the stopper/
migration_cpu_stop() is involved at which point the task pauses for a
while. If the CPU goes offline (or is no longer cpu_online_mask) then
__migrate_task() (due to is_cpu_allowed() reject) will return the rq of
the CPU on which the task is currently running (which does not match
it's task_struct::cpus_mask).
The aftermath:
The IRQ-thread's CPU and task's cpus_mask do not match. A
migrate_disable()-> schedule() will change task_struct::cpus_ptr
ensuring that the following migrate_enable() will update the task to the
requested affinity mask. At this point, affine_move_task() expects
task_struct::migration_pending set but it is NULL because noone
requested an affinity change while the task was in migrate-disable
section.
There are a few spots where set_cpus_allowed_ptr() does not use
cpus_read_lock(). In the IRQ thread case, there will be an update
following if the CPU goes offline so it is not really needed to block
CPU hotplug during the update.
If __migrate_task() fails, set the CPU mask of the task to runqueue it
is currently on. Use do_set_cpus_allowed() for this so it also invokes
class' set_cpus_allowed callback.
Remove the comment about __migrate_task() failing.
Reported-by: syzbot+6835d5c11145e4f77057@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/all/6a9919ac.94649fcc.25487e.0005.GAE@google.com/
Fixes: af449901b84c9 ("sched: Add migrate_disable()")
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
This survives my testcase without any warnings.
v2…v3: https://lore.kernel.org/all/20261012103946.aOSAmrRe@linutronix.de/
- Drop RFC and with it the irq_thread_check_affinity() since the
problem is not limited to it.
- Instead of manually setting the CPU mask bit, use
do_set_cpus_allowed() which should handle the DL bits correctly.
v1…v2: https://lore.kernel.org/all/20260907085825.f-CZ1Q5y@linutronix.de/
- Repost with collected notes.
kernel/sched/core.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 5ed660f099a55..c95d16ba9fe36 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2710,17 +2710,16 @@ static int migration_cpu_stop(void *data)
if (task_on_rq_queued(p)) {
update_rq_clock(rq);
rq = __migrate_task(rq, &rf, p, arg->dest_cpu);
+ if (rq != cpu_rq(arg->dest_cpu)) {
+ struct affinity_context ac = {
+ .new_mask = cpumask_of(rq->cpu),
+ };
+
+ do_set_cpus_allowed(p, &ac);
+ }
} else {
p->wake_cpu = arg->dest_cpu;
}
-
- /*
- * XXX __migrate_task() can fail, at which point we might end
- * up running on a dodgy CPU, AFAICT this can only happen
- * during CPU hotplug, at which point we'll get pushed out
- * anyway, so it's probably not a big deal.
- */
-
} else if (pending) {
/*
* This happens when we get migrated between migrate_enable()'s
--
2.55.0
reply other threads:[~2026-11-20 17:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20261120171658.Cf9qIU-Y@linutronix.de \
--to=bigeasy@linutronix.de \
--cc=bsegall@google.com \
--cc=dietmar.eggemann@arm.com \
--cc=juri.lelli@redhat.com \
--cc=kprateek.nayak@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mgorman@suse.de \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=radu@rendec.net \
--cc=rostedt@goodmis.org \
--cc=syzbot+6835d5c11145e4f77057@syzkaller.appspotmail.com \
--cc=tglx@kernel.org \
--cc=vincent.guittot@linaro.org \
--cc=vschneid@redhat.com \
/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®