kevin/linux
1
Fork 0
Code

tracing/probes: cleanup: Set trace_probe::nr_args at trace_probe_init

Browse Source 
Instead of incrementing the trace_probe::nr_args, init it at
trace_probe_init(). Without this change, there is no way to get the number
of trace_probe arguments while parsing it.
This is a cleanup, so the behavior is not changed.

Link: https://lore.kernel.org/all/170952363585.229804.13060759900346411951.stgit@devnote2/

Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
This commit is contained in:
Masami Hiramatsu (Google) 2024-03-04 12:40:36 +09:00
parent 032330abd0
commit 035ba76014
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/trace/trace_eprobe.c
View File

@ -220,7 +220,7 @@ static struct trace_eprobe *alloc_event_probe(const char *group,
if (!ep->event_system) if (!ep->event_system)
goto error; goto error;
ret = trace_probe_init(&ep->tp, this_event, group, false); ret = trace_probe_init(&ep->tp, this_event, group, false, nargs);
if (ret < 0) if (ret < 0)
goto error; goto error;

2
kernel/trace/trace_fprobe.c
View File

@ -389,7 +389,7 @@ static struct trace_fprobe *alloc_trace_fprobe(const char *group,
tf->tpoint = tpoint; tf->tpoint = tpoint;
tf->fp.nr_maxactive = maxactive; tf->fp.nr_maxactive = maxactive;
ret = trace_probe_init(&tf->tp, event, group, false); ret = trace_probe_init(&tf->tp, event, group, false, nargs);
if (ret < 0) if (ret < 0)
goto error; goto error;

2
kernel/trace/trace_kprobe.c
View File

@ -290,7 +290,7 @@ static struct trace_kprobe *alloc_trace_kprobe(const char *group,
INIT_HLIST_NODE(&tk->rp.kp.hlist); INIT_HLIST_NODE(&tk->rp.kp.hlist);
INIT_LIST_HEAD(&tk->rp.kp.list); INIT_LIST_HEAD(&tk->rp.kp.list);
ret = trace_probe_init(&tk->tp, event, group, false); ret = trace_probe_init(&tk->tp, event, group, false, nargs);
if (ret < 0) if (ret < 0)
goto error; goto error;

10
kernel/trace/trace_probe.c
View File

@ -1423,9 +1423,6 @@ int traceprobe_parse_probe_arg(struct trace_probe *tp, int i, const char *arg,
struct probe_arg *parg = &tp->args[i]; struct probe_arg *parg = &tp->args[i];
const char *body; const char *body;
/* Increment count for freeing args in error case */
tp->nr_args++;
body = strchr(arg, '='); body = strchr(arg, '=');
if (body) { if (body) {
if (body - arg > MAX_ARG_NAME_LEN) { if (body - arg > MAX_ARG_NAME_LEN) {
@ -1810,7 +1807,7 @@ void trace_probe_cleanup(struct trace_probe *tp)
} }
int trace_probe_init(struct trace_probe *tp, const char *event, int trace_probe_init(struct trace_probe *tp, const char *event,
const char *group, bool alloc_filter) const char *group, bool alloc_filter, int nargs)
{ {
struct trace_event_call *call; struct trace_event_call *call;
size_t size = sizeof(struct trace_probe_event); size_t size = sizeof(struct trace_probe_event);
@ -1846,6 +1843,11 @@ int trace_probe_init(struct trace_probe *tp, const char *event,
goto error; goto error;
} }
tp->nr_args = nargs;
/* Make sure pointers in args[] are NULL */
if (nargs)
memset(tp->args, 0, sizeof(tp->args[0]) * nargs);
return 0; return 0;
error: error:

2
kernel/trace/trace_probe.h
View File

@ -338,7 +338,7 @@ static inline bool trace_probe_has_single_file(struct trace_probe *tp)
} }
int trace_probe_init(struct trace_probe *tp, const char *event, int trace_probe_init(struct trace_probe *tp, const char *event,
const char *group, bool alloc_filter); const char *group, bool alloc_filter, int nargs);
void trace_probe_cleanup(struct trace_probe *tp); void trace_probe_cleanup(struct trace_probe *tp);
int trace_probe_append(struct trace_probe *tp, struct trace_probe *to); int trace_probe_append(struct trace_probe *tp, struct trace_probe *to);
void trace_probe_unlink(struct trace_probe *tp); void trace_probe_unlink(struct trace_probe *tp);

2
kernel/trace/trace_uprobe.c
View File

@ -337,7 +337,7 @@ alloc_trace_uprobe(const char *group, const char *event, int nargs, bool is_ret)
if (!tu) if (!tu)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
ret = trace_probe_init(&tu->tp, event, group, true); ret = trace_probe_init(&tu->tp, event, group, true, nargs);
if (ret < 0) if (ret < 0)
goto error; goto error;