Commit 3693042f authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by Greg Kroah-Hartman

tracing/kprobes: Allow to create probe with a module name starting with a digit

commit 9e52b325 upstream.

Always try to parse an address, since kstrtoul() will safely fail when
given a symbol as input. If that fails (which will be the case for a
symbol), try to parse a symbol instead.

This allows creating a probe such as:

    p:probe/vlan_gro_receive 8021q:vlan_gro_receive+0

Which is necessary for this command to work:

    perf probe -m 8021q -a vlan_gro_receive

Link: http://lkml.kernel.org/r/fd72d666f45b114e2c5b9cf7e27b91de1ec966f1.1498122881.git.sd@queasysnail.net

Fixes: 413d37d1 ("tracing: Add kprobe-based event tracer")
Acked-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9403514b
...@@ -667,30 +667,25 @@ static int create_trace_kprobe(int argc, char **argv) ...@@ -667,30 +667,25 @@ static int create_trace_kprobe(int argc, char **argv)
pr_info("Probe point is not specified.\n"); pr_info("Probe point is not specified.\n");
return -EINVAL; return -EINVAL;
} }
if (isdigit(argv[1][0])) {
if (is_return) { /* try to parse an address. if that fails, try to read the
pr_info("Return probe point must be a symbol.\n"); * input as a symbol. */
return -EINVAL; if (kstrtoul(argv[1], 0, (unsigned long *)&addr)) {
}
/* an address specified */
ret = kstrtoul(&argv[1][0], 0, (unsigned long *)&addr);
if (ret) {
pr_info("Failed to parse address.\n");
return ret;
}
} else {
/* a symbol specified */ /* a symbol specified */
symbol = argv[1]; symbol = argv[1];
/* TODO: support .init module functions */ /* TODO: support .init module functions */
ret = traceprobe_split_symbol_offset(symbol, &offset); ret = traceprobe_split_symbol_offset(symbol, &offset);
if (ret) { if (ret) {
pr_info("Failed to parse symbol.\n"); pr_info("Failed to parse either an address or a symbol.\n");
return ret; return ret;
} }
if (offset && is_return) { if (offset && is_return) {
pr_info("Return probe must be used without offset.\n"); pr_info("Return probe must be used without offset.\n");
return -EINVAL; return -EINVAL;
} }
} else if (is_return) {
pr_info("Return probe point must be a symbol.\n");
return -EINVAL;
} }
argc -= 2; argv += 2; argc -= 2; argv += 2;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment