From: Tejun Heo <tj@kernel.org>
To: Andrea Righi <arighi@nvidia.com>
Cc: Ihor Solodrai <ihor.solodrai@pm.me>,
sched-ext@meta.com, kernel-team@meta.com,
linux-kernel@vger.kernel.org, bpf <bpf@vger.kernel.org>
Subject: [PATCH sched_ext/for-6.14-fixes] sched_ext: selftests/dsp_local_on: Fix sporadic failures
Date: Fri, 24 Jan 2025 12:00:38 -1000 [thread overview]
Message-ID: <Z5QNhsWw0P1iPd2q@slm.duckdns.org> (raw)
In-Reply-To: <Z5LCHVHZPl2fjPyc@gpd3>
From e9fe182772dcb2630964724fd93e9c90b68ea0fd Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Fri, 24 Jan 2025 10:48:25 -1000
dsp_local_on has several incorrect assumptions, one of which is that
p->nr_cpus_allowed always tracks p->cpus_ptr. This is not true when a task
is scheduled out while migration is disabled - p->cpus_ptr is temporarily
overridden to the previous CPU while p->nr_cpus_allowed remains unchanged.
This led to sporadic test faliures when dsp_local_on_dispatch() tries to put
a migration disabled task to a different CPU. Fix it by keeping the previous
CPU when migration is disabled.
There are SCX schedulers that make use of p->nr_cpus_allowed. They should
also implement explicit handling for p->migration_disabled.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Ihor Solodrai <ihor.solodrai@pm.me>
Cc: Andrea Righi <arighi@nvidia.com>
Cc: Changwoo Min <changwoo@igalia.com>
---
Applying to sched_ext/for-6.14-fixes. Thanks.
tools/testing/selftests/sched_ext/dsp_local_on.bpf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/sched_ext/dsp_local_on.bpf.c b/tools/testing/selftests/sched_ext/dsp_local_on.bpf.c
index fbda6bf54671..758b479bd1ee 100644
--- a/tools/testing/selftests/sched_ext/dsp_local_on.bpf.c
+++ b/tools/testing/selftests/sched_ext/dsp_local_on.bpf.c
@@ -43,7 +43,7 @@ void BPF_STRUCT_OPS(dsp_local_on_dispatch, s32 cpu, struct task_struct *prev)
if (!p)
return;
- if (p->nr_cpus_allowed == nr_cpus)
+ if (p->nr_cpus_allowed == nr_cpus && !p->migration_disabled)
target = bpf_get_prandom_u32() % nr_cpus;
else
target = scx_bpf_task_cpu(p);
--
2.48.1
next prev parent reply other threads:[~2025-01-24 22:00 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-09 15:29 [PATCH] scx: Fix maximal BPF selftest prog David Vernet
2024-12-10 14:37 ` Andrea Righi
2024-12-10 20:52 ` Ihor Solodrai
2024-12-11 21:01 ` [PATCH sched_ext/for-6.13-fixes] sched_ext: Fix invalid irq restore in scx_ops_bypass() Tejun Heo
2024-12-11 21:03 ` Tejun Heo
2024-12-12 18:12 ` Ihor Solodrai
2024-12-17 23:44 ` Ihor Solodrai
2024-12-18 18:34 ` Tejun Heo
2024-12-19 22:51 ` Ihor Solodrai
2024-12-20 19:26 ` Ihor Solodrai
2024-12-25 0:09 ` [PATCH sched_ext/for-6.13-fixes] sched_ext: Fix dsq_local_on selftest Tejun Heo
2024-12-25 0:10 ` Tejun Heo
2025-01-15 23:50 ` Ihor Solodrai
2025-01-22 1:40 ` Tejun Heo
2025-01-22 19:10 ` Ihor Solodrai
2025-01-23 9:40 ` Andrea Righi
2025-01-23 16:57 ` Tejun Heo
2025-01-23 18:45 ` Andrea Righi
2025-01-23 22:26 ` Andrea Righi
2025-01-24 22:00 ` Tejun Heo [this message]
2025-01-25 4:54 ` [PATCH sched_ext/for-6.14-fixes] sched_ext: selftests/dsp_local_on: Fix sporadic failures Andrea Righi
2025-01-27 18:45 ` Tejun Heo
2024-12-11 6:31 ` [PATCH] scx: Fix maximal BPF selftest prog Tejun Heo
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=Z5QNhsWw0P1iPd2q@slm.duckdns.org \
--to=tj@kernel.org \
--cc=arighi@nvidia.com \
--cc=bpf@vger.kernel.org \
--cc=ihor.solodrai@pm.me \
--cc=kernel-team@meta.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sched-ext@meta.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®