tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

sched_ext: remove SCX_OPS_HAS_CGROUP_WEIGHT

While running scx_flatcg, dmesg prints "SCX_OPS_HAS_CGROUP_WEIGHT is
deprecated and a noop", in code, SCX_OPS_HAS_CGROUP_WEIGHT has been
marked as DEPRECATED, and will be removed on 6.18. Now it's time to do it.

Signed-off-by: Zhao Mengmeng <zhaomengmeng@kylinos.cn>
Signed-off-by: Tejun Heo <tj@kernel.org>

authored by

Zhao Mengmeng and committed by
Tejun Heo bec10581 6af9b391

+2 -12
-3
kernel/sched/ext.c
··· 6282 6282 return -EINVAL; 6283 6283 } 6284 6284 6285 - if (ops->flags & SCX_OPS_HAS_CGROUP_WEIGHT) 6286 - pr_warn("SCX_OPS_HAS_CGROUP_WEIGHT is deprecated and a noop\n"); 6287 - 6288 6285 if (ops->cpu_acquire || ops->cpu_release) 6289 6286 pr_warn("ops->cpu_acquire/release() are deprecated, use sched_switch TP instead\n"); 6290 6287
+1 -7
kernel/sched/ext_internal.h
··· 180 180 */ 181 181 SCX_OPS_BUILTIN_IDLE_PER_NODE = 1LLU << 6, 182 182 183 - /* 184 - * CPU cgroup support flags 185 - */ 186 - SCX_OPS_HAS_CGROUP_WEIGHT = 1LLU << 16, /* DEPRECATED, will be removed on 6.18 */ 187 - 188 183 SCX_OPS_ALL_FLAGS = SCX_OPS_KEEP_BUILTIN_IDLE | 189 184 SCX_OPS_ENQ_LAST | 190 185 SCX_OPS_ENQ_EXITING | 191 186 SCX_OPS_ENQ_MIGRATION_DISABLED | 192 187 SCX_OPS_ALLOW_QUEUED_WAKEUP | 193 188 SCX_OPS_SWITCH_PARTIAL | 194 - SCX_OPS_BUILTIN_IDLE_PER_NODE | 195 - SCX_OPS_HAS_CGROUP_WEIGHT, 189 + SCX_OPS_BUILTIN_IDLE_PER_NODE, 196 190 197 191 /* high 8 bits are internal, don't include in SCX_OPS_ALL_FLAGS */ 198 192 __SCX_OPS_INTERNAL_MASK = 0xffLLU << 56,
-1
tools/sched_ext/include/scx/enum_defs.autogen.h
··· 114 114 #define HAVE_SCX_OPS_ENQ_MIGRATION_DISABLED 115 115 #define HAVE_SCX_OPS_ALLOW_QUEUED_WAKEUP 116 116 #define HAVE_SCX_OPS_BUILTIN_IDLE_PER_NODE 117 - #define HAVE_SCX_OPS_HAS_CGROUP_WEIGHT 118 117 #define HAVE_SCX_OPS_ALL_FLAGS 119 118 #define HAVE___SCX_OPS_INTERNAL_MASK 120 119 #define HAVE_SCX_OPS_HAS_CPU_PREEMPT
+1 -1
tools/sched_ext/scx_flatcg.bpf.c
··· 960 960 .cgroup_move = (void *)fcg_cgroup_move, 961 961 .init = (void *)fcg_init, 962 962 .exit = (void *)fcg_exit, 963 - .flags = SCX_OPS_HAS_CGROUP_WEIGHT | SCX_OPS_ENQ_EXITING, 963 + .flags = SCX_OPS_ENQ_EXITING, 964 964 .name = "flatcg");