tracing: Have syscall trace events use trace_event_buffer_lock_reserve()

commit 3e2a56e6f639492311e0a8533f0a7aed60816308 upstream.

Currently, the syscall trace events call trace_buffer_lock_reserve()
directly, which means that it misses out on some of the filtering
optimizations provided by the helper function
trace_event_buffer_lock_reserve(). Have the syscall trace events call that
instead, as it was missed when adding the update to use the temp buffer
when filtering.

Link: https://lkml.kernel.org/r/20220107225839.823118570@goodmis.org
Cc: stable@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Tom Zanussi <zanussi@kernel.org>
Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>
Fixes: 0fc1b09ff1ff4 ("tracing: Use temp buffer when filtering events")
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 8bfcd3b0942262abc34134459234b975190edc01..f755bde42fd07c1be41445f02b895a4e4828cf88 100644 (file)
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -323,8 +323,7 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id)
 
        trace_ctx = tracing_gen_ctx();
 
-       buffer = tr->array_buffer.buffer;
-       event = trace_buffer_lock_reserve(buffer,
+       event = trace_event_buffer_lock_reserve(&buffer, trace_file,
                        sys_data->enter_event->event.type, size, trace_ctx);
        if (!event)
                return;
@@ -367,8 +366,7 @@ static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret)
 
        trace_ctx = tracing_gen_ctx();
 
-       buffer = tr->array_buffer.buffer;
-       event = trace_buffer_lock_reserve(buffer,
+       event = trace_event_buffer_lock_reserve(&buffer, trace_file,
                        sys_data->exit_event->event.type, sizeof(*entry),
                        trace_ctx);
        if (!event)