GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-12 17:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tracing/boot: Show correct histogram error command

Browse source 
Since trigger_process_regex() modifies given trigger actions
while parsing, the error message couldn't show what command
was passed to the trigger_process_regex() when it returns
an error.

To fix that, show the backed up trigger action command
instead of parsed buffer.

Link: https://lkml.kernel.org/r/162856126413.203126.9465564928450701424.stgit@devnote2

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Masami Hiramatsu 2021-08-10 11:07:44 +09:00 • committed by Steven Rostedt (VMware)
parent 17abd7c36c
commit 64dc7f6958
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
kernel/trace/trace_boot.c
View file

@ -422,6 +422,7 @@ trace_boot_init_histograms(struct trace_event_file *file,
{ {
struct xbc_node *node; struct xbc_node *node;
const char *p; const char *p;
char *tmp;
xbc_node_for_each_subkey(hnode, node) { xbc_node_for_each_subkey(hnode, node) {
p = xbc_node_get_data(node); p = xbc_node_get_data(node);
@ -429,15 +430,20 @@ trace_boot_init_histograms(struct trace_event_file *file,
continue; continue;
/* All digit started node should be instances. */ /* All digit started node should be instances. */
if (trace_boot_compose_hist_cmd(node, buf, size) == 0) { if (trace_boot_compose_hist_cmd(node, buf, size) == 0) {
tmp = kstrdup(buf, GFP_KERNEL);
if (trigger_process_regex(file, buf) < 0) if (trigger_process_regex(file, buf) < 0)
pr_err("Failed to apply hist trigger: %s\n", buf); pr_err("Failed to apply hist trigger: %s\n", tmp);
kfree(tmp);
} }
} }
if (xbc_node_find_child(hnode, "keys")) { if (xbc_node_find_child(hnode, "keys")) {
if (trace_boot_compose_hist_cmd(hnode, buf, size) == 0) if (trace_boot_compose_hist_cmd(hnode, buf, size) == 0) {
tmp = kstrdup(buf, GFP_KERNEL);
if (trigger_process_regex(file, buf) < 0) if (trigger_process_regex(file, buf) < 0)
pr_err("Failed to apply hist trigger: %s\n", buf); pr_err("Failed to apply hist trigger: %s\n", tmp);
kfree(tmp);
}
} }
} }
#else #else
@ -488,7 +494,7 @@ trace_boot_init_one_event(struct trace_array *tr, struct xbc_node *gnode,
if (strlcpy(buf, p, ARRAY_SIZE(buf)) >= ARRAY_SIZE(buf)) if (strlcpy(buf, p, ARRAY_SIZE(buf)) >= ARRAY_SIZE(buf))
pr_err("action string is too long: %s\n", p); pr_err("action string is too long: %s\n", p);
else if (trigger_process_regex(file, buf) < 0) else if (trigger_process_regex(file, buf) < 0)
pr_err("Failed to apply an action: %s\n", buf); pr_err("Failed to apply an action: %s\n", p);
} }
anode = xbc_node_find_child(enode, "hist"); anode = xbc_node_find_child(enode, "hist");
if (anode) if (anode)