selftests/ftrace: Fix to check the existence of set_ftrace_filter (fd1baf6c) · Commits · 戴 / test

If we run ftracetest on the kernel with CONFIG_DYNAMIC_FTRACE=n, there is no set_ftrace_filter and all test cases are failed, because reset_ftrace_filter() returns an error. Let's check whether set_ftrace_filter exists in reset_ftrace_filter() and clean up only set_ftrace_notrace in initialize_ftrace(). Signed-off-by:

Masami Hiramatsu <mhiramat@kernel.org> Reviewed-by:

Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by:

Shuah Khan <skhan@linuxfoundation.org>

tools/testing/selftests/ftrace/test.d/functions

+4 −1

Original line number	Diff line number	Diff line
		@@ -46,6 +46,9 @@ reset_events_filter() { # reset all current setting filters
		}

		reset_ftrace_filter() { # reset all triggers in set_ftrace_filter
		if [ ! -f set_ftrace_filter ]; then
		return 0
		fi
		echo > set_ftrace_filter
		grep -v '^#' set_ftrace_filter \| while read t; do
		tr=`echo $t \| cut -d: -f2`
		@@ -93,7 +96,7 @@ initialize_ftrace() { # Reset ftrace to initial-state
		disable_events
		[ -f set_event_pid ] && echo > set_event_pid
		[ -f set_ftrace_pid ] && echo > set_ftrace_pid
		[ -f set_ftrace_filter ] && echo \| tee set_ftrace_*
		[ -f set_ftrace_notrace ] && echo > set_ftrace_notrace
		[ -f set_graph_function ] && echo \| tee set_graph_*
		[ -f stack_trace_filter ] && echo > stack_trace_filter
		[ -f kprobe_events ] && echo > kprobe_events

Admin message