tracing/uprobes: Use trace_event_buffer_reserve() helper

To be consistent with kprobes and eprobes, use
trace_event_buffer_reserver() and trace_event_buffer_commit(). This will
ensure that any updates to trace events will also be implemented on uprobe
events.

Link: https://lkml.kernel.org/r/20211206162440.69fbf96c@gandalf.local.home
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index f5f0039..a4d5c62 100644 (file)
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -949,8 +949,7 @@ static void __uprobe_trace_func(struct trace_uprobe *tu,
                                struct trace_event_file *trace_file)
 {
        struct uprobe_trace_entry_head *entry;
-       struct trace_buffer *buffer;
-       struct ring_buffer_event *event;
+       struct trace_event_buffer fbuffer;
        void *data;
        int size, esize;
        struct trace_event_call *call = trace_probe_event_call(&tu->tp);
@@ -965,12 +964,10 @@ static void __uprobe_trace_func(struct trace_uprobe *tu,
 
        esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));
        size = esize + tu->tp.size + dsize;
-       event = trace_event_buffer_lock_reserve(&buffer, trace_file,
-                                               call->event.type, size, 0);
-       if (!event)
+       entry = trace_event_buffer_reserve(&fbuffer, trace_file, size);
+       if (!entry)
                return;
 
-       entry = ring_buffer_event_data(event);
        if (is_ret_probe(tu)) {
                entry->vaddr[0] = func;
                entry->vaddr[1] = instruction_pointer(regs);
@@ -982,7 +979,7 @@ static void __uprobe_trace_func(struct trace_uprobe *tu,
 
        memcpy(data, ucb->buf, tu->tp.size + dsize);
 
-       event_trigger_unlock_commit(trace_file, buffer, event, entry, 0);
+       trace_event_buffer_commit(&fbuffer);
 }
 
 /* uprobe handler */