sched: print fields name when do sched_show_task
PATCH v2 1/1 sched: print fields name when do sched_show_task
Current sysrq(t) output task fields name are not aligned with actual task fields value, e.g.:
kernel: sysrq: Show State
kernel: task PC stack pid father
kernel: systemd S12456 1 0 0x00000000
kernel: Call Trace:
kernel: ? __schedule+0x240/0x740
To make it more readable, print fields name together with task fields value in same line, remove separate fields name print, new format looks like:
kernel: sysrq: Show State kernel: task:systemd state:S stack:12920 pid: 1 ppid: 0 flags:0x00000000 kernel: Call Trace: kernel: __schedule+0x282/0x620
---
v2:
Quote the new format as well in the changelog per Ingo suggested.
kernel/sched/core.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
kernel/sched/core.c +4 -11
@@ -6069,10 +6069,10 @@ void sched_show_task(struct task_struct *p)if (!try_get_task_stack (p))return ; -printk (KERN_INFO "%-15.15s %c" , p->comm,task_state_to_char (p)); +pr_info ("task:%-15.15s state:%c" , p->comm,task_state_to_char (p));if (p->state ==TASK_RUNNING ) -printk (KERN_CONT " running task " ); +pr_cont (" running task " );#ifdef CONFIG_DEBUG_STACK_USAGE free =stack_not_used (p);#endif
@@ -6081,8 +6081,8 @@ void sched_show_task(struct task_struct *p)if (pid_alive (p)) ppid =task_pid_nr (rcu_dereference (p->real_parent));rcu_read_unlock (); -printk (KERN_CONT "%5lu %5d %6d 0x%08lx\n" , free, -task_pid_nr (p), ppid, +pr_cont (" stack:%5lu pid:%5d ppid:%6d flags:0x%08lx\n" , + free,task_pid_nr (p), ppid, (unsigned long )task_thread_info (p)->flags);print_worker_info (KERN_INFO , p);
@@ -6117,13 +6117,6 @@ void show_state_filter(unsigned long state_filter) {struct task_struct *g, *p; -#if BITS_PER_LONG ==32 -printk (KERN_INFO -" task PC stack pid father\n" ); -#else -printk (KERN_INFO -" task PC stack pid father\n" ); -#endif rcu_read_lock ();for_each_process_thread (g, p) {/*
Signature · 1 line
2.22.0
[tip: sched/urgent] sched/debug: Fix the alignment of the show-state debug output
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: cc172ff301d8079e941a6eb31758951a6d764084 Gitweb: https://git.kernel.org/tip/cc172ff301d8079e941a6eb31758951a6d764084 Author: Libing Zhou <[email protected]> AuthorDate: Fri, 14 Aug 2020 11:02:36 +08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 14 Aug 2020 12:36:18 +02:00
sched/debug: Fix the alignment of the show-state debug output
Current sysrq(t) output task fields name are not aligned with actual task fields value, e.g.:
kernel: sysrq: Show State
kernel: task PC stack pid father
kernel: systemd S12456 1 0 0x00000000
kernel: Call Trace:
kernel: ? __schedule+0x240/0x740
To make it more readable, print fields name together with task fields value in the same line, with fixed width:
kernel: sysrq: Show State kernel: task:systemd state:S stack:12920 pid: 1 ppid: 0 flags:0x00000000 kernel: Call Trace: kernel: __schedule+0x282/0x620
--- kernel/sched/core.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
kernel/sched/core.c +4 -11
@@ -6387,10 +6387,10 @@ void sched_show_task(struct task_struct *p)if (!try_get_task_stack (p))return ; -printk (KERN_INFO "%-15.15s %c" , p->comm,task_state_to_char (p)); +pr_info ("task:%-15.15s state:%c" , p->comm,task_state_to_char (p));if (p->state ==TASK_RUNNING ) -printk (KERN_CONT " running task " ); +pr_cont (" running task " );#ifdef CONFIG_DEBUG_STACK_USAGE free =stack_not_used (p);#endif
@@ -6399,8 +6399,8 @@ void sched_show_task(struct task_struct *p)if (pid_alive (p)) ppid =task_pid_nr (rcu_dereference (p->real_parent));rcu_read_unlock (); -printk (KERN_CONT "%5lu %5d %6d 0x%08lx\n" , free, -task_pid_nr (p), ppid, +pr_cont (" stack:%5lu pid:%5d ppid:%6d flags:0x%08lx\n" , + free,task_pid_nr (p), ppid, (unsigned long )task_thread_info (p)->flags);print_worker_info (KERN_INFO , p);
@@ -6435,13 +6435,6 @@ void show_state_filter(unsigned long state_filter) {struct task_struct *g, *p; -#if BITS_PER_LONG ==32 -printk (KERN_INFO -" task PC stack pid father\n" ); -#else -printk (KERN_INFO -" task PC stack pid father\n" ); -#endif rcu_read_lock ();for_each_process_thread (g, p) {/*