[PATCH] sched_ext: Remove duplicate BTF_ID_FLAGS definitions

[PATCH] sched_ext: Remove duplicate BTF_ID_FLAGS definitions

[Andrea Righi]

Some kfuncs specific to the idle CPU selection policy are registered in
both the scx_kfunc_ids_any and scx_kfunc_ids_idle blocks, even though
they should only be defined in the latter.

Remove the duplicates from scx_kfunc_ids_any.

Fixes: 337d1b354a297 ("sched_ext: Move built-in idle CPU selection policy to a separate file")
Signed-off-by: Andrea Righi <arighi@nvidia.com>
---
 kernel/sched/ext.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
index 6e530a91e9442..1af53b28f30e9 100644
--- a/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@ -7362,12 +7362,6 @@ BTF_ID_FLAGS(func, scx_bpf_nr_cpu_ids)
 BTF_ID_FLAGS(func, scx_bpf_get_possible_cpumask, KF_ACQUIRE)
 BTF_ID_FLAGS(func, scx_bpf_get_online_cpumask, KF_ACQUIRE)
 BTF_ID_FLAGS(func, scx_bpf_put_cpumask, KF_RELEASE)
-BTF_ID_FLAGS(func, scx_bpf_get_idle_cpumask, KF_ACQUIRE)
-BTF_ID_FLAGS(func, scx_bpf_get_idle_smtmask, KF_ACQUIRE)
-BTF_ID_FLAGS(func, scx_bpf_put_idle_cpumask, KF_RELEASE)
-BTF_ID_FLAGS(func, scx_bpf_test_and_clear_cpu_idle)
-BTF_ID_FLAGS(func, scx_bpf_pick_idle_cpu, KF_RCU)
-BTF_ID_FLAGS(func, scx_bpf_pick_any_cpu, KF_RCU)
 BTF_ID_FLAGS(func, scx_bpf_task_running, KF_RCU)
 BTF_ID_FLAGS(func, scx_bpf_task_cpu, KF_RCU)
 BTF_ID_FLAGS(func, scx_bpf_cpu_rq)
-- 
2.49.0

Re: [PATCH] sched_ext: Remove duplicate BTF_ID_FLAGS definitions

[Tejun Heo]

On Fri, Apr 25, 2025 at 07:57:02PM +0200, Andrea Righi wrote:
> Some kfuncs specific to the idle CPU selection policy are registered in
> both the scx_kfunc_ids_any and scx_kfunc_ids_idle blocks, even though
> they should only be defined in the latter.
> 
> Remove the duplicates from scx_kfunc_ids_any.
> 
> Fixes: 337d1b354a297 ("sched_ext: Move built-in idle CPU selection policy to a separate file")
> Signed-off-by: Andrea Righi <arighi@nvidia.com>

Applied to sched_ext/for-6.15-fixes.

Thanks.

-- 
tejun