In the function cgroup_base_stat_cputime_show, there are five
instances of #ifdef, which makes the code not concise.
To address this, add the function cgroup_force_idle_show
to make the code more succinct.

Signed-off-by: Chen Ridong <chenridong@huawei.com>
---
 kernel/cgroup/rstat.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c
index fb8b49437573..71a887a051a6 100644
--- a/kernel/cgroup/rstat.c
+++ b/kernel/cgroup/rstat.c
@@ -594,40 +594,39 @@ static void root_cgroup_cputime(struct cgroup_base_stat *bstat)
 	}
 }
 
+#ifdef CONFIG_SCHED_CORE
+static void cgroup_force_idle_show(struct seq_file *seq, struct cgroup_base_stat bstat)
+{
+	u64 forceidle_time = bstat.forceidle_sum;
+
+	do_div(forceidle_time, NSEC_PER_USEC);
+	seq_printf(seq, "core_sched.force_idle_usec %llu\n", forceidle_time);
+}
+#endif
+
 void cgroup_base_stat_cputime_show(struct seq_file *seq)
 {
 	struct cgroup *cgrp = seq_css(seq)->cgroup;
 	u64 usage, utime, stime;
 	struct cgroup_base_stat bstat;
-#ifdef CONFIG_SCHED_CORE
-	u64 forceidle_time;
-#endif
 
 	if (cgroup_parent(cgrp)) {
 		cgroup_rstat_flush_hold(cgrp);
 		usage = cgrp->bstat.cputime.sum_exec_runtime;
 		cputime_adjust(&cgrp->bstat.cputime, &cgrp->prev_cputime,
 			       &utime, &stime);
-#ifdef CONFIG_SCHED_CORE
-		forceidle_time = cgrp->bstat.forceidle_sum;
-#endif
+		stat = cgrp->bstat;
 		cgroup_rstat_flush_release(cgrp);
 	} else {
 		root_cgroup_cputime(&bstat);
 		usage = bstat.cputime.sum_exec_runtime;
 		utime = bstat.cputime.utime;
 		stime = bstat.cputime.stime;
-#ifdef CONFIG_SCHED_CORE
-		forceidle_time = bstat.forceidle_sum;
-#endif
 	}
 
 	do_div(usage, NSEC_PER_USEC);
 	do_div(utime, NSEC_PER_USEC);
 	do_div(stime, NSEC_PER_USEC);
-#ifdef CONFIG_SCHED_CORE
-	do_div(forceidle_time, NSEC_PER_USEC);
-#endif
 
 	seq_printf(seq, "usage_usec %llu\n"
 		   "user_usec %llu\n"
@@ -635,7 +634,7 @@ void cgroup_base_stat_cputime_show(struct seq_file *seq)
 		   usage, utime, stime);
 
 #ifdef CONFIG_SCHED_CORE
-	seq_printf(seq, "core_sched.force_idle_usec %llu\n", forceidle_time);
+	cgroup_force_idle_show(seq, bstat);
 #endif
 }
 
-- 
2.34.1

Hello,

On Mon, Jul 01, 2024 at 02:04:41PM +0000, Chen Ridong wrote:
> +#ifdef CONFIG_SCHED_CORE
> +static void cgroup_force_idle_show(struct seq_file *seq, struct cgroup_base_stat bstat)

Please pass bstat as a pointer. We don't want to copy the whole thing on
stack.

> +{
> +	u64 forceidle_time = bstat.forceidle_sum;
> +
> +	do_div(forceidle_time, NSEC_PER_USEC);
> +	seq_printf(seq, "core_sched.force_idle_usec %llu\n", forceidle_time);
> +}
> +#endif

And maybe move #ifdef and #endif inside the function body so that we don't
need #ifdef in the caller?

>  void cgroup_base_stat_cputime_show(struct seq_file *seq)
>  {
>  	struct cgroup *cgrp = seq_css(seq)->cgroup;
>  	u64 usage, utime, stime;
>  	struct cgroup_base_stat bstat;
> -#ifdef CONFIG_SCHED_CORE
> -	u64 forceidle_time;
> -#endif
>  
>  	if (cgroup_parent(cgrp)) {
>  		cgroup_rstat_flush_hold(cgrp);
>  		usage = cgrp->bstat.cputime.sum_exec_runtime;
>  		cputime_adjust(&cgrp->bstat.cputime, &cgrp->prev_cputime,
>  			       &utime, &stime);
> -#ifdef CONFIG_SCHED_CORE
> -		forceidle_time = cgrp->bstat.forceidle_sum;
> -#endif
> +		stat = cgrp->bstat;

Where is @stat defined? Is the patch even compile tested?

Thanks.

-- 
tejun