Commit 6c77221d authored by Changbin Du's avatar Changbin Du Committed by Steven Rostedt (VMware)
Browse files

fgraph: Remove redundant ftrace_graph_notrace_addr() test 

We already have tested it before. The second one should be removed.
With this change, the performance should have little improvement.

Link: http://lkml.kernel.org/r/20190730140850.7927-1-changbin.du@gmail.com



Cc: stable@vger.kernel.org
Fixes: 9cd2992f ("fgraph: Have set_graph_notrace only affect function_graph tracer")
Signed-off-by: default avatarChangbin Du <changbin.du@gmail.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent b1d45c23

kernel/trace/trace_functions_graph.c

+7 −10
Original line number Diff line number Diff line
@@ -137,6 +137,13 @@ int trace_graph_entry(struct ftrace_graph_ent *trace) 
	if (trace_recursion_test(TRACE_GRAPH_NOTRACE_BIT))

		return 0;



	/*

	 * Do not trace a function if it's filtered by set_graph_notrace.

	 * Make the index of ret stack negative to indicate that it should

	 * ignore further functions.  But it needs its own ret stack entry

	 * to recover the original index in order to continue tracing after

	 * returning from the function.

	 */

	if (ftrace_graph_notrace_addr(trace->func)) {

		trace_recursion_set(TRACE_GRAPH_NOTRACE_BIT);

		/*
@@ -155,16 +162,6 @@ int trace_graph_entry(struct ftrace_graph_ent *trace) 
	if (ftrace_graph_ignore_irqs())

		return 0;



	/*

	 * Do not trace a function if it's filtered by set_graph_notrace.

	 * Make the index of ret stack negative to indicate that it should

	 * ignore further functions.  But it needs its own ret stack entry

	 * to recover the original index in order to continue tracing after

	 * returning from the function.

	 */

	if (ftrace_graph_notrace_addr(trace->func))

		return 1;



	/*

	 * Stop here if tracing_threshold is set. We only write function return

	 * events to the ring buffer.

CRA Git | Maintained and supported by SUSTech CRA and CCSE