| Message ID | 20210820204742.653288346@goodmis.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | None | expand |
On Fri, 20 Aug 2021 16:46:50 -0400 Steven Rostedt <rostedt@goodmis.org> wrote: > From: "Steven Rostedt (VMware)" <rostedt@goodmis.org> > > Add a selftest that makes sure that eprobes and kprobes can not be created > with the same group and name as existing events. > > Link: https://lore.kernel.org/linux-kselftest/20210819152825.715290342@goodmis.org/ > > Cc: Shuah Khan <shuah@kernel.org> > Cc: Shuah Khan <skhan@linuxfoundation.org> > Cc: linux-kselftest@vger.kernel.org > Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> OK, this looks good to me. Acked-by: Masami Hiramatsu <mhiramat@kernel.org> Thank you, > --- > .../ftrace/test.d/dynevent/test_duplicates.tc | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc > > diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc b/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc > new file mode 100644 > index 000000000000..db522577ff78 > --- /dev/null > +++ b/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc > @@ -0,0 +1,38 @@ > +#!/bin/sh > +# SPDX-License-Identifier: GPL-2.0 > +# description: Generic dynamic event - check if duplicate events are caught > +# requires: dynamic_events "e[:[<group>/]<event>] <attached-group>.<attached-event> [<args>]":README > + > +echo 0 > events/enable > + > +HAVE_KPROBES=0 > + > +if [ -f kprobe_events ]; then > + HAVE_KPROBES=1 > +fi > + > +clear_dynamic_events > + > +# first create dynamic events for eprobes and kprobes. > + > +echo 'e:egroup/eevent syscalls/sys_enter_openat file=+0($filename):ustring' >> dynamic_events > + > +# Test eprobe for same eprobe, existing kprobe and existing event > +! echo 'e:egroup/eevent syscalls/sys_enter_openat file=+0($filename):ustring' >> dynamic_events > +! echo 'e:syscalls/sys_enter_open syscalls/sys_enter_openat file=+0($filename):ustring' >> dynamic_events > + > +if [ $HAVE_KPROBES -eq 1 ]; then > + echo 'p:kgroup/kevent vfs_open file=+0($arg2)' >> dynamic_events > + ! echo 'e:kgroup/kevent syscalls/sys_enter_openat file=+0($filename):ustring' >> dynamic_events > + > +# Test kprobe for same kprobe, existing eprobe and existing event > + ! echo 'p:kgroup/kevent vfs_open file=+0($arg2)' >> dynamic_events > + ! echo 'p:egroup/eevent vfs_open file=+0($arg2)' >> dynamic_events > + ! echo 'p:syscalls/sys_enter_open vfs_open file=+0($arg2)' >> dynamic_events > + > + echo '-:kgroup/kevent' >> dynamic_events > +fi > + > +echo '-:egroup/eevent' >> dynamic_events > + > +clear_trace > -- > 2.30.2 -- Masami Hiramatsu <mhiramat@kernel.org>
On Sat, 21 Aug 2021 10:41:52 +0900 Masami Hiramatsu <mhiramat@kernel.org> wrote: > OK, this looks good to me. > > Acked-by: Masami Hiramatsu <mhiramat@kernel.org> Thanks Masami for your acks, and all the time you spent on reviewing this series. I'll be add this all to my linux-next queue. Cheers! -- Steve
diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc b/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc new file mode 100644 index 000000000000..db522577ff78 --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc @@ -0,0 +1,38 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Generic dynamic event - check if duplicate events are caught +# requires: dynamic_events "e[:[<group>/]<event>] <attached-group>.<attached-event> [<args>]":README + +echo 0 > events/enable + +HAVE_KPROBES=0 + +if [ -f kprobe_events ]; then + HAVE_KPROBES=1 +fi + +clear_dynamic_events + +# first create dynamic events for eprobes and kprobes. + +echo 'e:egroup/eevent syscalls/sys_enter_openat file=+0($filename):ustring' >> dynamic_events + +# Test eprobe for same eprobe, existing kprobe and existing event +! echo 'e:egroup/eevent syscalls/sys_enter_openat file=+0($filename):ustring' >> dynamic_events +! echo 'e:syscalls/sys_enter_open syscalls/sys_enter_openat file=+0($filename):ustring' >> dynamic_events + +if [ $HAVE_KPROBES -eq 1 ]; then + echo 'p:kgroup/kevent vfs_open file=+0($arg2)' >> dynamic_events + ! echo 'e:kgroup/kevent syscalls/sys_enter_openat file=+0($filename):ustring' >> dynamic_events + +# Test kprobe for same kprobe, existing eprobe and existing event + ! echo 'p:kgroup/kevent vfs_open file=+0($arg2)' >> dynamic_events + ! echo 'p:egroup/eevent vfs_open file=+0($arg2)' >> dynamic_events + ! echo 'p:syscalls/sys_enter_open vfs_open file=+0($arg2)' >> dynamic_events + + echo '-:kgroup/kevent' >> dynamic_events +fi + +echo '-:egroup/eevent' >> dynamic_events + +clear_trace