Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c28628b8 authored by Ben Hutchings's avatar Ben Hutchings Committed by Shuah Khan
Browse files

selftests: kprobe: Choose an always-defined function to probe 



do_fork() is no longer defined on x86, so probe _do_fork() instead.

Fixes: 3033f14a ("clone: support passing tls argument via C ...")
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
parent 55f4d731

tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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