trace_syscalls: add syscall_nr field to struct syscall_metadata
PATCH 4/7 trace_syscalls: add syscall_nr field to struct syscall_metadata
Add syscall_nr field to struct syscall_metadata,
it helps us to get syscall number easier.
Signed-off-by Lai Jiangshan <[email protected]>
---
include/linux/syscalls.h +2 -2
@@ -161,7 +161,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ static int init_enter_##sname(struct ftrace_event_call *call) \ { \ int num, id; \ - num = syscall_name_to_nr("sys"#sname); \ + num = __syscall_meta_##sname.syscall_nr; \ if (num < 0) \ return -ENOSYS; \ id = register_ftrace_event(&enter_syscall_print_##sname);\
@@ -197,7 +197,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ static int init_exit_##sname(struct ftrace_event_call *call) \ { \ int num, id; \ - num = syscall_name_to_nr("sys"#sname); \ + num = __syscall_meta_##sname.syscall_nr; \ if (num < 0) \ return -ENOSYS; \ id = register_ftrace_event(&exit_syscall_print_##sname);\
include/trace/syscall.h +2 -1
@@ -12,6 +12,7 @@* A syscall entry in the ftrace syscalls array. * * @name: name of the syscall +* @syscall_nr: number of the syscall * @nb_args: number of parameters it takes * @types: list of types as strings * @args: list of args as strings (args[i] matches types[i])
@@ -20,6 +21,7 @@*/ struct syscall_metadata {const char *name; +int syscall_nr;int nb_args;const char **types;const char **args;
@@ -30,7 +32,6 @@ struct syscall_metadata {#ifdef CONFIG_FTRACE_SYSCALLS extern unsigned long arch_syscall_addr (int nr); -extern int syscall_name_to_nr (const char *name);extern int syscall_enter_format (struct ftrace_event_call *call,struct trace_seq *s);
kernel/trace/trace_syscalls.c +9 -13
@@ -51,7 +51,7 @@ static struct syscall_metadata *syscall_nr_to_meta(int nr)return syscalls_metadata[nr]; } -int syscall_name_to_nr (const char *name) +static int syscall_name_to_nr (const char *name) {int i;
@@ -342,10 +342,8 @@ int reg_event_syscall_enter(struct ftrace_event_call *call) {int ret =0 ;int num; -const char *name; - name = ((struct syscall_metadata *)call->data)->name; - num =syscall_name_to_nr (name); + num = ((struct syscall_metadata *)call->data)->syscall_nr;if (num <0 || num >= NR_syscalls)return -ENOSYS ;mutex_lock (&syscall_trace_lock);
@@ -365,10 +363,8 @@ int reg_event_syscall_enter(struct ftrace_event_call *call)void unreg_event_syscall_enter (struct ftrace_event_call *call) {int num; -const char *name; - name = ((struct syscall_metadata *)call->data)->name; - num =syscall_name_to_nr (name); + num = ((struct syscall_metadata *)call->data)->syscall_nr;if (num <0 || num >= NR_syscalls)return ;mutex_lock (&syscall_trace_lock);
@@ -383,10 +379,8 @@ int reg_event_syscall_exit(struct ftrace_event_call *call) {int ret =0 ;int num; -const char *name; - name = ((struct syscall_metadata *)call->data)->name; - num =syscall_name_to_nr (name); + num = ((struct syscall_metadata *)call->data)->syscall_nr;if (num <0 || num >= NR_syscalls)return -ENOSYS ;mutex_lock (&syscall_trace_lock);
@@ -406,10 +400,8 @@ int reg_event_syscall_exit(struct ftrace_event_call *call)void unreg_event_syscall_exit (struct ftrace_event_call *call) {int num; -const char *name; - name = ((struct syscall_metadata *)call->data)->name; - num =syscall_name_to_nr (name); + num = ((struct syscall_metadata *)call->data)->syscall_nr;if (num <0 || num >= NR_syscalls)return ;mutex_lock (&syscall_trace_lock);
@@ -436,6 +428,10 @@ int __init init_ftrace_syscalls(void)for (i =0 ; i < NR_syscalls; i++) { addr =arch_syscall_addr (i); meta =find_syscall_meta (addr); +if (!meta) +continue ; + + meta->syscall_nr = i; syscalls_metadata[i] = meta; }
[tip:perf/core] trace_syscalls: Add syscall_nr field to struct syscall_metadata
Commit-ID: c252f65793874b56d50395ab604db465ce688665 Gitweb: http://git.kernel.org/tip/c252f65793874b56d50395ab604db465ce688665 Author: Lai Jiangshan <[email protected]> AuthorDate: Tue, 1 Dec 2009 16:23:47 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 1 Dec 2009 17:33:29 +0100
trace_syscalls: Add syscall_nr field to struct syscall_metadata
Add syscall_nr field to struct syscall_metadata, it helps us to get syscall number easier.
Signed-off-by Lai Jiangshan <[email protected]>
Acked-by Jason Baron <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Frederic Weisbecker <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- include/linux/syscalls.h | 4 ++-- include/trace/syscall.h | 3 ++- kernel/trace/trace_syscalls.c | 22 +++++++++------------- 3 files changed, 13 insertions(+), 16 deletions(-)
include/linux/syscalls.h +2 -2
@@ -161,7 +161,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ static int init_enter_##sname(struct ftrace_event_call *call) \ { \ int num, id; \ - num = syscall_name_to_nr("sys"#sname); \ + num = __syscall_meta_##sname.syscall_nr; \ if (num < 0) \ return -ENOSYS; \ id = register_ftrace_event(&enter_syscall_print_##sname);\
@@ -197,7 +197,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ static int init_exit_##sname(struct ftrace_event_call *call) \ { \ int num, id; \ - num = syscall_name_to_nr("sys"#sname); \ + num = __syscall_meta_##sname.syscall_nr; \ if (num < 0) \ return -ENOSYS; \ id = register_ftrace_event(&exit_syscall_print_##sname);\
include/trace/syscall.h +2 -1
@@ -12,6 +12,7 @@* A syscall entry in the ftrace syscalls array. * * @name: name of the syscall +* @syscall_nr: number of the syscall * @nb_args: number of parameters it takes * @types: list of types as strings * @args: list of args as strings (args[i] matches types[i])
@@ -20,6 +21,7 @@*/ struct syscall_metadata {const char *name; +int syscall_nr;int nb_args;const char **types;const char **args;
@@ -30,7 +32,6 @@ struct syscall_metadata {#ifdef CONFIG_FTRACE_SYSCALLS extern unsigned long arch_syscall_addr (int nr); -extern int syscall_name_to_nr (const char *name);extern int syscall_enter_format (struct ftrace_event_call *call,struct trace_seq *s);
kernel/trace/trace_syscalls.c +9 -13
@@ -51,7 +51,7 @@ static struct syscall_metadata *syscall_nr_to_meta(int nr)return syscalls_metadata[nr]; } -int syscall_name_to_nr (const char *name) +static int syscall_name_to_nr (const char *name) {int i;
@@ -342,10 +342,8 @@ int reg_event_syscall_enter(struct ftrace_event_call *call) {int ret =0 ;int num; -const char *name; - name = ((struct syscall_metadata *)call->data)->name; - num =syscall_name_to_nr (name); + num = ((struct syscall_metadata *)call->data)->syscall_nr;if (num <0 || num >= NR_syscalls)return -ENOSYS ;mutex_lock (&syscall_trace_lock);
@@ -365,10 +363,8 @@ int reg_event_syscall_enter(struct ftrace_event_call *call)void unreg_event_syscall_enter (struct ftrace_event_call *call) {int num; -const char *name; - name = ((struct syscall_metadata *)call->data)->name; - num =syscall_name_to_nr (name); + num = ((struct syscall_metadata *)call->data)->syscall_nr;if (num <0 || num >= NR_syscalls)return ;mutex_lock (&syscall_trace_lock);
@@ -383,10 +379,8 @@ int reg_event_syscall_exit(struct ftrace_event_call *call) {int ret =0 ;int num; -const char *name; - name = ((struct syscall_metadata *)call->data)->name; - num =syscall_name_to_nr (name); + num = ((struct syscall_metadata *)call->data)->syscall_nr;if (num <0 || num >= NR_syscalls)return -ENOSYS ;mutex_lock (&syscall_trace_lock);
@@ -406,10 +400,8 @@ int reg_event_syscall_exit(struct ftrace_event_call *call)void unreg_event_syscall_exit (struct ftrace_event_call *call) {int num; -const char *name; - name = ((struct syscall_metadata *)call->data)->name; - num =syscall_name_to_nr (name); + num = ((struct syscall_metadata *)call->data)->syscall_nr;if (num <0 || num >= NR_syscalls)return ;mutex_lock (&syscall_trace_lock);
@@ -436,6 +428,10 @@ int __init init_ftrace_syscalls(void)for (i =0 ; i < NR_syscalls; i++) { addr =arch_syscall_addr (i); meta =find_syscall_meta (addr); +if (!meta) +continue ; + + meta->syscall_nr = i; syscalls_metadata[i] = meta; }