| Message ID | 20190708181933.10286-1-cascardo@canonical.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | selftests/ftrace: avoid failure when trying to probe a notrace function | expand |
On Mon, 8 Jul 2019 15:19:33 -0300 Thadeu Lima de Souza Cascardo <cascardo@canonical.com> wrote: > Check that the function is on available_filter_functions. If it's not, > mark the test as unresolved, instead of failing it. > Actually, I sent this out a while ago: http://lkml.kernel.org/r/20190322150923.1b58eca5@gandalf.local.home Does that fix it for you? -- Steve > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> > --- > tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc > index 3fb70e01b1fe..e4dff034da12 100644 > --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc > +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc > @@ -26,6 +26,7 @@ test -d events/kprobes2/event2 || exit_failure > > FUNC=`grep -m 10 " [tT] .*\.isra\..*$" /proc/kallsyms | tail -n 1 | cut -f 3 -d " "` > [ "x" != "x$FUNC" ] || exit_unresolved > +grep -n "$FUNC" available_filter_functions || exit_unresolved > echo "p $FUNC" > kprobe_events > EVENT=`grep $FUNC kprobe_events | cut -f 1 -d " " | cut -f 2 -d:` > [ "x" != "x$EVENT" ] || exit_failure
On Mon, Jul 08, 2019 at 02:56:18PM -0400, Steven Rostedt wrote: > On Mon, 8 Jul 2019 15:19:33 -0300 > Thadeu Lima de Souza Cascardo <cascardo@canonical.com> wrote: > > > Check that the function is on available_filter_functions. If it's not, > > mark the test as unresolved, instead of failing it. > > > > Actually, I sent this out a while ago: > > http://lkml.kernel.org/r/20190322150923.1b58eca5@gandalf.local.home > > Does that fix it for you? > > -- Steve Yes, that fix it for me, let me reply to the original message. Thanks! Cascardo. > > > > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> > > --- > > tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc > > index 3fb70e01b1fe..e4dff034da12 100644 > > --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc > > +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc > > @@ -26,6 +26,7 @@ test -d events/kprobes2/event2 || exit_failure > > > > FUNC=`grep -m 10 " [tT] .*\.isra\..*$" /proc/kallsyms | tail -n 1 | cut -f 3 -d " "` > > [ "x" != "x$FUNC" ] || exit_unresolved > > +grep -n "$FUNC" available_filter_functions || exit_unresolved > > echo "p $FUNC" > kprobe_events > > EVENT=`grep $FUNC kprobe_events | cut -f 1 -d " " | cut -f 2 -d:` > > [ "x" != "x$EVENT" ] || exit_failure >
diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc index 3fb70e01b1fe..e4dff034da12 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc @@ -26,6 +26,7 @@ test -d events/kprobes2/event2 || exit_failure FUNC=`grep -m 10 " [tT] .*\.isra\..*$" /proc/kallsyms | tail -n 1 | cut -f 3 -d " "` [ "x" != "x$FUNC" ] || exit_unresolved +grep -n "$FUNC" available_filter_functions || exit_unresolved echo "p $FUNC" > kprobe_events EVENT=`grep $FUNC kprobe_events | cut -f 1 -d " " | cut -f 2 -d:` [ "x" != "x$EVENT" ] || exit_failure
Check that the function is on available_filter_functions. If it's not, mark the test as unresolved, instead of failing it. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> --- tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc | 1 + 1 file changed, 1 insertion(+)