sched_ext: idle: Recheck prev_cpu after narrowing allowed mask
Subsystems (2)
PATCH 1/1 sched_ext: idle: Recheck prev_cpu after narrowing allowed mask
scx_select_cpu_dfl() narrows @allowed to @cpus_allowed & @p->cpus_ptr when the BPF caller supplies a @cpus_allowed that differs from @p->cpus_ptr and @p doesn't have full affinity. However, @is_prev_allowed was computed against the original (wider) @cpus_allowed, so the prev_cpu fast paths could pick a @prev_cpu that is in @cpus_allowed but not in @p->cpus_ptr, violating the intended invariant that the returned CPU is always usable by @p. The kernel masks this via the SCX_EV_SELECT_CPU_FALLBACK fallback, but the behavior contradicts the documented contract.
Move the @is_prev_allowed evaluation past the narrowing block so it tests against the final @allowed mask.
--- kernel/sched/ext_idle.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
kernel/sched/ext_idle.c +6 -6
@@ -464,12 +464,6 @@ s32 scx_select_cpu_dfl(struct task_struct *p, s32 prev_cpu, u64 wake_flags,preempt_disable (); -/* -* Check whether @prev_cpu is still within the allowed set. If not, -* we can still try selecting a nearby CPU. -*/ - is_prev_allowed =cpumask_test_cpu (prev_cpu, allowed); -/* * Determine the subset of CPUs usable by @p within @cpus_allowed. */
@@ -486,6 +480,12 @@ s32 scx_select_cpu_dfl(struct task_struct *p, s32 prev_cpu, u64 wake_flags, } } +/* +* Check whether @prev_cpu is still within the allowed set. If not, +* we can still try selecting a nearby CPU. +*/ + is_prev_allowed =cpumask_test_cpu (prev_cpu, allowed); +/* * This is necessary to protect llc_cpus. */
Signature · 1 line
2.53.0
Quoted 10 lines · David Carlier
scx_select_cpu_dfl()narrows @allowed to @cpus_allowed & @p->cpus_ptr when the BPF caller supplies a @cpus_allowed that differs from @p->cpus_ptr and @p doesn't have full affinity. However, @is_prev_allowed was computed against the original (wider) @cpus_allowed, so theprev_cpufast paths could pick a @prev_cpu that is in @cpus_allowed but not in @p->cpus_ptr, violating the intended invariant that the returned CPU is always usable by @p. The kernel masks this via theSCX_EV_SELECT_CPU_FALLBACKfallback, but the behavior contradicts the documented contract.
Quoted 6 lines
Move the @is_prev_allowed evaluation past the narrowing block so it tests against the final @allowed mask.
Fixes ee9a4e92799d ("sched_ext: idle: Properly handle invalid prev_cpu during idle selection")Assisted-by Claude <[email protected]>Signed-off-by David Carlier <[email protected]>
Makes sense, good catch.
Thanks,
-Andrea
Quoted 37 lines
--- kernel/sched/ext_idle.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)kernel/sched/ext_idle.c +6
-6@@ -464,12 +464,6 @@ s32 scx_select_cpu_dfl(struct task_struct *p, s32 prev_cpu, u64 wake_flags,preempt_disable (); -/* -* Check whether @prev_cpu is still within the allowed set. If not, -* we can still try selecting a nearby CPU. -*/ - is_prev_allowed =cpumask_test_cpu (prev_cpu, allowed); -/* * Determine the subset of CPUs usable by @p within @cpus_allowed. */ @@ -486,6 +480,12 @@ s32 scx_select_cpu_dfl(struct task_struct *p, s32 prev_cpu, u64 wake_flags, } } +/* +* Check whether @prev_cpu is still within the allowed set. If not, +* we can still try selecting a nearby CPU. +*/ + is_prev_allowed =cpumask_test_cpu (prev_cpu, allowed); +/* * This is necessary to protect llc_cpus. */ Signature · 1 line
2.53.0
Hello,
Applied to sched_ext/for-7.1-fixes with Andrea's Reviewed-by and a
Cc: [email protected] # v6.16+ added.
Thanks.
--
tejun