Commit 8720aeec authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Steven Rostedt (VMware)

tracing: use %ps format string to print symbols

clang started warning about excessive stack usage in
hist_trigger_print_key()

kernel/trace/trace_events_hist.c:4723:13: error: stack frame size (1336) exceeds limit (1024) in function 'hist_trigger_print_key' [-Werror,-Wframe-larger-than]

The problem is that there are two 512-byte arrays on the stack if
hist_trigger_stacktrace_print() gets inlined. I don't think this has
changed in the past five years, but something probably changed the
inlining decisions made by the compiler, so the problem is now made
more obvious.

Rather than printing the symbol names into separate buffers, it
seems we can simply use the special %ps format string modifier
to print the pointers symbolically and get rid of both buffers.

Marking hist_trigger_stacktrace_print() would be a simpler
way of avoiding the warning, but that would not address the
excessive stack usage.

Link: https://lkml.kernel.org/r/20211019153337.294790-1-arnd@kernel.org

Fixes: 69a0200c ("tracing: Add hist trigger support for stacktraces as keys")
Link: https://lore.kernel.org/all/20211015095704.49a99859@gandalf.local.home/Reviewed-by: default avatarTom Zanussi <zanussi@kernel.org>
Tested-by: default avatarTom Zanussi <zanussi@kernel.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent bce5c81c
...@@ -4706,7 +4706,6 @@ static void hist_trigger_stacktrace_print(struct seq_file *m, ...@@ -4706,7 +4706,6 @@ static void hist_trigger_stacktrace_print(struct seq_file *m,
unsigned long *stacktrace_entries, unsigned long *stacktrace_entries,
unsigned int max_entries) unsigned int max_entries)
{ {
char str[KSYM_SYMBOL_LEN];
unsigned int spaces = 8; unsigned int spaces = 8;
unsigned int i; unsigned int i;
...@@ -4715,8 +4714,7 @@ static void hist_trigger_stacktrace_print(struct seq_file *m, ...@@ -4715,8 +4714,7 @@ static void hist_trigger_stacktrace_print(struct seq_file *m,
return; return;
seq_printf(m, "%*c", 1 + spaces, ' '); seq_printf(m, "%*c", 1 + spaces, ' ');
sprint_symbol(str, stacktrace_entries[i]); seq_printf(m, "%pS\n", (void*)stacktrace_entries[i]);
seq_printf(m, "%s\n", str);
} }
} }
...@@ -4726,7 +4724,6 @@ static void hist_trigger_print_key(struct seq_file *m, ...@@ -4726,7 +4724,6 @@ static void hist_trigger_print_key(struct seq_file *m,
struct tracing_map_elt *elt) struct tracing_map_elt *elt)
{ {
struct hist_field *key_field; struct hist_field *key_field;
char str[KSYM_SYMBOL_LEN];
bool multiline = false; bool multiline = false;
const char *field_name; const char *field_name;
unsigned int i; unsigned int i;
...@@ -4747,14 +4744,12 @@ static void hist_trigger_print_key(struct seq_file *m, ...@@ -4747,14 +4744,12 @@ static void hist_trigger_print_key(struct seq_file *m,
seq_printf(m, "%s: %llx", field_name, uval); seq_printf(m, "%s: %llx", field_name, uval);
} else if (key_field->flags & HIST_FIELD_FL_SYM) { } else if (key_field->flags & HIST_FIELD_FL_SYM) {
uval = *(u64 *)(key + key_field->offset); uval = *(u64 *)(key + key_field->offset);
sprint_symbol_no_offset(str, uval); seq_printf(m, "%s: [%llx] %-45ps", field_name,
seq_printf(m, "%s: [%llx] %-45s", field_name, uval, (void *)(uintptr_t)uval);
uval, str);
} else if (key_field->flags & HIST_FIELD_FL_SYM_OFFSET) { } else if (key_field->flags & HIST_FIELD_FL_SYM_OFFSET) {
uval = *(u64 *)(key + key_field->offset); uval = *(u64 *)(key + key_field->offset);
sprint_symbol(str, uval); seq_printf(m, "%s: [%llx] %-55pS", field_name,
seq_printf(m, "%s: [%llx] %-55s", field_name, uval, (void *)(uintptr_t)uval);
uval, str);
} else if (key_field->flags & HIST_FIELD_FL_EXECNAME) { } else if (key_field->flags & HIST_FIELD_FL_EXECNAME) {
struct hist_elt_data *elt_data = elt->private_data; struct hist_elt_data *elt_data = elt->private_data;
char *comm; char *comm;
......
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