Skip to content

Commit

Permalink
tracing/boot: Show correct histogram error command
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
  • Loading branch information
mhiramat authored and intel-lab-lkp committed Aug 5, 2021
1 parent 8885ed8 commit b07ebb7
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions kernel/trace/trace_boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -399,22 +399,27 @@ trace_boot_init_histograms(struct trace_event_file *file,
{
struct xbc_node *node;
const char *p;
char *tmp;

xbc_node_for_each_subkey(hnode, node) {
p = xbc_node_get_data(node);
if (!isdigit(p[0]))
continue;
/* All digit started node should be instances. */
if (trace_boot_compose_hist_cmd(node, buf, size) == 0) {
tmp = kstrdup(buf, GFP_KERNEL);
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 (trace_boot_compose_hist_cmd(hnode, buf, size) == 0)
tmp = kstrdup(buf, GFP_KERNEL);
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);
}

}
Expand Down Expand Up @@ -458,7 +463,7 @@ trace_boot_init_one_event(struct trace_array *tr, struct xbc_node *gnode,
if (strlcpy(buf, p, ARRAY_SIZE(buf)) >= ARRAY_SIZE(buf))
pr_err("action string is too long: %s\n", p);
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");
if (anode)
Expand Down

0 comments on commit b07ebb7

Please sign in to comment.