Commit c50784e9 authored by Tejun Heo's avatar Tejun Heo
Browse files

sched_ext: Make scx_group_set_weight() always update tg->scx.weight 



Otherwise, tg->scx.weight can go out of sync while scx_cgroup is not enabled
and ops.cgroup_init() may be called with a stale weight value.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Fixes: 81951366 ("sched_ext: Add cgroup support")
Cc: stable@vger.kernel.org # v6.12+
parent 47096d30

kernel/sched/ext.c

+6 −6
Original line number Diff line number Diff line
@@ -4241,12 +4241,12 @@ void scx_group_set_weight(struct task_group *tg, unsigned long weight) 


	percpu_down_read(&scx_cgroup_rwsem);



	if (scx_cgroup_enabled && tg->scx_weight != weight) {

		if (SCX_HAS_OP(sch, cgroup_set_weight))

	if (scx_cgroup_enabled && SCX_HAS_OP(sch, cgroup_set_weight) &&

	    tg->scx_weight != weight)

		SCX_CALL_OP(sch, SCX_KF_UNLOCKED, cgroup_set_weight, NULL,

			    tg_cgrp(tg), weight);



	tg->scx_weight = weight;

	}



	percpu_up_read(&scx_cgroup_rwsem);

}