tracing/synthetic: skip first entry for stack traces
PATCH 1/2 tracing/synthetic: skip first entry for stack traces
While debugging another issue i noticed that the stack trace output contains the number of entries on top:
<idle>-0 [000] d..4. 203.322502: wake_lat: pid=0 delta=2268270616 stack=STACK:
=> 0x10
=> __schedule+0xac6/0x1a98
=> schedule+0x126/0x2c0
=> schedule_timeout+0x242/0x2c0
=> __wait_for_common+0x434/0x680
=> __wait_rcu_gp+0x198/0x3e0
=> synchronize_rcu+0x112/0x138
=> ring_buffer_reset_online_cpus+0x140/0x2e0
=> tracing_reset_online_cpus+0x15c/0x1d0
=> tracing_set_clock+0x180/0x1d8
=> hist_register_trigger+0x486/0x670
=> event_hist_trigger_parse+0x494/0x1318
=> trigger_process_regex+0x1d4/0x258
=> event_trigger_write+0xb4/0x170
=> vfs_write+0x210/0xad0
=> ksys_write+0x122/0x208
Fix this by skipping the first element. Also replace the pointer logic with an index variable which is easier to read.
--- kernel/trace/trace_events_synth.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)
kernel/trace/trace_events_synth.c +4 -13
@@ -350,7 +350,7 @@ static enum print_line_t print_synth_event(struct trace_iterator *iter,struct trace_seq *s = &iter->seq;struct synth_trace_event *entry;struct synth_event *se; -unsigned int i, n_u64; +unsigned int i, j, n_u64;char print_fmt[32 ];const char *fmt;
@@ -389,18 +389,13 @@ static enum print_line_t print_synth_event(struct trace_iterator *iter, n_u64 +=STR_VAR_LEN_MAX /sizeof (u64); } }else if (se->fields[i]->is_stack) { -unsigned long *p, *end;struct trace_dynamic *data = &entry->fields[n_u64]; - - p = (void *)entry + data->as_dynamic.offset; - end = (void *)p + data->as_dynamic.len - (sizeof (long ) -1 ); +unsigned long *p = (void *)entry + data->as_dynamic.offset;trace_seq_printf (s,"%s=STACK:\n" , se->fields[i]->name); - -for (; *p && p < end; p++) -trace_seq_printf (s,"=> %pS\n" , (void *)*p); +for (j =1 ; j < data->as_dynamic.len /sizeof (long ); j++) +trace_seq_printf (s,"=> %pS\n" , (void *)p[j]); n_u64++; - }else {struct trace_print_flags __flags[] = { __def_gfpflag_names, {-1 ,NULL } };
@@ -490,10 +485,6 @@ static unsigned int trace_stack(struct synth_trace_event *entry,break ; } -/* Include the zero'd element if it fits */ -if (len <HIST_STACKTRACE_DEPTH ) - len++; - len *=sizeof (long );/* Find the dynamic section to copy the stack into. */
Signature · 1 line
2.39.2
PATCH 2/2 tracing/synthetic: allocate one additional element for size
While debugging another issue i noticed that the stack trace contains one invalid entry at the end:
<idle>-0 [008] d..4. 26.484201: wake_lat: pid=0 delta=2629976084 000000009cc24024 stack=STACK:
=> __schedule+0xac6/0x1a98
=> schedule+0x126/0x2c0
=> schedule_timeout+0x150/0x2c0
=> kcompactd+0x9ca/0xc20
=> kthread+0x2f6/0x3d8
=> __ret_from_fork+0x8a/0xe8
=> 0x6b6b6b6b6b6b6b6b
This is because the code failed to add the one element containing the number of entries to field_size.
--- kernel/trace/trace_events_synth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/trace/trace_events_synth.c +2 -1
@@ -528,7 +528,8 @@ static notrace void trace_event_raw_event_synth(void *__data, str_val = (char *)(long )var_ref_vals[val_idx];if (event->dynamic_fields[i]->is_stack) { - len = *((unsigned long *)str_val); +/* reserve one extra element for size */ + len = *((unsigned long *)str_val) +1 ; len *=sizeof (unsigned long ); }else { len =fetch_store_strlen ((unsigned long )str_val);
Signature · 1 line
2.39.2