Commit a33b5a08 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sched_ext-for-6.15-rc3-fixes' of... 

Merge tag 'sched_ext-for-6.15-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext

Pull sched_ext fixes from Tejun Heo:

 - Use kvzalloc() so that large exit_dump buffer allocations don't fail
   easily

 - Remove cpu.weight / cpu.idle unimplemented warnings which are more
   annoying than helpful.

   This makes SCX_OPS_HAS_CGROUP_WEIGHT unnecessary. Mark it for
   deprecation

* tag 'sched_ext-for-6.15-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext:
  sched_ext: Mark SCX_OPS_HAS_CGROUP_WEIGHT for deprecation
  sched_ext: Remove cpu.weight / cpu.idle unimplemented warnings
  sched_ext: Use kvzalloc for large exit_dump allocation
parents a22509a4 bc08b15b

kernel/sched/ext.c

+7 −43
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ enum scx_ops_flags { 
	/*

	 * CPU cgroup support flags

	 */

	SCX_OPS_HAS_CGROUP_WEIGHT = 1LLU << 16,	/* cpu.weight */

	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 |
@@ -3899,35 +3899,6 @@ bool scx_can_stop_tick(struct rq *rq) 


DEFINE_STATIC_PERCPU_RWSEM(scx_cgroup_rwsem);

static bool scx_cgroup_enabled;

static bool cgroup_warned_missing_weight;

static bool cgroup_warned_missing_idle;



static void scx_cgroup_warn_missing_weight(struct task_group *tg)

{

	if (scx_ops_enable_state() == SCX_OPS_DISABLED ||

	    cgroup_warned_missing_weight)

		return;



	if ((scx_ops.flags & SCX_OPS_HAS_CGROUP_WEIGHT) || !tg->css.parent)

		return;



	pr_warn("sched_ext: \"%s\" does not implement cgroup cpu.weight\n",

		scx_ops.name);

	cgroup_warned_missing_weight = true;

}



static void scx_cgroup_warn_missing_idle(struct task_group *tg)

{

	if (!scx_cgroup_enabled || cgroup_warned_missing_idle)

		return;



	if (!tg->idle)

		return;



	pr_warn("sched_ext: \"%s\" does not implement cgroup cpu.idle\n",

		scx_ops.name);

	cgroup_warned_missing_idle = true;

}



int scx_tg_online(struct task_group *tg)

{
@@ -3937,8 +3908,6 @@ int scx_tg_online(struct task_group *tg) 


	percpu_down_read(&scx_cgroup_rwsem);



	scx_cgroup_warn_missing_weight(tg);



	if (scx_cgroup_enabled) {

		if (SCX_HAS_OP(cgroup_init)) {

			struct scx_cgroup_init_args args =
@@ -4076,9 +4045,7 @@ void scx_group_set_weight(struct task_group *tg, unsigned long weight) 


void scx_group_set_idle(struct task_group *tg, bool idle)

{

	percpu_down_read(&scx_cgroup_rwsem);

	scx_cgroup_warn_missing_idle(tg);

	percpu_up_read(&scx_cgroup_rwsem);

	/* TODO: Implement ops->cgroup_set_idle() */

}



static void scx_cgroup_lock(void)
@@ -4272,9 +4239,6 @@ static int scx_cgroup_init(void) 


	percpu_rwsem_assert_held(&scx_cgroup_rwsem);



	cgroup_warned_missing_weight = false;

	cgroup_warned_missing_idle = false;



	/*

	 * scx_tg_on/offline() are excluded through scx_cgroup_rwsem. If we walk

	 * cgroups and init, all online cgroups are initialized.
@@ -4284,9 +4248,6 @@ static int scx_cgroup_init(void) 
		struct task_group *tg = css_tg(css);

		struct scx_cgroup_init_args args = { .weight = tg->scx_weight };



		scx_cgroup_warn_missing_weight(tg);

		scx_cgroup_warn_missing_idle(tg);



		if ((tg->scx_flags &

		     (SCX_TG_ONLINE | SCX_TG_INITED)) != SCX_TG_ONLINE)

			continue;
@@ -4623,7 +4584,7 @@ static void scx_ops_bypass(bool bypass) 


static void free_exit_info(struct scx_exit_info *ei)

{

	kfree(ei->dump);

	kvfree(ei->dump);

	kfree(ei->msg);

	kfree(ei->bt);

	kfree(ei);
@@ -4639,7 +4600,7 @@ static struct scx_exit_info *alloc_exit_info(size_t exit_dump_len) 


	ei->bt = kcalloc(SCX_EXIT_BT_LEN, sizeof(ei->bt[0]), GFP_KERNEL);

	ei->msg = kzalloc(SCX_EXIT_MSG_LEN, GFP_KERNEL);

	ei->dump = kzalloc(exit_dump_len, GFP_KERNEL);

	ei->dump = kvzalloc(exit_dump_len, GFP_KERNEL);



	if (!ei->bt || !ei->msg || !ei->dump) {

		free_exit_info(ei);
@@ -5252,6 +5213,9 @@ static int validate_ops(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");



	return 0;

}

tools/sched_ext/scx_flatcg.bpf.c

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