mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:38:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fgragh: No need to invoke the function call_filter_check_discard()

Browse Source 
The function call_filter_check_discard() has been removed in the
commit 49e4154f4b16 ("tracing: Remove TRACE_EVENT_FL_FILTERED logic"),
from another topic branch. But when merged together with commit
21e92806d3 ("function_graph: Support recording and printing the
function return address") which added another call to
call_filter_check_discard(), it caused the build to fail. Since the
function call_filter_check_discard() is useless, it can simply be removed
regardless of being merged with commit 49e4154f4b16 or not.

Link: https://lore.kernel.org/all/20241010134649.43ed357c@canb.auug.org.au/

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Donglin Peng <dolinux.peng@gmail.com>
Link: https://lore.kernel.org/20241010194020.46192b21@gandalf.local.home
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 21e92806d3 ("function_graph: Support recording and printing the function return address")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt 2024-10-10 19:40:20 -04:00 committed by Steven Rostedt (Google)
parent 0a6c61bc9c
commit c73eb02a47
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/trace/trace_functions_graph.c
View File

@ -137,7 +137,6 @@ int __trace_graph_retaddr_entry(struct trace_array *tr,
unsigned int trace_ctx, unsigned int trace_ctx,
unsigned long retaddr) unsigned long retaddr)
{ {
struct trace_event_call *call = &event_fgraph_retaddr_entry;
struct ring_buffer_event *event; struct ring_buffer_event *event;
struct trace_buffer *buffer = tr->array_buffer.buffer; struct trace_buffer *buffer = tr->array_buffer.buffer;
struct fgraph_retaddr_ent_entry *entry; struct fgraph_retaddr_ent_entry *entry;
@ -150,7 +149,6 @@ int __trace_graph_retaddr_entry(struct trace_array *tr,
entry->graph_ent.func = trace->func; entry->graph_ent.func = trace->func;
entry->graph_ent.depth = trace->depth; entry->graph_ent.depth = trace->depth;
entry->graph_ent.retaddr = retaddr; entry->graph_ent.retaddr = retaddr;
if (!call_filter_check_discard(call, entry, buffer, event))
trace_buffer_unlock_commit_nostack(buffer, event); trace_buffer_unlock_commit_nostack(buffer, event);
return 1; return 1;