Commit 2cab4bd0 authored Sep 06, 2024 by Huang Shijie Committed by Peter Zijlstra Sep 10, 2024

sched/debug: Fix the runnable tasks output



The current runnable tasks output looks like:

  runnable tasks:
   S            task   PID         tree-key  switches  prio     wait-time             sum-exec        sum-sleep
  -------------------------------------------------------------------------------------------------------------
   Ikworker/R-rcu_g     4         0.129049 E         0.620179           0.750000         0.002920         2   100         0.000000         0.002920         0.000000         0.000000 0 0 /
   Ikworker/R-sync_     5         0.125328 E         0.624147           0.750000         0.001840         2   100         0.000000         0.001840         0.000000         0.000000 0 0 /
   Ikworker/R-slub_     6         0.120835 E         0.628680           0.750000         0.001800         2   100         0.000000         0.001800         0.000000         0.000000 0 0 /
   Ikworker/R-netns     7         0.114294 E         0.634701           0.750000         0.002400         2   100         0.000000         0.002400         0.000000         0.000000 0 0 /
   I    kworker/0:1     9       508.781746 E       511.754666           3.000000       151.575240       224   120         0.000000       151.575240         0.000000         0.000000 0 0 /

Which is messy. Remove the duplicate printing of sum_exec_runtime and
tidy up the layout to make it look like:

  runnable tasks:
   S            task   PID       vruntime   eligible    deadline             slice          sum-exec      switches  prio         wait-time        sum-sleep       sum-block  node   group-id  group-path
  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
   I     kworker/0:3  1698       295.001459   E         297.977619           3.000000        38.862920         9     120         0.000000         0.000000         0.000000   0      0        /
   I     kworker/0:4  1702       278.026303   E         281.026303           3.000000         9.918760         3     120         0.000000         0.000000         0.000000   0      0        /
   S  NetworkManager  2646         0.377936   E           2.598104           3.000000        98.535880       314     120         0.000000         0.000000         0.000000   0      0        /system.slice/NetworkManager.service
   S       virtqemud  2689         0.541016   E           2.440104           3.000000        50.967960        80     120         0.000000         0.000000         0.000000   0      0        /system.slice/virtqemud.service
   S   gsd-smartcard  3058        73.604144   E          76.475904           3.000000        74.033320        88     120         0.000000         0.000000         0.000000   0      0        /user.slice/user-42.slice/session-c1.scope

Reviewed-by: Christoph Lameter (Ampere) <cl@linux.com>
Signed-off-by: Huang Shijie <shijie@os.amperecomputing.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20240906053019.7874-1-shijie@os.amperecomputing.com

parent c662e2b1

kernel/sched/debug.c

+23 −8

Original line number	Diff line number	Diff line
		@@ -750,9 +750,8 @@ print_task(struct seq_file m, struct rq rq, struct task_struct *p)
		(long long)(p->nvcsw + p->nivcsw),
		p->prio);

		SEQ_printf(m, "%9lld.%06ld %9lld.%06ld %9lld.%06ld %9lld.%06ld",
		SEQ_printf(m, "%9lld.%06ld %9lld.%06ld %9lld.%06ld",
		SPLIT_NS(schedstat_val_or_zero(p->stats.wait_sum)),
		SPLIT_NS(p->se.sum_exec_runtime),
		SPLIT_NS(schedstat_val_or_zero(p->stats.sum_sleep_runtime)),
		SPLIT_NS(schedstat_val_or_zero(p->stats.sum_block_runtime)));

		@@ -772,10 +771,26 @@ static void print_rq(struct seq_file m, struct rq rq, int rq_cpu)

		SEQ_printf(m, "\n");
		SEQ_printf(m, "runnable tasks:\n");
		SEQ_printf(m, " S task PID tree-key switches prio"
		" wait-time sum-exec sum-sleep\n");
		SEQ_printf(m, " S task PID vruntime eligible "
		"deadline slice sum-exec switches "
		"prio wait-time sum-sleep sum-block"
		#ifdef CONFIG_NUMA_BALANCING
		" node group-id"
		#endif
		#ifdef CONFIG_CGROUP_SCHED
		" group-path"
		#endif
		"\n");
		SEQ_printf(m, "-------------------------------------------------------"
		"------------------------------------------------------\n");
		"------------------------------------------------------"
		"------------------------------------------------------"
		#ifdef CONFIG_NUMA_BALANCING
		"--------------"
		#endif
		#ifdef CONFIG_CGROUP_SCHED
		"--------------"
		#endif
		"\n");

		rcu_read_lock();
		for_each_process_thread(g, p) {