From 47af940cea1f43245102cd345bcc7143da24e328 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 30 Oct 2015 01:50:04 +0000 Subject: selftests: kprobe: Choose an always-defined function to probe --- ...probe-choose-an-always-defined-function-t.patch | 126 +++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 127 insertions(+) create mode 100644 debian/patches/bugfix/all/selftests-kprobe-choose-an-always-defined-function-t.patch (limited to 'debian/patches') diff --git a/debian/patches/bugfix/all/selftests-kprobe-choose-an-always-defined-function-t.patch b/debian/patches/bugfix/all/selftests-kprobe-choose-an-always-defined-function-t.patch new file mode 100644 index 000000000..e420702b7 --- /dev/null +++ b/debian/patches/bugfix/all/selftests-kprobe-choose-an-always-defined-function-t.patch @@ -0,0 +1,126 @@ +From: Ben Hutchings +Date: Fri, 30 Oct 2015 01:27:28 +0000 +Subject: selftests: kprobe: Choose an always-defined function to probe + +do_fork() is no longer defined on x86, so probe _do_fork() instead. + +Fixes: 3033f14ab78c ("clone: support passing tls argument via C ...") +Signed-off-by: Ben Hutchings +--- + .../selftests/ftrace/test.d/kprobe/add_and_remove.tc | 2 +- + tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc | 2 +- + .../testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc | 2 +- + .../selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc | 14 +++++++------- + .../selftests/ftrace/test.d/kprobe/kretprobe_args.tc | 2 +- + 5 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc b/tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc +index a5a4262..c3843ed 100644 +--- a/tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc ++++ b/tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc +@@ -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 +diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc b/tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc +index d8c7bb6..74507db 100644 +--- a/tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc ++++ b/tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc +@@ -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 +diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc +index c45ee27..64949d4 100644 +--- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc ++++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc +@@ -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 +diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc +index ab41d2b..d6f2f49 100644 +--- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc ++++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc +@@ -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 +diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc +index 3171798..0d09546 100644 +--- a/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc ++++ b/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc +@@ -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 diff --git a/debian/patches/series b/debian/patches/series index c80fa2247..21a6a3341 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -84,3 +84,4 @@ bugfix/all/ovl-conditionally-use-o_largefile-in-ovl_copy_up.patch bugfix/all/selftests-add-missing-include-directives.patch bugfix/all/selftests-memfd-stop-unnecessary-rebuilds.patch +bugfix/all/selftests-kprobe-choose-an-always-defined-function-t.patch -- cgit v1.2.3