Skip to content

Commit 7c1130e

Browse files
akaherrostedt
authored andcommitted
test: ftrace: Fix kprobe test for eventfs
kprobe_args_char.tc, kprobe_args_string.tc has validation check for tracefs_create_dir, for eventfs it should be eventfs_create_dir. Link: https://lkml.kernel.org/r/1690568452-46553-11-git-send-email-akaher@vmware.com Signed-off-by: Ajay Kaher <akaher@vmware.com> Co-developed-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Tested-by: Ching-lin Yu <chinglinyu@google.com> Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent 27152bc commit 7c1130e

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,19 @@ mips*)
3434
esac
3535

3636
: "Test get argument (1)"
37-
echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):char" > kprobe_events
37+
if grep -q eventfs_add_dir available_filter_functions; then
38+
DIR_NAME="eventfs_add_dir"
39+
else
40+
DIR_NAME="tracefs_create_dir"
41+
fi
42+
echo "p:testprobe ${DIR_NAME} arg1=+0(${ARG1}):char" > kprobe_events
3843
echo 1 > events/kprobes/testprobe/enable
3944
echo "p:test $FUNCTION_FORK" >> kprobe_events
4045
grep -qe "testprobe.* arg1='t'" trace
4146

4247
echo 0 > events/kprobes/testprobe/enable
4348
: "Test get argument (2)"
44-
echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):char arg2=+0(${ARG1}):char[4]" > kprobe_events
49+
echo "p:testprobe ${DIR_NAME} arg1=+0(${ARG1}):char arg2=+0(${ARG1}):char[4]" > kprobe_events
4550
echo 1 > events/kprobes/testprobe/enable
4651
echo "p:test $FUNCTION_FORK" >> kprobe_events
4752
grep -qe "testprobe.* arg1='t' arg2={'t','e','s','t'}" trace

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,19 @@ loongarch*)
3737
esac
3838

3939
: "Test get argument (1)"
40-
echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):string" > kprobe_events
40+
if grep -q eventfs_add_dir available_filter_functions; then
41+
DIR_NAME="eventfs_add_dir"
42+
else
43+
DIR_NAME="tracefs_create_dir"
44+
fi
45+
echo "p:testprobe ${DIR_NAME} arg1=+0(${ARG1}):string" > kprobe_events
4146
echo 1 > events/kprobes/testprobe/enable
4247
echo "p:test $FUNCTION_FORK" >> kprobe_events
4348
grep -qe "testprobe.* arg1=\"test\"" trace
4449

4550
echo 0 > events/kprobes/testprobe/enable
4651
: "Test get argument (2)"
47-
echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):string arg2=+0(${ARG1}):string" > kprobe_events
52+
echo "p:testprobe ${DIR_NAME} arg1=+0(${ARG1}):string arg2=+0(${ARG1}):string" > kprobe_events
4853
echo 1 > events/kprobes/testprobe/enable
4954
echo "p:test $FUNCTION_FORK" >> kprobe_events
5055
grep -qe "testprobe.* arg1=\"test\" arg2=\"test\"" trace

0 commit comments

Comments
 (0)