tracing: Make the space reserved for the pid wider
PATCH 1/1 tracing: Make the space reserved for the pid wider
For 64bit CONFIG_BASE_SMALL=0 systems PID_MAX_LIMIT is set by default to 4194304. During boot the kernel sets a new value based on number of CPUs but no lower than 32768. It is 1024 per CPU so with 128 CPUs the default becomes 131072 which needs six digits.
This value can be increased during run time but must not exceed the initial upper limit.
Systemd sometime after v241 sets it to the upper limit during boot. The result is that when the pid exceeds five digits, the trace output is a little hard to read because it is no longer properly padded (same like on big iron with 98+ CPUs).
Increase the pid padding to seven digits.
--- kernel/trace/trace.c | 38 ++++++++++++++++++------------------- kernel/trace/trace_output.c | 12 ++++++------ 2 files changed, 25 insertions(+), 25 deletions(-)
kernel/trace/trace.c +19 -19
@@ -3782,14 +3782,14 @@ unsigned long trace_total_entries(struct trace_array *tr)static void print_lat_help_header (struct seq_file *m) { -seq_puts (m,"# _------=> CPU# \n" -"# / _-----=> irqs-off \n" -"# | / _----=> need-resched \n" -"# || / _---=> hardirq/softirq \n" -"# ||| / _--=> preempt-depth \n" -"# |||| / delay \n" -"# cmd pid ||||| time | caller \n" -"# \\ / ||||| \\ | / \n" ); +seq_puts (m,"# _------=> CPU# \n" +"# / _-----=> irqs-off \n" +"# | / _----=> need-resched \n" +"# || / _---=> hardirq/softirq \n" +"# ||| / _--=> preempt-depth \n" +"# |||| / delay \n" +"# cmd pid ||||| time | caller \n" +"# \\ / ||||| \\ | / \n" ); }static void print_event_info (struct array_buffer *buf,struct seq_file *m)
@@ -3810,26 +3810,26 @@ static void print_func_help_header(struct array_buffer *buf, struct seq_file *m,print_event_info (buf, m); -seq_printf (m,"# TASK-PID %s CPU# TIMESTAMP FUNCTION\n" , tgid ?"TGID " :"" ); -seq_printf (m,"# | | %s | | |\n" , tgid ?" | " :"" ); +seq_printf (m,"# TASK-PID %s CPU# TIMESTAMP FUNCTION\n" , tgid ?" TGID " :"" ); +seq_printf (m,"# | | %s | | |\n" , tgid ?" | " :"" ); }static void print_func_help_header_irq (struct array_buffer *buf,struct seq_file *m,unsigned int flags) {bool tgid = flags &TRACE_ITER_RECORD_TGID ; -const char *space =" " ; -int prec = tgid ?10 :2 ; +const char *space =" " ; +int prec = tgid ?12 :2 ;print_event_info (buf, m); -seq_printf (m,"# %.*s _-----=> irqs-off\n" , prec, space); -seq_printf (m,"# %.*s / _----=> need-resched\n" , prec, space); -seq_printf (m,"# %.*s| / _---=> hardirq/softirq\n" , prec, space); -seq_printf (m,"# %.*s|| / _--=> preempt-depth\n" , prec, space); -seq_printf (m,"# %.*s||| / delay\n" , prec, space); -seq_printf (m,"# TASK-PID %.*sCPU# |||| TIMESTAMP FUNCTION\n" , prec," TGID " ); -seq_printf (m,"# | | %.*s | |||| | |\n" , prec," | " ); +seq_printf (m,"# %.*s _-----=> irqs-off\n" , prec, space); +seq_printf (m,"# %.*s / _----=> need-resched\n" , prec, space); +seq_printf (m,"# %.*s| / _---=> hardirq/softirq\n" , prec, space); +seq_printf (m,"# %.*s|| / _--=> preempt-depth\n" , prec, space); +seq_printf (m,"# %.*s||| / delay\n" , prec, space); +seq_printf (m,"# TASK-PID %.*s CPU# |||| TIMESTAMP FUNCTION\n" , prec," TGID " ); +seq_printf (m,"# | | %.*s | |||| | |\n" , prec," | " ); }void
kernel/trace/trace_output.c +6 -6
@@ -497,7 +497,7 @@ lat_print_generic(struct trace_seq *s, struct trace_entry *entry, int cpu)trace_find_cmdline (entry->pid, comm); -trace_seq_printf (s,"%8.8s-%-5d %3d" , +trace_seq_printf (s,"%8.8s-%-7d %3d" , comm, entry->pid, cpu);return trace_print_lat_fmt (s, entry);
@@ -588,15 +588,15 @@ int trace_print_context(struct trace_iterator *iter)trace_find_cmdline (entry->pid, comm); -trace_seq_printf (s,"%16s-%-5d " , comm, entry->pid); +trace_seq_printf (s,"%16s-%-7d " , comm, entry->pid);if (tr->trace_flags &TRACE_ITER_RECORD_TGID ) {unsigned int tgid =trace_find_tgid (entry->pid);if (!tgid) -trace_seq_printf (s,"(-----) " ); +trace_seq_printf (s,"(-------) " );else -trace_seq_printf (s,"(%5d) " , tgid); +trace_seq_printf (s,"(%7d) " , tgid); }trace_seq_printf (s,"[%03d] " , iter->cpu);
@@ -636,7 +636,7 @@ int trace_print_lat_context(struct trace_iterator *iter)trace_find_cmdline (entry->pid, comm);trace_seq_printf ( - s,"%16s %5d %3d %d %08x %08lx " , + s,"%16s %7d %3d %d %08x %08lx " , comm, entry->pid, iter->cpu, entry->flags, entry->preempt_count, iter->idx); }else {
@@ -917,7 +917,7 @@ static enum print_line_t trace_ctxwake_print(struct trace_iterator *iter,S =task_index_to_char (field->prev_state);trace_find_cmdline (field->next_pid, comm); trace_seq_printf(&iter->seq, - " %5d:%3d:%c %s [%03d] %5d:%3d:%c %s\n", + " %7d:%3d:%c %s [%03d] %7d:%3d:%c %s\n", field->prev_pid, field->prev_prio, S, delim,
Signature · 1 line
2.28.0
Quoted 7 lines · On 2020-09-04 10:23:31 [+0200], To [email protected] wrote:
For 64bit
CONFIG_BASE_SMALL=0systemsPID_MAX_LIMITis set by default to 4194304. During boot the kernel sets a new value based on number of CPUs but no lower than 32768. It is 1024 per CPU so with 128 CPUs the default becomes 131072 which needs six digits.
This value can be increased during run time but must not exceed the initial upper limit.
Quoted 6 lines
Systemd sometime after v241 sets it to the upper limit during boot. The result is that when the pid exceeds five digits, the trace output is a little hard to read because it is no longer properly padded (same like on big iron with 98+ CPUs).
Increase the pid padding to seven digits.
ping
Sebastian
Steven Rostedt
maintainerQuoted 8 lines · On Tue, 15 Sep 2020 12:46:48 +0200 Sebastian Andrzej Siewior…
Quoted 7 lines · On 2020-09-04 10:23:31 [+0200], To [email protected] wrote:
For 64bit
CONFIG_BASE_SMALL=0systemsPID_MAX_LIMITis set by default to 4194304. During boot the kernel sets a new value based on number of CPUs but no lower than 32768. It is 1024 per CPU so with 128 CPUs the default becomes 131072 which needs six digits.
This value can be increased during run time but must not exceed the initial upper limit.
Quoted 9 lines
Quoted 6 lines
Systemd sometime after v241 sets it to the upper limit during boot. The result is that when the pid exceeds five digits, the trace output is a little hard to read because it is no longer properly padded (same like on big iron with 98+ CPUs).
Increase the pid padding to seven digits.
ping
Hi Sebastian,
I'm still buried in email from my PTO, with lots of patches I need to review and apply (or comment on). And I'm also behind in internal work affairs. I'm not ignoring this, just taking some time to get to it :-/
-- Steve
Quoted 1 line · Steven Rostedt
Hi Sebastian,
Hi Steven,
Quoted 3 lines
I'm still buried in email from my PTO, with lots of patches I need to review and apply (or comment on). And I'm also behind in internal work affairs. I'm not ignoring this, just taking some time to get to it :-/
Sorry, I forgot that PTO part…
Quoted 1 line
-- Steve
Sebastian