Skip to contentSkip to conversation

ftracetest: Update kprobe-tracer testcases because of renaming do_fork

PATCH In review Masami Hiramatsu 2 participants 3 messages Jul 9, 2015 – Jul 11, 2015

Subsystems (3)
Kselftest Tracing ABI/API
lore
Share & tools
lore

Masami Hiramatsu

author
#0 lore raw

PATCH 1/1 ftracetest: Update kprobe-tracer testcases because of renaming do_fork

Since the commit 3033f14ab78c ("clone: support passing tls argument via C rather than pt_regs magic") renames do_fork to _do_fork, the testcases for kprobe-tracer doesn't work correctly on the latest kernel.

This fixes it by changing do_fork to _do_fork.

Signed-off-by Masami Hiramatsu <[email protected]>
Reported-by Vince Weaver <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Shuah Khan <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc [email protected]
Cc [email protected]
---
 .../ftrace/test.d/kprobe/add_and_remove.tc         |    2 +-
 .../selftests/ftrace/test.d/kprobe/busy_check.tc   |    2 +-
 .../selftests/ftrace/test.d/kprobe/kprobe_args.tc  |    2 +-
 .../ftrace/test.d/kprobe/kprobe_ftrace.tc          |   14 +++++++-------
 .../ftrace/test.d/kprobe/kretprobe_args.tc         |    2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc +1 -1
index a5a4262..c3843ed 100644
@@ -5,7 +5,7 @@
 
 echo 0 > events/enable
 echo > kprobe_events
-echo p:myevent do_fork > kprobe_events
+echo p:myevent _do_fork > kprobe_events
 grep myevent kprobe_events
 test -d events/kprobes/myevent
 echo > kprobe_events
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc +1 -1
index d8c7bb6..74507db 100644
@@ -5,7 +5,7 @@
 
 echo 0 > events/enable
 echo > kprobe_events
-echo p:myevent do_fork > kprobe_events
+echo p:myevent _do_fork > kprobe_events
 test -d events/kprobes/myevent
 echo 1 > events/kprobes/myevent/enable
 echo > kprobe_events && exit 1 # this must fail
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc +1 -1
index c45ee27..64949d4 100644
@@ -5,7 +5,7 @@
 
 echo 0 > events/enable
 echo > kprobe_events
-echo 'p:testprobe do_fork $stack $stack0 +0($stack)' > kprobe_events
+echo 'p:testprobe _do_fork $stack $stack0 +0($stack)' > kprobe_events
 grep testprobe kprobe_events
 test -d events/kprobes/testprobe
 echo 1 > events/kprobes/testprobe/enable
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc +7 -7
index ab41d2b..d6f2f49 100644
@@ -6,31 +6,31 @@ grep function available_tracers || exit_unsupported # this is configurable
 
 # prepare
 echo nop > current_tracer
-echo do_fork > set_ftrace_filter
+echo _do_fork > set_ftrace_filter
 echo 0 > events/enable
 echo > kprobe_events
-echo 'p:testprobe do_fork' > kprobe_events
+echo 'p:testprobe _do_fork' > kprobe_events
 
 # kprobe on / ftrace off
 echo 1 > events/kprobes/testprobe/enable
 echo > trace
 ( echo "forked")
 grep testprobe trace
-! grep 'do_fork <-' trace
+! grep '_do_fork <-' trace
 
 # kprobe on / ftrace on
 echo function > current_tracer
 echo > trace
 ( echo "forked")
 grep testprobe trace
-grep 'do_fork <-' trace
+grep '_do_fork <-' trace
 
 # kprobe off / ftrace on
 echo 0 > events/kprobes/testprobe/enable
 echo > trace
 ( echo "forked")
 ! grep testprobe trace
-grep 'do_fork <-' trace
+grep '_do_fork <-' trace
 
 # kprobe on / ftrace on
 echo 1 > events/kprobes/testprobe/enable

@@ -38,14 +38,14 @@ echo function > current_tracer
 echo > trace
 ( echo "forked")
 grep testprobe trace
-grep 'do_fork <-' trace
+grep '_do_fork <-' trace
 
 # kprobe on / ftrace off
 echo nop > current_tracer
 echo > trace
 ( echo "forked")
 grep testprobe trace
-! grep 'do_fork <-' trace
+! grep '_do_fork <-' trace
 
 # cleanup
 echo nop > current_tracer
tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc +1 -1
index 3171798..0d09546 100644
@@ -5,7 +5,7 @@
 
 echo 0 > events/enable
 echo > kprobe_events
-echo 'r:testprobe2 do_fork $retval' > kprobe_events
+echo 'r:testprobe2 _do_fork $retval' > kprobe_events
 grep testprobe2 kprobe_events
 test -d events/kprobes/testprobe2
 echo 1 > events/kprobes/testprobe2/enable
maintainer
#1 lore raw
Quoted 96 lines · On Thu, 09 Jul 2015 19:10:12 +0900 Masami Hiramatsu…

echo 0 > events/enable
echo > kprobe_events

tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc +1 -1
-echo p:myevent do_fork > kprobe_events
+echo p:myevent _do_fork > kprobe_events
 grep myevent kprobe_events
 test -d events/kprobes/myevent
 echo > kprobe_events
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc +1 -1
index d8c7bb6..74507db 100644
@@ -5,7 +5,7 @@
 
 echo 0 > events/enable
 echo > kprobe_events
-echo p:myevent do_fork > kprobe_events
+echo p:myevent _do_fork > kprobe_events
 test -d events/kprobes/myevent
 echo 1 > events/kprobes/myevent/enable
 echo > kprobe_events && exit 1 # this must fail
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc +1 -1
index c45ee27..64949d4 100644
@@ -5,7 +5,7 @@
 
 echo 0 > events/enable
 echo > kprobe_events
-echo 'p:testprobe do_fork $stack $stack0 +0($stack)' > kprobe_events
+echo 'p:testprobe _do_fork $stack $stack0 +0($stack)' > kprobe_events
 grep testprobe kprobe_events
 test -d events/kprobes/testprobe
 echo 1 > events/kprobes/testprobe/enable
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc +7 -7
index ab41d2b..d6f2f49 100644
@@ -6,31 +6,31 @@ grep function available_tracers || exit_unsupported # this is configurable
 
 # prepare
 echo nop > current_tracer
-echo do_fork > set_ftrace_filter
+echo _do_fork > set_ftrace_filter
 echo 0 > events/enable
 echo > kprobe_events
-echo 'p:testprobe do_fork' > kprobe_events
+echo 'p:testprobe _do_fork' > kprobe_events
 
 # kprobe on / ftrace off
 echo 1 > events/kprobes/testprobe/enable
 echo > trace
 ( echo "forked")
 grep testprobe trace
-! grep 'do_fork <-' trace
+! grep '_do_fork <-' trace
 
 # kprobe on / ftrace on
 echo function > current_tracer
 echo > trace
 ( echo "forked")
 grep testprobe trace
-grep 'do_fork <-' trace
+grep '_do_fork <-' trace
 
 # kprobe off / ftrace on
 echo 0 > events/kprobes/testprobe/enable
 echo > trace
 ( echo "forked")
 ! grep testprobe trace
-grep 'do_fork <-' trace
+grep '_do_fork <-' trace
 
 # kprobe on / ftrace on
 echo 1 > events/kprobes/testprobe/enable

@@ -38,14 +38,14 @@ echo function > current_tracer
 echo > trace
 ( echo "forked")
 grep testprobe trace
-grep 'do_fork <-' trace
+grep '_do_fork <-' trace
 
 # kprobe on / ftrace off
 echo nop > current_tracer
 echo > trace
 ( echo "forked")
 grep testprobe trace
-! grep 'do_fork <-' trace
+! grep '_do_fork <-' trace
 
 # cleanup
 echo nop > current_tracer
tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc +0 -0
index 3171798..0d09546 100644

tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc line 11

Quoted 8 lines
tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc +1 -1
@@ -5,7 +5,7 @@
 
 echo 0 > events/enable
 echo > kprobe_events
-echo 'r:testprobe2 do_fork $retval' > kprobe_events
+echo 'r:testprobe2 _do_fork $retval' > kprobe_events
 grep testprobe2 kprobe_events
 test -d events/kprobes/testprobe2
 echo 1 > events/kprobes/testprobe2/enable

Instead of hard coding the name, what about adding a global variable for the function, in case we need to change it again, it would only need to be changed in one place?

-- Steve

author
#2 lore raw
Quoted 100 lines · Steven Rostedt
Quoted 97 lines · On Thu, 09 Jul 2015 19:10:12 +0900 Masami Hiramatsu…

echo 0 > events/enable
echo > kprobe_events

tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc +1 -1
-echo p:myevent do_fork > kprobe_events
+echo p:myevent _do_fork > kprobe_events
 grep myevent kprobe_events
 test -d events/kprobes/myevent
 echo > kprobe_events
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc +1 -1
index d8c7bb6..74507db 100644
@@ -5,7 +5,7 @@
 
 echo 0 > events/enable
 echo > kprobe_events
-echo p:myevent do_fork > kprobe_events
+echo p:myevent _do_fork > kprobe_events
 test -d events/kprobes/myevent
 echo 1 > events/kprobes/myevent/enable
 echo > kprobe_events && exit 1 # this must fail
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc +1 -1
index c45ee27..64949d4 100644
@@ -5,7 +5,7 @@
 
 echo 0 > events/enable
 echo > kprobe_events
-echo 'p:testprobe do_fork $stack $stack0 +0($stack)' > kprobe_events
+echo 'p:testprobe _do_fork $stack $stack0 +0($stack)' > kprobe_events
 grep testprobe kprobe_events
 test -d events/kprobes/testprobe
 echo 1 > events/kprobes/testprobe/enable
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc +7 -7
index ab41d2b..d6f2f49 100644
@@ -6,31 +6,31 @@ grep function available_tracers || exit_unsupported # this is configurable
 
 # prepare
 echo nop > current_tracer
-echo do_fork > set_ftrace_filter
+echo _do_fork > set_ftrace_filter
 echo 0 > events/enable
 echo > kprobe_events
-echo 'p:testprobe do_fork' > kprobe_events
+echo 'p:testprobe _do_fork' > kprobe_events
 
 # kprobe on / ftrace off
 echo 1 > events/kprobes/testprobe/enable
 echo > trace
 ( echo "forked")
 grep testprobe trace
-! grep 'do_fork <-' trace
+! grep '_do_fork <-' trace
 
 # kprobe on / ftrace on
 echo function > current_tracer
 echo > trace
 ( echo "forked")
 grep testprobe trace
-grep 'do_fork <-' trace
+grep '_do_fork <-' trace
 
 # kprobe off / ftrace on
 echo 0 > events/kprobes/testprobe/enable
 echo > trace
 ( echo "forked")
 ! grep testprobe trace
-grep 'do_fork <-' trace
+grep '_do_fork <-' trace
 
 # kprobe on / ftrace on
 echo 1 > events/kprobes/testprobe/enable

@@ -38,14 +38,14 @@ echo function > current_tracer
 echo > trace
 ( echo "forked")
 grep testprobe trace
-grep 'do_fork <-' trace
+grep '_do_fork <-' trace
 
 # kprobe on / ftrace off
 echo nop > current_tracer
 echo > trace
 ( echo "forked")
 grep testprobe trace
-! grep 'do_fork <-' trace
+! grep '_do_fork <-' trace
 
 # cleanup
 echo nop > current_tracer
tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc +0 -0
index 3171798..0d09546 100644
@@ -5,7 +5,7 @@
Quoted 12 lines

tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc line 11

Quoted 7 lines
tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc +1 -1
 echo 0 > events/enable
 echo > kprobe_events
-echo 'r:testprobe2 do_fork $retval' > kprobe_events
+echo 'r:testprobe2 _do_fork $retval' > kprobe_events
 grep testprobe2 kprobe_events
 test -d events/kprobes/testprobe2
 echo 1 > events/kprobes/testprobe2/enable

Instead of hard coding the name, what about adding a global variable for the function, in case we need to change it again, it would only need to be changed in one place?

OK, I'll introduce FORK_SYMBOL="_do_fork" :)

Thank you,

Signature · 5 lines
Masami HIRAMATSU
Linux Technology Research Center, System Productivity Research Dept.
Center for Technology Innovation - Systems Engineering
Hitachi, Ltd., Research & Development Group
E-mail: [email protected]