]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
sched: Make cpu_shares_read_u64() use tg_weight()
authorTejun Heo <tj@kernel.org>
Wed, 4 Sep 2024 20:24:59 +0000 (10:24 -1000)
committerTejun Heo <tj@kernel.org>
Wed, 4 Sep 2024 20:24:59 +0000 (10:24 -1000)
Move tg_weight() upward and make cpu_shares_read_u64() use it too. This
makes the weight retrieval shared between cgroup v1 and v2 paths and will be
used to implement cgroup support for sched_ext.

No functional changes.

Signed-off-by: Tejun Heo <tj@kernel.org>
kernel/sched/core.c

index b05705dd5e92ad5c6d818960160421214245aee2..362918de593f50d3a31d254f92efcedae7982726 100644 (file)
@@ -9194,6 +9194,11 @@ static int cpu_uclamp_max_show(struct seq_file *sf, void *v)
 #endif /* CONFIG_UCLAMP_TASK_GROUP */
 
 #ifdef CONFIG_FAIR_GROUP_SCHED
+static unsigned long tg_weight(struct task_group *tg)
+{
+       return scale_load_down(tg->shares);
+}
+
 static int cpu_shares_write_u64(struct cgroup_subsys_state *css,
                                struct cftype *cftype, u64 shareval)
 {
@@ -9205,9 +9210,7 @@ static int cpu_shares_write_u64(struct cgroup_subsys_state *css,
 static u64 cpu_shares_read_u64(struct cgroup_subsys_state *css,
                               struct cftype *cft)
 {
-       struct task_group *tg = css_tg(css);
-
-       return (u64) scale_load_down(tg->shares);
+       return tg_weight(css_tg(css));
 }
 
 #ifdef CONFIG_CFS_BANDWIDTH
@@ -9709,11 +9712,6 @@ static int cpu_local_stat_show(struct seq_file *sf,
 
 #ifdef CONFIG_FAIR_GROUP_SCHED
 
-static unsigned long tg_weight(struct task_group *tg)
-{
-       return scale_load_down(tg->shares);
-}
-
 static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css,
                               struct cftype *cft)
 {