trace_syscalls: Remove enter_id exit_id

[firefly-linux-kernel-4.4.55.git] / kernel / trace / trace_syscalls.c

diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 00d6e176f5b6b20012352412a33de13c9ec51e12..27eb18d69222a7d3dafbb25f8bfef07145c3a0f7 100644 (file)
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -51,7 +51,7 @@ static struct syscall_metadata *syscall_nr_to_meta(int nr)
        return syscalls_metadata[nr];
 }
 
-int syscall_name_to_nr(char *name)
+int syscall_name_to_nr(const char *name)
 {
        int i;
 
@@ -67,16 +67,6 @@ int syscall_name_to_nr(char *name)
        return -1;
 }
 
-void set_syscall_enter_id(int num, int id)
-{
-       syscalls_metadata[num]->enter_id = id;
-}
-
-void set_syscall_exit_id(int num, int id)
-{
-       syscalls_metadata[num]->exit_id = id;
-}
-
 enum print_line_t
 print_syscall_enter(struct trace_iterator *iter, int flags)
 {
@@ -93,7 +83,7 @@ print_syscall_enter(struct trace_iterator *iter, int flags)
        if (!entry)
                goto end;
 
-       if (entry->enter_id != ent->type) {
+       if (entry->enter_event->id != ent->type) {
                WARN_ON_ONCE(1);
                goto end;
        }
@@ -148,7 +138,7 @@ print_syscall_exit(struct trace_iterator *iter, int flags)
                return TRACE_TYPE_HANDLED;
        }
 
-       if (entry->exit_id != ent->type) {
+       if (entry->exit_event->id != ent->type) {
                WARN_ON_ONCE(1);
                return TRACE_TYPE_UNHANDLED;
        }
@@ -172,18 +162,11 @@ extern char *__bad_type_size(void);
 int syscall_enter_format(struct ftrace_event_call *call, struct trace_seq *s)
 {
        int i;
-       int nr;
        int ret;
-       struct syscall_metadata *entry;
+       struct syscall_metadata *entry = call->data;
        struct syscall_trace_enter trace;
        int offset = offsetof(struct syscall_trace_enter, args);
 
-       nr = syscall_name_to_nr(call->data);
-       entry = syscall_nr_to_meta(nr);
-
-       if (!entry)
-               return 0;
-
        ret = trace_seq_printf(s, "\tfield:%s %s;\toffset:%zu;\tsize:%zu;"
                               "\tsigned:%u;\n",
                               SYSCALL_FIELD(int, nr));
@@ -245,18 +228,11 @@ int syscall_exit_format(struct ftrace_event_call *call, struct trace_seq *s)
 int syscall_enter_define_fields(struct ftrace_event_call *call)
 {
        struct syscall_trace_enter trace;
-       struct syscall_metadata *meta;
+       struct syscall_metadata *meta = call->data;
        int ret;
-       int nr;
        int i;
        int offset = offsetof(typeof(trace), args);
 
-       nr = syscall_name_to_nr(call->data);
-       meta = syscall_nr_to_meta(nr);
-
-       if (!meta)
-               return 0;
-
        ret = trace_define_common_fields(call);
        if (ret)
                return ret;
@@ -316,8 +292,8 @@ void ftrace_syscall_enter(struct pt_regs *regs, long id)
 
        size = sizeof(*entry) + sizeof(unsigned long) * sys_data->nb_args;
 
-       event = trace_current_buffer_lock_reserve(&buffer, sys_data->enter_id,
-                                                 size, 0, 0);
+       event = trace_current_buffer_lock_reserve(&buffer,
+                       sys_data->enter_event->id, size, 0, 0);
        if (!event)
                return;
 
@@ -348,8 +324,8 @@ void ftrace_syscall_exit(struct pt_regs *regs, long ret)
        if (!sys_data)
                return;
 
-       event = trace_current_buffer_lock_reserve(&buffer, sys_data->exit_id,
-                               sizeof(*entry), 0, 0);
+       event = trace_current_buffer_lock_reserve(&buffer,
+                       sys_data->exit_event->id, sizeof(*entry), 0, 0);
        if (!event)
                return;
 
@@ -366,9 +342,9 @@ int reg_event_syscall_enter(struct ftrace_event_call *call)
 {
        int ret = 0;
        int num;
-       char *name;
+       const char *name;
 
-       name = (char *)call->data;
+       name = ((struct syscall_metadata *)call->data)->name;
        num = syscall_name_to_nr(name);
        if (num < 0 || num >= NR_syscalls)
                return -ENOSYS;
@@ -389,9 +365,9 @@ int reg_event_syscall_enter(struct ftrace_event_call *call)
 void unreg_event_syscall_enter(struct ftrace_event_call *call)
 {
        int num;
-       char *name;
+       const char *name;
 
-       name = (char *)call->data;
+       name = ((struct syscall_metadata *)call->data)->name;
        num = syscall_name_to_nr(name);
        if (num < 0 || num >= NR_syscalls)
                return;
@@ -407,9 +383,9 @@ int reg_event_syscall_exit(struct ftrace_event_call *call)
 {
        int ret = 0;
        int num;
-       char *name;
+       const char *name;
 
-       name = call->data;
+       name = ((struct syscall_metadata *)call->data)->name;
        num = syscall_name_to_nr(name);
        if (num < 0 || num >= NR_syscalls)
                return -ENOSYS;
@@ -430,9 +406,9 @@ int reg_event_syscall_exit(struct ftrace_event_call *call)
 void unreg_event_syscall_exit(struct ftrace_event_call *call)
 {
        int num;
-       char *name;
+       const char *name;
 
-       name = call->data;
+       name = ((struct syscall_metadata *)call->data)->name;
        num = syscall_name_to_nr(name);
        if (num < 0 || num >= NR_syscalls)
                return;
@@ -524,11 +500,11 @@ static void prof_syscall_enter(struct pt_regs *regs, long id)
 
        rec = (struct syscall_trace_enter *) raw_data;
        tracing_generic_entry_update(&rec->ent, 0, 0);
-       rec->ent.type = sys_data->enter_id;
+       rec->ent.type = sys_data->enter_event->id;
        rec->nr = syscall_nr;
        syscall_get_arguments(current, regs, 0, sys_data->nb_args,
                               (unsigned long *)&rec->args);
-       perf_tp_event(sys_data->enter_id, 0, 1, rec, size);
+       perf_tp_event(sys_data->enter_event->id, 0, 1, rec, size);
 
 end:
        perf_swevent_put_recursion_context(rctx);
@@ -629,11 +605,11 @@ static void prof_syscall_exit(struct pt_regs *regs, long ret)
        rec = (struct syscall_trace_exit *)raw_data;
 
        tracing_generic_entry_update(&rec->ent, 0, 0);
-       rec->ent.type = sys_data->exit_id;
+       rec->ent.type = sys_data->exit_event->id;
        rec->nr = syscall_nr;
        rec->ret = syscall_get_return_value(current, regs);
 
-       perf_tp_event(sys_data->exit_id, 0, 1, rec, size);
+       perf_tp_event(sys_data->exit_event->id, 0, 1, rec, size);
 
 end:
        perf_swevent_put_recursion_context(rctx);