From: Steven Rostedt <rostedt@goodmis.org>
To: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Tom Zanussi <zanussi@kernel.org>,
linux-kernel@vger.kernel.org, Ingo Molnar <mingo@kernel.org>
Subject: Re: [PATCH 2/3] tracing/boottime: Fix kprobe event API usage
Date: Sat, 25 Apr 2020 10:00:20 -0400 [thread overview]
Message-ID: <20200425100020.3ccaa586@oasis.local.home> (raw)
In-Reply-To: <158779375766.6082.201939936008972838.stgit@devnote2>
On Sat, 25 Apr 2020 14:49:17 +0900
Masami Hiramatsu <mhiramat@kernel.org> wrote:
> Fix boottime kprobe events to use API correctly for
> multiple events.
>
> For example, when we set a multiprobe kprobe events in
> bootconfig like below,
>
> ftrace.event.kprobes.myevent {
> probes = "vfs_read $arg1 $arg2", "vfs_write $arg1 $arg2"
> }
>
> This cause an error;
>
> trace_boot: Failed to add probe: p:kprobes/myevent (null) vfs_read $arg1 $arg2 vfs_write $arg1 $arg2
>
> This shows the 1st argument becomes NULL and multiprobes
> are merged to 1 probe.
>
> Fixes: 29a154810546 ("tracing: Change trace_boot to use kprobe_event interface")
> Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> Cc: stable@vger.kernel.org
> ---
> kernel/trace/trace_boot.c | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/kernel/trace/trace_boot.c b/kernel/trace/trace_boot.c
> index 06d7feb5255f..9de29bb45a27 100644
> --- a/kernel/trace/trace_boot.c
> +++ b/kernel/trace/trace_boot.c
> @@ -95,24 +95,20 @@ trace_boot_add_kprobe_event(struct xbc_node *node, const char *event)
> struct xbc_node *anode;
> char buf[MAX_BUF_LEN];
> const char *val;
> - int ret;
> + int ret = 0;
>
> - kprobe_event_cmd_init(&cmd, buf, MAX_BUF_LEN);
> + xbc_node_for_each_array_value(node, "probes", anode, val) {
> + kprobe_event_cmd_init(&cmd, buf, MAX_BUF_LEN);
>
> - ret = kprobe_event_gen_cmd_start(&cmd, event, NULL);
> - if (ret)
> - return ret;
> + ret = kprobe_event_gen_cmd_start(&cmd, event, val);
> + if (ret)
> + break;
Should we break here? What about just printing an error message and
continuing to the next probe. If I start up something with a typo in
the first element, I lose all events. But if I have a typo in the last
one, I get all but that one. I rather have it just fail on the ones that
don't parse properly.
-- Steve
>
> - xbc_node_for_each_array_value(node, "probes", anode, val) {
> - ret = kprobe_event_add_field(&cmd, val);
> + ret = kprobe_event_gen_cmd_end(&cmd);
> if (ret)
> - return ret;
> + pr_err("Failed to add probe: %s\n", buf);
> }
>
> - ret = kprobe_event_gen_cmd_end(&cmd);
> - if (ret)
> - pr_err("Failed to add probe: %s\n", buf);
> -
> return ret;
> }
> #else
next prev parent reply other threads:[~2020-04-25 14:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-25 5:48 [PATCH 0/3] tracing/kprobes: Fix event generation API etc Masami Hiramatsu
2020-04-25 5:49 ` [PATCH 1/3] tracing/kprobes: Fix a double initialization typo Masami Hiramatsu
2020-04-25 5:49 ` [PATCH 2/3] tracing/boottime: Fix kprobe event API usage Masami Hiramatsu
2020-04-25 14:00 ` Steven Rostedt [this message]
2020-04-26 7:59 ` Masami Hiramatsu
2020-04-26 20:55 ` Tom Zanussi
2020-04-25 5:49 ` [PATCH 3/3] tracing/kprobes: Reject new event if loc is NULL Masami Hiramatsu
2020-05-20 14:22 ` [PATCH 0/3] tracing/kprobes: Fix event generation API etc Masami Hiramatsu
2020-05-20 14:33 ` Steven Rostedt
2020-05-20 14:40 ` Steven Rostedt
2020-05-21 7:55 ` Masami Hiramatsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200425100020.3ccaa586@oasis.local.home \
--to=rostedt@goodmis.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=zanussi@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).