Merge tag 'trace-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[sfrench/cifs-2.6.git] / kernel / trace / trace_syscalls.c

diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 934b0da72679e0c602d226eeba6ba10e8b94e1b7..f93a56d2db275be64df083344b68ec65f3c32473 100644 (file)
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <trace/syscall.h>
 #include <trace/events/syscalls.h>
 #include <linux/syscalls.h>
@@ -559,9 +560,10 @@ static DECLARE_BITMAP(enabled_perf_exit_syscalls, NR_syscalls);
 static int sys_perf_refcount_enter;
 static int sys_perf_refcount_exit;
 
-static int perf_call_bpf_enter(struct bpf_prog *prog, struct pt_regs *regs,
-                             struct syscall_metadata *sys_data,
-                             struct syscall_trace_enter *rec) {
+static int perf_call_bpf_enter(struct trace_event_call *call, struct pt_regs *regs,
+                              struct syscall_metadata *sys_data,
+                              struct syscall_trace_enter *rec)
+{
        struct syscall_tp_t {
                unsigned long long regs;
                unsigned long syscall_nr;
@@ -573,7 +575,7 @@ static int perf_call_bpf_enter(struct bpf_prog *prog, struct pt_regs *regs,
        param.syscall_nr = rec->nr;
        for (i = 0; i < sys_data->nb_args; i++)
                param.args[i] = rec->args[i];
-       return trace_call_bpf(prog, &param);
+       return trace_call_bpf(call, &param);
 }
 
 static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id)
@@ -581,7 +583,7 @@ static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id)
        struct syscall_metadata *sys_data;
        struct syscall_trace_enter *rec;
        struct hlist_head *head;
-       struct bpf_prog *prog;
+       bool valid_prog_array;
        int syscall_nr;
        int rctx;
        int size;
@@ -596,9 +598,9 @@ static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id)
        if (!sys_data)
                return;
 
-       prog = READ_ONCE(sys_data->enter_event->prog);
        head = this_cpu_ptr(sys_data->enter_event->perf_events);
-       if (!prog && hlist_empty(head))
+       valid_prog_array = bpf_prog_array_valid(sys_data->enter_event);
+       if (!valid_prog_array && hlist_empty(head))
                return;
 
        /* get the size after alignment with the u32 buffer size field */
@@ -614,7 +616,8 @@ static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id)
        syscall_get_arguments(current, regs, 0, sys_data->nb_args,
                               (unsigned long *)&rec->args);
 
-       if ((prog && !perf_call_bpf_enter(prog, regs, sys_data, rec)) ||
+       if ((valid_prog_array &&
+            !perf_call_bpf_enter(sys_data->enter_event, regs, sys_data, rec)) ||
            hlist_empty(head)) {
                perf_swevent_put_recursion_context(rctx);
                return;
@@ -659,8 +662,9 @@ static void perf_sysenter_disable(struct trace_event_call *call)
        mutex_unlock(&syscall_trace_lock);
 }
 
-static int perf_call_bpf_exit(struct bpf_prog *prog, struct pt_regs *regs,
-                             struct syscall_trace_exit *rec) {
+static int perf_call_bpf_exit(struct trace_event_call *call, struct pt_regs *regs,
+                             struct syscall_trace_exit *rec)
+{
        struct syscall_tp_t {
                unsigned long long regs;
                unsigned long syscall_nr;
@@ -670,7 +674,7 @@ static int perf_call_bpf_exit(struct bpf_prog *prog, struct pt_regs *regs,
        *(struct pt_regs **)&param = regs;
        param.syscall_nr = rec->nr;
        param.ret = rec->ret;
-       return trace_call_bpf(prog, &param);
+       return trace_call_bpf(call, &param);
 }
 
 static void perf_syscall_exit(void *ignore, struct pt_regs *regs, long ret)
@@ -678,7 +682,7 @@ static void perf_syscall_exit(void *ignore, struct pt_regs *regs, long ret)
        struct syscall_metadata *sys_data;
        struct syscall_trace_exit *rec;
        struct hlist_head *head;
-       struct bpf_prog *prog;
+       bool valid_prog_array;
        int syscall_nr;
        int rctx;
        int size;
@@ -693,9 +697,9 @@ static void perf_syscall_exit(void *ignore, struct pt_regs *regs, long ret)
        if (!sys_data)
                return;
 
-       prog = READ_ONCE(sys_data->exit_event->prog);
        head = this_cpu_ptr(sys_data->exit_event->perf_events);
-       if (!prog && hlist_empty(head))
+       valid_prog_array = bpf_prog_array_valid(sys_data->exit_event);
+       if (!valid_prog_array && hlist_empty(head))
                return;
 
        /* We can probably do that at build time */
@@ -709,7 +713,8 @@ static void perf_syscall_exit(void *ignore, struct pt_regs *regs, long ret)
        rec->nr = syscall_nr;
        rec->ret = syscall_get_return_value(current, regs);
 
-       if ((prog && !perf_call_bpf_exit(prog, regs, rec)) ||
+       if ((valid_prog_array &&
+            !perf_call_bpf_exit(sys_data->exit_event, regs, rec)) ||
            hlist_empty(head)) {
                perf_swevent_put_recursion_context(rctx);
                return;