From: Masami Hiramatsu <mhiramat@kernel.org>
To: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>,
Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
Michael Ellerman <mpe@ellerman.id.au>,
linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH 1/2] trace/kprobes: Sanitize derived event names
Date: Thu, 22 Jun 2017 18:29:53 +0900 [thread overview]
Message-ID: <20170622182953.e1959ce03145b8bb45ec55de@kernel.org> (raw)
In-Reply-To: <22e10dfa9457c28e0ffeaec3a4a7161ef23196fa.1498070485.git.naveen.n.rao@linux.vnet.ibm.com>
On Thu, 22 Jun 2017 00:20:27 +0530
"Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> wrote:
> When we derive event names, convert some expected symbols (such as ':'
> used to specify module:name and '.' present in some symbols) into
> underscores so that the event name is not rejected.
Oops, ok, this is my mistake.
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
This must be marked as bugfix for stable trees.
Could you also add a testcase for this (module name) bug?
MODNAME=`lsmod | head -n 2 | tail -n 1 | cut -f 1 -d " "`
FUNCNAME=`grep -m 1 "\\[$MODNAME\\]" /proc/kallsyms | xargs | cut -f 3 -d " "`
May gives you a target name :)
Thank you,
>
> Before this patch:
> # echo 'p kobject_example:foo_store' > kprobe_events
> trace_kprobe: Failed to allocate trace_probe.(-22)
> -sh: write error: Invalid argument
>
> After this patch:
> # echo 'p kobject_example:foo_store' > kprobe_events
> # cat kprobe_events
> p:kprobes/p_kobject_example_foo_store_0 kobject_example:foo_store
>
> Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
> ---
> kernel/trace/trace_kprobe.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
> index c129fca6ec99..44fd819aa33d 100644
> --- a/kernel/trace/trace_kprobe.c
> +++ b/kernel/trace/trace_kprobe.c
> @@ -598,6 +598,14 @@ static struct notifier_block trace_kprobe_module_nb = {
> .priority = 1 /* Invoked after kprobe module callback */
> };
>
> +/* Convert certain expected symbols into '_' when generating event names */
> +static inline void sanitize_event_name(char *name)
> +{
> + while (*name++ != '\0')
> + if (*name == ':' || *name == '.')
> + *name = '_';
> +}
> +
> static int create_trace_kprobe(int argc, char **argv)
> {
> /*
> @@ -740,6 +748,7 @@ static int create_trace_kprobe(int argc, char **argv)
> else
> snprintf(buf, MAX_EVENT_NAME_LEN, "%c_0x%p",
> is_return ? 'r' : 'p', addr);
> + sanitize_event_name(buf);
> event = buf;
> }
> tk = alloc_trace_kprobe(group, event, addr, symbol, offset, maxactive,
> --
> 2.13.1
>
--
Masami Hiramatsu <mhiramat@kernel.org>
next prev parent reply other threads:[~2017-06-22 9:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-21 18:50 [PATCH 0/2] A couple of small updates/fixes for kprobes tracer Naveen N. Rao
2017-06-21 18:50 ` [PATCH 1/2] trace/kprobes: Sanitize derived event names Naveen N. Rao
2017-06-22 9:29 ` Masami Hiramatsu [this message]
2017-06-22 19:03 ` Naveen N. Rao
2017-06-23 17:30 ` Masami Hiramatsu
2017-06-21 18:50 ` [PATCH 2/2] selftests/ftrace: Update multiple kprobes test for powerpc Naveen N. Rao
2017-06-22 9:07 ` Masami Hiramatsu
2017-06-22 17:03 ` Naveen N. Rao
2017-06-23 17:30 ` Masami Hiramatsu
2017-06-24 11:06 ` Masami Hiramatsu
2017-06-28 9:28 ` Naveen N. Rao
2017-06-28 14:16 ` Masami Hiramatsu
2017-06-28 18:43 ` Naveen N. Rao
2017-06-29 0:57 ` Masami Hiramatsu
2017-06-29 13:08 ` Naveen N. Rao
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=20170622182953.e1959ce03145b8bb45ec55de@kernel.org \
--to=mhiramat@kernel.org \
--cc=ananth@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=naveen.n.rao@linux.vnet.ibm.com \
--cc=rostedt@goodmis.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).