Commit bec10581 authored by Zhao Mengmeng's avatar Zhao Mengmeng Committed by Tejun Heo
Browse files

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: default avatarZhao Mengmeng <zhaomengmeng@kylinos.cn>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 6af9b391

kernel/sched/ext.c

+0 −3
Original line number Diff line number Diff line
@@ -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");

kernel/sched/ext_internal.h

+1 −7
Original line number Diff line number Diff line
@@ -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,

tools/sched_ext/include/scx/enum_defs.autogen.h

+0 −1
Original line number Diff line number Diff line
@@ -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

tools/sched_ext/scx_flatcg.bpf.c

+1 −1
Original line number Diff line number Diff line
@@ -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");