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>

diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
index b6a2d3b511e6958741e291ec08618fbd434fb8de..43fda125890352c71a0a51231a0e19ef78a83abf 100644 (file)
--- a/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@ -6282,9 +6282,6 @@ static int validate_ops(struct scx_sched *sch, const struct sched_ext_ops *ops)
                return -EINVAL;
        }
 
-       if (ops->flags & SCX_OPS_HAS_CGROUP_WEIGHT)
-               pr_warn("SCX_OPS_HAS_CGROUP_WEIGHT is deprecated and a noop\n");
-
        if (ops->cpu_acquire || ops->cpu_release)
                pr_warn("ops->cpu_acquire/release() are deprecated, use sched_switch TP instead\n");
 

diff --git a/kernel/sched/ext_internal.h b/kernel/sched/ext_internal.h
index f8df730445156eb8e3d5dedb4e685e086efea6c4..bec4d22890b0cfb994bacb1216db5eea0b25ef15 100644 (file)
--- a/kernel/sched/ext_internal.h
+++ b/kernel/sched/ext_internal.h
@@ -180,19 +180,13 @@ enum scx_ops_flags {
         */
        SCX_OPS_BUILTIN_IDLE_PER_NODE   = 1LLU << 6,
 
-       /*
-        * CPU cgroup support flags
-        */
-       SCX_OPS_HAS_CGROUP_WEIGHT       = 1LLU << 16,   /* DEPRECATED, will be removed on 6.18 */
-
        SCX_OPS_ALL_FLAGS               = SCX_OPS_KEEP_BUILTIN_IDLE |
                                          SCX_OPS_ENQ_LAST |
                                          SCX_OPS_ENQ_EXITING |
                                          SCX_OPS_ENQ_MIGRATION_DISABLED |
                                          SCX_OPS_ALLOW_QUEUED_WAKEUP |
                                          SCX_OPS_SWITCH_PARTIAL |
-                                         SCX_OPS_BUILTIN_IDLE_PER_NODE |
-                                         SCX_OPS_HAS_CGROUP_WEIGHT,
+                                         SCX_OPS_BUILTIN_IDLE_PER_NODE,
 
        /* high 8 bits are internal, don't include in SCX_OPS_ALL_FLAGS */
        __SCX_OPS_INTERNAL_MASK         = 0xffLLU << 56,

diff --git a/tools/sched_ext/include/scx/enum_defs.autogen.h b/tools/sched_ext/include/scx/enum_defs.autogen.h
index 78d34f0c29f0ea455c770b99bb0e35b4dada095e..40b30dad8edec117497b76865e6919f3917411ba 100644 (file)
--- a/tools/sched_ext/include/scx/enum_defs.autogen.h
+++ b/tools/sched_ext/include/scx/enum_defs.autogen.h
@@ -114,7 +114,6 @@
 #define HAVE_SCX_OPS_ENQ_MIGRATION_DISABLED
 #define HAVE_SCX_OPS_ALLOW_QUEUED_WAKEUP
 #define HAVE_SCX_OPS_BUILTIN_IDLE_PER_NODE
-#define HAVE_SCX_OPS_HAS_CGROUP_WEIGHT
 #define HAVE_SCX_OPS_ALL_FLAGS
 #define HAVE___SCX_OPS_INTERNAL_MASK
 #define HAVE_SCX_OPS_HAS_CPU_PREEMPT

diff --git a/tools/sched_ext/scx_flatcg.bpf.c b/tools/sched_ext/scx_flatcg.bpf.c
index 0e785cff0f24cd512fcbc2f312ae501e06daeba3..a8a9234bb41ec5a3d180407797ff0ec9840be285 100644 (file)
--- a/tools/sched_ext/scx_flatcg.bpf.c
+++ b/tools/sched_ext/scx_flatcg.bpf.c
@@ -960,5 +960,5 @@ SCX_OPS_DEFINE(flatcg_ops,
               .cgroup_move             = (void *)fcg_cgroup_move,
               .init                    = (void *)fcg_init,
               .exit                    = (void *)fcg_exit,
-              .flags                   = SCX_OPS_HAS_CGROUP_WEIGHT | SCX_OPS_ENQ_EXITING,
+              .flags                   = SCX_OPS_ENQ_EXITING,
               .name                    = "flatcg");