perf-probe: Accept the instance number of kretprobe event
PATCH 1/1 perf-probe: Accept the instance number of kretprobe event
Since the commit 6a13a0d7b4d1 ("ftrace/kprobe: Show the maxactive number on kprobe_events") introduced to show the instance number of kretprobe events, the length of the 1st format of the kprobe event will not 1, but it can be longer. This caused a parser error in perf-probe.
Skip the length check the 1st format of the kprobe event to accept this instance number.
Without this fix:
# perf probe -a vfs_read%return
Added new event:
probe:vfs_read__return (on vfs_read%return)You can now use it in all perf tools, such as:
perf record -e probe:vfs_read__return -aR sleep 1
# perf probe -l
Semantic error :Failed to parse event name: r16:probe/vfs_read__return
Error: Failed to show event list.And with this fixes:
# perf probe -a vfs_read%return
...
# perf probe -l
probe:vfs_read__return (on vfs_read%return)--- tools/perf/util/probe-event.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
tools/perf/util/probe-event.c +1 -2
@@ -1765,8 +1765,7 @@ int parse_probe_trace_command(const char *cmd, struct probe_trace_event *tev) fmt1_str =strtok_r (argv0_str,":" , &fmt); fmt2_str =strtok_r (NULL ,"/" , &fmt); fmt3_str =strtok_r (NULL ," \t" , &fmt); -if (fmt1_str ==NULL ||strlen (fmt1_str) !=1 || fmt2_str ==NULL - || fmt3_str ==NULL ) { +if (fmt1_str ==NULL || fmt2_str ==NULL || fmt3_str ==NULL ) {semantic_error ("Failed to parse event name: %s\n" , argv[0 ]); ret = -EINVAL ; goto out;
Em Wed, May 06, 2020 at 11:29:12PM +0900, Masami Hiramatsu escreveu:
Quoted 5 lines
Since the commit
6a13a0d7b4d1("ftrace/kprobe: Show the maxactive number onkprobe_events") introduced to show the instance number of kretprobe events, the length of the 1st format of the kprobe event will not 1, but it can be longer. This caused a parser error in perf-probe.
Thanks for the quick fix!
I'll add this right after the Fixes tag:
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=207587
Ok?
yshuiv, can I have your name to add to that Reported-by tag? And if you test it, please, I can add a Tested-by: tag as well, credits where credits are due!
Thanks!
- Arnaldo
Quoted 48 lines
Skip the length check the 1st format of the kprobe event to accept this instance number.
Without this fix:
# perf probe -a vfs_read%return Added new event: probe:vfs_read__return (on vfs_read%return)You can now use it in all perf tools, such as:
perf record -e probe:vfs_read__return -aR sleep 1
# perf probe -l Semantic error :Failed to parse event name: r16:probe/vfs_read__return Error: Failed to show event list.And with this fixes:
# perf probe -a vfs_read%return ... # perf probe -l probe:vfs_read__return (on vfs_read%return)Fixes 6a13a0d7b4d1 ("ftrace/kprobe: Show the maxactive number on kprobe_events")Signed-off-by Masami Hiramatsu <[email protected]>--- tools/perf/util/probe-event.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)tools/perf/util/probe-event.c +1
-2@@ -1765,8 +1765,7 @@ int parse_probe_trace_command(const char *cmd, struct probe_trace_event *tev) fmt1_str =strtok_r (argv0_str,":" , &fmt); fmt2_str =strtok_r (NULL ,"/" , &fmt); fmt3_str =strtok_r (NULL ," \t" , &fmt); -if (fmt1_str ==NULL ||strlen (fmt1_str) !=1 || fmt2_str ==NULL - || fmt3_str ==NULL ) { +if (fmt1_str ==NULL || fmt2_str ==NULL || fmt3_str ==NULL ) {semantic_error ("Failed to parse event name: %s\n" , argv[0 ]); ret = -EINVAL ; goto out;
Signature · 1 line
- Arnaldo
Em Wed, May 06, 2020 at 01:17:23PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 7 lines
Em Wed, May 06, 2020 at 11:29:12PM +0900, Masami Hiramatsu escreveu:
Quoted 5 lines
Since the commit
6a13a0d7b4d1("ftrace/kprobe: Show the maxactive number onkprobe_events") introduced to show the instance number of kretprobe events, the length of the 1st format of the kprobe event will not 1, but it can be longer. This caused a parser error in perf-probe.
Quoted 6 lines
Thanks for the quick fix!
I'll add this right after the Fixes tag:
Reported-by [email protected]Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=207587
Sorry, I didn't notice you added it as a Link: :-)
Quoted 62 lines
Ok?
yshuiv, can I have your name to add to that Reported-by tag? And if you test it, please, I can add a Tested-by: tag as well, credits where credits are due!
Thanks!
- Arnaldo
Quoted 48 lines
Skip the length check the 1st format of the kprobe event to accept this instance number.
Without this fix:
# perf probe -a vfs_read%return Added new event: probe:vfs_read__return (on vfs_read%return)You can now use it in all perf tools, such as:
perf record -e probe:vfs_read__return -aR sleep 1
# perf probe -l Semantic error :Failed to parse event name: r16:probe/vfs_read__return Error: Failed to show event list.And with this fixes:
# perf probe -a vfs_read%return ... # perf probe -l probe:vfs_read__return (on vfs_read%return)Fixes 6a13a0d7b4d1 ("ftrace/kprobe: Show the maxactive number on kprobe_events")Signed-off-by Masami Hiramatsu <[email protected]>--- tools/perf/util/probe-event.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)tools/perf/util/probe-event.c +1
-2@@ -1765,8 +1765,7 @@ int parse_probe_trace_command(const char *cmd, struct probe_trace_event *tev) fmt1_str =strtok_r (argv0_str,":" , &fmt); fmt2_str =strtok_r (NULL ,"/" , &fmt); fmt3_str =strtok_r (NULL ," \t" , &fmt); -if (fmt1_str ==NULL ||strlen (fmt1_str) !=1 || fmt2_str ==NULL - || fmt3_str ==NULL ) { +if (fmt1_str ==NULL || fmt2_str ==NULL || fmt3_str ==NULL ) {semantic_error ("Failed to parse event name: %s\n" , argv[0 ]); ret = -EINVAL ; goto out;Signature · 1 line
- Arnaldo
Signature · 1 line
- Arnaldo
Quoted 8 lines · On Wed, 6 May 2020 13:41:31 -0300 Arnaldo Carvalho de Melo <[email protected]>…
Em Wed, May 06, 2020 at 01:17:23PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 7 lines
Em Wed, May 06, 2020 at 11:29:12PM +0900, Masami Hiramatsu escreveu:
Quoted 5 lines
Since the commit
6a13a0d7b4d1("ftrace/kprobe: Show the maxactive number onkprobe_events") introduced to show the instance number of kretprobe events, the length of the 1st format of the kprobe event will not 1, but it can be longer. This caused a parser error in perf-probe.
Quoted 10 lines
Quoted 6 lines
Thanks for the quick fix!
I'll add this right after the Fixes tag:
Reported-by [email protected]Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=207587
Sorry, I didn't notice you added it as a Link: :-)
Quoted 1 line
Ok?
Yes, I missed the yshuiv's mail so missed it. please add it :)
Thank you,
Quoted 65 lines
Quoted 61 lines
yshuiv, can I have your name to add to that Reported-by tag? And if you test it, please, I can add a Tested-by: tag as well, credits where credits are due!
Thanks!
- Arnaldo
Quoted 48 lines
Skip the length check the 1st format of the kprobe event to accept this instance number.
Without this fix:
# perf probe -a vfs_read%return Added new event: probe:vfs_read__return (on vfs_read%return)You can now use it in all perf tools, such as:
perf record -e probe:vfs_read__return -aR sleep 1
# perf probe -l Semantic error :Failed to parse event name: r16:probe/vfs_read__return Error: Failed to show event list.And with this fixes:
# perf probe -a vfs_read%return ... # perf probe -l probe:vfs_read__return (on vfs_read%return)Fixes 6a13a0d7b4d1 ("ftrace/kprobe: Show the maxactive number on kprobe_events")Signed-off-by Masami Hiramatsu <[email protected]>--- tools/perf/util/probe-event.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)tools/perf/util/probe-event.c +1
-2@@ -1765,8 +1765,7 @@ int parse_probe_trace_command(const char *cmd, struct probe_trace_event *tev) fmt1_str =strtok_r (argv0_str,":" , &fmt); fmt2_str =strtok_r (NULL ,"/" , &fmt); fmt3_str =strtok_r (NULL ," \t" , &fmt); -if (fmt1_str ==NULL ||strlen (fmt1_str) !=1 || fmt2_str ==NULL - || fmt3_str ==NULL ) { +if (fmt1_str ==NULL || fmt2_str ==NULL || fmt3_str ==NULL ) {semantic_error ("Failed to parse event name: %s\n" , argv[0 ]); ret = -EINVAL ; goto out;Signature · 1 line
- ArnaldoSignature · 1 line
- Arnaldo
Signature · 1 line
Masami Hiramatsu <[email protected]>