forked from luck/tmp_suning_uos_patched
tracing: Change trace_boot to use kprobe_event interface
Have trace_boot_add_kprobe_event() use the kprobe_event interface. Also, rename kprobe_event_run_cmd() to kprobe_event_run_command() now that trace_boot's version is gone. Link: http://lkml.kernel.org/r/af5429d11291ab1e9a85a0ff944af3b2bcf193c7.1580323897.git.zanussi@kernel.org Acked-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Tom Zanussi <zanussi@kernel.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
parent
2a588dd1d5
commit
29a1548105
|
@ -88,37 +88,32 @@ trace_boot_enable_events(struct trace_array *tr, struct xbc_node *node)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_KPROBE_EVENTS
|
||||
extern int trace_kprobe_run_command(const char *command);
|
||||
|
||||
static int __init
|
||||
trace_boot_add_kprobe_event(struct xbc_node *node, const char *event)
|
||||
{
|
||||
struct dynevent_cmd cmd;
|
||||
struct xbc_node *anode;
|
||||
char buf[MAX_BUF_LEN];
|
||||
const char *val;
|
||||
char *p;
|
||||
int len;
|
||||
int ret;
|
||||
|
||||
len = snprintf(buf, ARRAY_SIZE(buf) - 1, "p:kprobes/%s ", event);
|
||||
if (len >= ARRAY_SIZE(buf)) {
|
||||
pr_err("Event name is too long: %s\n", event);
|
||||
return -E2BIG;
|
||||
}
|
||||
p = buf + len;
|
||||
len = ARRAY_SIZE(buf) - len;
|
||||
kprobe_event_cmd_init(&cmd, buf, MAX_BUF_LEN);
|
||||
|
||||
ret = kprobe_event_gen_cmd_start(&cmd, event, NULL);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
xbc_node_for_each_array_value(node, "probes", anode, val) {
|
||||
if (strlcpy(p, val, len) >= len) {
|
||||
pr_err("Probe definition is too long: %s\n", val);
|
||||
return -E2BIG;
|
||||
}
|
||||
if (trace_kprobe_run_command(buf) < 0) {
|
||||
pr_err("Failed to add probe: %s\n", buf);
|
||||
return -EINVAL;
|
||||
}
|
||||
ret = kprobe_event_add_field(&cmd, val);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
ret = kprobe_event_gen_cmd_end(&cmd);
|
||||
if (ret)
|
||||
pr_err("Failed to add probe: %s\n", buf);
|
||||
|
||||
return ret;
|
||||
}
|
||||
#else
|
||||
static inline int __init
|
||||
|
|
|
@ -901,12 +901,7 @@ static int create_or_delete_trace_kprobe(int argc, char **argv)
|
|||
return ret == -ECANCELED ? -EINVAL : ret;
|
||||
}
|
||||
|
||||
int trace_kprobe_run_command(const char *command)
|
||||
{
|
||||
return trace_run_command(command, create_or_delete_trace_kprobe);
|
||||
}
|
||||
|
||||
static int trace_kprobe_run_cmd(struct dynevent_cmd *cmd)
|
||||
static int trace_kprobe_run_command(struct dynevent_cmd *cmd)
|
||||
{
|
||||
return trace_run_command(cmd->buf, create_or_delete_trace_kprobe);
|
||||
}
|
||||
|
@ -923,7 +918,7 @@ static int trace_kprobe_run_cmd(struct dynevent_cmd *cmd)
|
|||
void kprobe_event_cmd_init(struct dynevent_cmd *cmd, char *buf, int maxlen)
|
||||
{
|
||||
dynevent_cmd_init(cmd, buf, maxlen, DYNEVENT_TYPE_KPROBE,
|
||||
trace_kprobe_run_cmd);
|
||||
trace_kprobe_run_command);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(kprobe_event_cmd_init);
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user