Commit cc172ff3 authored by Libing Zhou's avatar Libing Zhou Committed by Ingo Molnar

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
Signed-off-by: default avatarLibing Zhou <libing.zhou@nokia-sbell.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200814030236.37835-1-libing.zhou@nokia-sbell.com
parent a1bd0685
...@@ -6387,10 +6387,10 @@ void sched_show_task(struct task_struct *p) ...@@ -6387,10 +6387,10 @@ void sched_show_task(struct task_struct *p)
if (!try_get_task_stack(p)) if (!try_get_task_stack(p))
return; 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) if (p->state == TASK_RUNNING)
printk(KERN_CONT " running task "); pr_cont(" running task ");
#ifdef CONFIG_DEBUG_STACK_USAGE #ifdef CONFIG_DEBUG_STACK_USAGE
free = stack_not_used(p); free = stack_not_used(p);
#endif #endif
...@@ -6399,8 +6399,8 @@ void sched_show_task(struct task_struct *p) ...@@ -6399,8 +6399,8 @@ void sched_show_task(struct task_struct *p)
if (pid_alive(p)) if (pid_alive(p))
ppid = task_pid_nr(rcu_dereference(p->real_parent)); ppid = task_pid_nr(rcu_dereference(p->real_parent));
rcu_read_unlock(); rcu_read_unlock();
printk(KERN_CONT "%5lu %5d %6d 0x%08lx\n", free, pr_cont(" stack:%5lu pid:%5d ppid:%6d flags:0x%08lx\n",
task_pid_nr(p), ppid, free, task_pid_nr(p), ppid,
(unsigned long)task_thread_info(p)->flags); (unsigned long)task_thread_info(p)->flags);
print_worker_info(KERN_INFO, p); print_worker_info(KERN_INFO, p);
...@@ -6435,13 +6435,6 @@ void show_state_filter(unsigned long state_filter) ...@@ -6435,13 +6435,6 @@ void show_state_filter(unsigned long state_filter)
{ {
struct task_struct *g, *p; 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(); rcu_read_lock();
for_each_process_thread(g, p) { for_each_process_thread(g, p) {
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment