diff options
| author | Tejun Heo <tj@kernel.org> | 2025-03-03 08:02:22 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2025-03-03 08:02:22 -1000 |
| commit | 8a9b1585e2bf2a4d335774c893f5e80cf9262b6d (patch) | |
| tree | e3060de9a1fbf406d8f4caf27ca54d431910d7e2 /kernel/sched/ext_idle.c | |
| parent | 0f0714a3449ca43671c6aa4cae852c4dfceef0d0 (diff) | |
| parent | 9360dfe4cbd62ff1eb8217b815964931523b75b3 (diff) | |
sched_ext: Merge branch 'for-6.14-fixes' into for-6.15
Pull for-6.14-fixes to receive:
9360dfe4cbd6 ("sched_ext: Validate prev_cpu in scx_bpf_select_cpu_dfl()")
which conflicts with:
337d1b354a29 ("sched_ext: Move built-in idle CPU selection policy to a separate file")
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/sched/ext_idle.c')
| -rw-r--r-- | kernel/sched/ext_idle.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/sched/ext_idle.c b/kernel/sched/ext_idle.c index dc40e0baf77c..15e9d1c8b281 100644 --- a/kernel/sched/ext_idle.c +++ b/kernel/sched/ext_idle.c @@ -800,6 +800,9 @@ __bpf_kfunc int scx_bpf_cpu_node(s32 cpu) __bpf_kfunc s32 scx_bpf_select_cpu_dfl(struct task_struct *p, s32 prev_cpu, u64 wake_flags, bool *is_idle) { + if (!ops_cpu_valid(prev_cpu, NULL)) + goto prev_cpu; + if (!check_builtin_idle_enabled()) goto prev_cpu; |