[PATCH 0/2] sched_ext code cleanups

[PATCH 0/2] sched_ext code cleanups

[Zhang Qiao]

Zhang Qiao (2):
  sched/ext: Fix unmatch trailing comment of CONFIG_EXT_GROUP_SCHED
  sched/ext: Use tg_cgroup() to elieminate duplicate code

 kernel/sched/ext.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

-- 
2.33.0

[PATCH 1/2] sched/ext: Fix unmatch trailing comment of CONFIG_EXT_GROUP_SCHED

[Zhang Qiao]

The #endif trailing comment of CONFIG_EXT_GROUP_SCHED is unmatched, so fix
it.

Signed-off-by: Zhang Qiao <zhangqiao22@huawei.com>
---
 kernel/sched/ext.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
index 9ee5a9a261cc..66aaca9efa0c 100644
--- a/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@ -588,7 +588,7 @@ struct sched_ext_ops {
 	 * Update @tg's weight to @weight.
 	 */
 	void (*cgroup_set_weight)(struct cgroup *cgrp, u32 weight);
-#endif	/* CONFIG_CGROUPS */
+#endif	/* CONFIG_EXT_GROUP_SCHED */
 
 	/*
 	 * All online ops must come before ops.cpu_online().
-- 
2.33.0

[PATCH 2/2] sched/ext: Use tg_cgroup() to elieminate duplicate code

[Zhang Qiao]

Use tg_cgroup() to eliminate duplicate code patterns
in scx_bpf_task_cgroup().

Signed-off-by: Zhang Qiao <zhangqiao22@huawei.com>
---
 kernel/sched/ext.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
index 66aaca9efa0c..eabf8705e1e6 100644
--- a/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@ -7054,15 +7054,8 @@ __bpf_kfunc struct cgroup *scx_bpf_task_cgroup(struct task_struct *p)
 	if (!scx_kf_allowed_on_arg_tasks(__SCX_KF_RQ_LOCKED, p))
 		goto out;
 
-	/*
-	 * A task_group may either be a cgroup or an autogroup. In the latter
-	 * case, @tg->css.cgroup is %NULL. A task_group can't become the other
-	 * kind once created.
-	 */
-	if (tg && tg->css.cgroup)
-		cgrp = tg->css.cgroup;
-	else
-		cgrp = &cgrp_dfl_root.cgrp;
+	cgrp = tg_cgrp(tg);
+
 out:
 	cgroup_get(cgrp);
 	return cgrp;
-- 
2.33.0

Re: [PATCH 0/2] sched_ext code cleanups

[Tejun Heo]

On Thu, Sep 26, 2024 at 10:15:03AM +0800, Zhang Qiao wrote:
> Zhang Qiao (2):
>   sched/ext: Fix unmatch trailing comment of CONFIG_EXT_GROUP_SCHED
>   sched/ext: Use tg_cgroup() to elieminate duplicate code

Applied to sched_ext/for-6.13.

Thanks.

-- 
tejun