trace_syscalls: simplify syscall profile
PATCH 6/7 trace_syscalls: simplify syscall profile
use only one prof_sysenter_enable() instead of
prof_sysenter_enable_##sname()
use only one prof_sysenter_disable() instead of
prof_sysenter_disable_##sname()
use only one prof_sysexit_enable() instead of
prof_sysexit_enable_##sname()
use only one prof_sysexit_disable() instead of
prof_sysexit_disable_##sname()
---
include/linux/syscalls.h +4 -27
@@ -99,37 +99,16 @@ struct perf_event_attr;#define __SC_TEST6 (t6, a6, ...) __SC_TEST(t6); __SC_TEST5(__VA_ARGS__)#ifdef CONFIG_EVENT_PROFILE -#define TRACE_SYS_ENTER_PROFILE (sname) \ -static int prof_sysenter_enable_##sname(struct ftrace_event_call *unused) \ -{ \ - return reg_prof_syscall_enter("sys"#sname); \ -} \ - \ -static void prof_sysenter_disable_##sname(struct ftrace_event_call *unused) \ -{ \ - unreg_prof_syscall_enter("sys"#sname); \ -} - -#define TRACE_SYS_EXIT_PROFILE (sname) \ -static int prof_sysexit_enable_##sname(struct ftrace_event_call *unused) \ -{ \ - return reg_prof_syscall_exit("sys"#sname); \ -} \ - \ -static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ -{ \ - unreg_prof_syscall_exit("sys"#sname); \ -}#define TRACE_SYS_ENTER_PROFILE_INIT (sname) \ .profile_count = ATOMIC_INIT(-1), \ - .profile_enable = prof_sysenter_enable_##sname, \ - .profile_disable = prof_sysenter_disable_##sname, + .profile_enable = prof_sysenter_enable, \ + .profile_disable = prof_sysenter_disable,#define TRACE_SYS_EXIT_PROFILE_INIT (sname) \ .profile_count = ATOMIC_INIT(-1), \ - .profile_enable = prof_sysexit_enable_##sname, \ - .profile_disable = prof_sysexit_disable_##sname, + .profile_enable = prof_sysexit_enable, \ + .profile_disable = prof_sysexit_disable,#else #define TRACE_SYS_ENTER_PROFILE (sname)#define TRACE_SYS_ENTER_PROFILE_INIT (sname)
@@ -158,7 +137,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ struct trace_event enter_syscall_print_##sname = { \ .trace = print_syscall_enter, \ }; \ - TRACE_SYS_ENTER_PROFILE(sname); \ static struct ftrace_event_call __used \ __attribute__((__aligned__(4))) \ __attribute__((section("_ftrace_events"))) \
@@ -181,7 +159,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ struct trace_event exit_syscall_print_##sname = { \ .trace = print_syscall_exit, \ }; \ - TRACE_SYS_EXIT_PROFILE(sname); \ static struct ftrace_event_call __used \ __attribute__((__aligned__(4))) \ __attribute__((section("_ftrace_events"))) \
include/trace/syscall.h +4 -4
@@ -50,10 +50,10 @@ enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags);enum print_line_t print_syscall_exit (struct trace_iterator *iter,int flags);#endif #ifdef CONFIG_EVENT_PROFILE -int reg_prof_syscall_enter (char *name); -void unreg_prof_syscall_enter (char *name); -int reg_prof_syscall_exit (char *name); -void unreg_prof_syscall_exit (char *name); +int prof_sysenter_enable (struct ftrace_event_call *call); +void prof_sysenter_disable (struct ftrace_event_call *call); +int prof_sysexit_enable (struct ftrace_event_call *call); +void prof_sysexit_disable (struct ftrace_event_call *call);#endif
kernel/trace/trace_syscalls.c +8 -16
@@ -520,14 +520,12 @@ end_recursion:local_irq_restore (flags); } -int reg_prof_syscall_enter (char *name) +int prof_sysenter_enable (struct ftrace_event_call *call) {int ret =0 ;int num; - num =syscall_name_to_nr (name); -if (num <0 || num >= NR_syscalls) -return -ENOSYS ; + num = ((struct syscall_metadata *)call->data)->syscall_nr;mutex_lock (&syscall_trace_lock);if (!sys_prof_refcount_enter)
@@ -543,13 +541,11 @@ int reg_prof_syscall_enter(char *name)return ret; } -void unreg_prof_syscall_enter (char *name) +void prof_sysenter_disable (struct ftrace_event_call *call) {int num; - num =syscall_name_to_nr (name); -if (num <0 || num >= NR_syscalls) -return ; + num = ((struct syscall_metadata *)call->data)->syscall_nr;mutex_lock (&syscall_trace_lock); sys_prof_refcount_enter--;
@@ -625,14 +621,12 @@ end_recursion:local_irq_restore (flags); } -int reg_prof_syscall_exit (char *name) +int prof_sysexit_enable (struct ftrace_event_call *call) {int ret =0 ;int num; - num =syscall_name_to_nr (name); -if (num <0 || num >= NR_syscalls) -return -ENOSYS ; + num = ((struct syscall_metadata *)call->data)->syscall_nr;mutex_lock (&syscall_trace_lock);if (!sys_prof_refcount_exit)
@@ -648,13 +642,11 @@ int reg_prof_syscall_exit(char *name)return ret; } -void unreg_prof_syscall_exit (char *name) +void prof_sysexit_disable (struct ftrace_event_call *call) {int num; - num =syscall_name_to_nr (name); -if (num <0 || num >= NR_syscalls) -return ; + num = ((struct syscall_metadata *)call->data)->syscall_nr;mutex_lock (&syscall_trace_lock); sys_prof_refcount_exit--;
[tip:perf/core] trace_syscalls: Simplify syscall profile
Commit-ID: 3bbe84e9d385205d638035ee9dcc4db1b486ea08 Gitweb: http://git.kernel.org/tip/3bbe84e9d385205d638035ee9dcc4db1b486ea08 Author: Lai Jiangshan <[email protected]> AuthorDate: Tue, 1 Dec 2009 16:24:01 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 1 Dec 2009 17:33:30 +0100
trace_syscalls: Simplify syscall profile
use only one prof_sysenter_enable() instead of prof_sysenter_enable_##sname()
use only one prof_sysenter_disable() instead of prof_sysenter_disable_##sname()
use only one prof_sysexit_enable() instead of prof_sysexit_enable_##sname()
use only one prof_sysexit_disable() instead of prof_sysexit_disable_##sname()
LKML-Reference: <[email protected]>
--- include/linux/syscalls.h | 31 ++++--------------------------- include/trace/syscall.h | 8 ++++---- kernel/trace/trace_syscalls.c | 24 ++++++++---------------- 3 files changed, 16 insertions(+), 47 deletions(-)
include/linux/syscalls.h +4 -27
@@ -99,37 +99,16 @@ struct perf_event_attr;#define __SC_TEST6 (t6, a6, ...) __SC_TEST(t6); __SC_TEST5(__VA_ARGS__)#ifdef CONFIG_EVENT_PROFILE -#define TRACE_SYS_ENTER_PROFILE (sname) \ -static int prof_sysenter_enable_##sname(struct ftrace_event_call *unused) \ -{ \ - return reg_prof_syscall_enter("sys"#sname); \ -} \ - \ -static void prof_sysenter_disable_##sname(struct ftrace_event_call *unused) \ -{ \ - unreg_prof_syscall_enter("sys"#sname); \ -} - -#define TRACE_SYS_EXIT_PROFILE (sname) \ -static int prof_sysexit_enable_##sname(struct ftrace_event_call *unused) \ -{ \ - return reg_prof_syscall_exit("sys"#sname); \ -} \ - \ -static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ -{ \ - unreg_prof_syscall_exit("sys"#sname); \ -}#define TRACE_SYS_ENTER_PROFILE_INIT (sname) \ .profile_count = ATOMIC_INIT(-1), \ - .profile_enable = prof_sysenter_enable_##sname, \ - .profile_disable = prof_sysenter_disable_##sname, + .profile_enable = prof_sysenter_enable, \ + .profile_disable = prof_sysenter_disable,#define TRACE_SYS_EXIT_PROFILE_INIT (sname) \ .profile_count = ATOMIC_INIT(-1), \ - .profile_enable = prof_sysexit_enable_##sname, \ - .profile_disable = prof_sysexit_disable_##sname, + .profile_enable = prof_sysexit_enable, \ + .profile_disable = prof_sysexit_disable,#else #define TRACE_SYS_ENTER_PROFILE (sname)#define TRACE_SYS_ENTER_PROFILE_INIT (sname)
@@ -158,7 +137,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ struct trace_event enter_syscall_print_##sname = { \ .trace = print_syscall_enter, \ }; \ - TRACE_SYS_ENTER_PROFILE(sname); \ static struct ftrace_event_call __used \ __attribute__((__aligned__(4))) \ __attribute__((section("_ftrace_events"))) \
@@ -181,7 +159,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ struct trace_event exit_syscall_print_##sname = { \ .trace = print_syscall_exit, \ }; \ - TRACE_SYS_EXIT_PROFILE(sname); \ static struct ftrace_event_call __used \ __attribute__((__aligned__(4))) \ __attribute__((section("_ftrace_events"))) \
include/trace/syscall.h +4 -4
@@ -50,10 +50,10 @@ enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags);enum print_line_t print_syscall_exit (struct trace_iterator *iter,int flags);#endif #ifdef CONFIG_EVENT_PROFILE -int reg_prof_syscall_enter (char *name); -void unreg_prof_syscall_enter (char *name); -int reg_prof_syscall_exit (char *name); -void unreg_prof_syscall_exit (char *name); +int prof_sysenter_enable (struct ftrace_event_call *call); +void prof_sysenter_disable (struct ftrace_event_call *call); +int prof_sysexit_enable (struct ftrace_event_call *call); +void prof_sysexit_disable (struct ftrace_event_call *call);#endif
kernel/trace/trace_syscalls.c +8 -16
@@ -520,14 +520,12 @@ end_recursion:local_irq_restore (flags); } -int reg_prof_syscall_enter (char *name) +int prof_sysenter_enable (struct ftrace_event_call *call) {int ret =0 ;int num; - num =syscall_name_to_nr (name); -if (num <0 || num >= NR_syscalls) -return -ENOSYS ; + num = ((struct syscall_metadata *)call->data)->syscall_nr;mutex_lock (&syscall_trace_lock);if (!sys_prof_refcount_enter)
@@ -543,13 +541,11 @@ int reg_prof_syscall_enter(char *name)return ret; } -void unreg_prof_syscall_enter (char *name) +void prof_sysenter_disable (struct ftrace_event_call *call) {int num; - num =syscall_name_to_nr (name); -if (num <0 || num >= NR_syscalls) -return ; + num = ((struct syscall_metadata *)call->data)->syscall_nr;mutex_lock (&syscall_trace_lock); sys_prof_refcount_enter--;
@@ -625,14 +621,12 @@ end_recursion:local_irq_restore (flags); } -int reg_prof_syscall_exit (char *name) +int prof_sysexit_enable (struct ftrace_event_call *call) {int ret =0 ;int num; - num =syscall_name_to_nr (name); -if (num <0 || num >= NR_syscalls) -return -ENOSYS ; + num = ((struct syscall_metadata *)call->data)->syscall_nr;mutex_lock (&syscall_trace_lock);if (!sys_prof_refcount_exit)
@@ -648,13 +642,11 @@ int reg_prof_syscall_exit(char *name)return ret; } -void unreg_prof_syscall_exit (char *name) +void prof_sysexit_disable (struct ftrace_event_call *call) {int num; - num =syscall_name_to_nr (name); -if (num <0 || num >= NR_syscalls) -return ; + num = ((struct syscall_metadata *)call->data)->syscall_nr;mutex_lock (&syscall_trace_lock); sys_prof_refcount_exit--;
Re: [tip:perf/core] trace_syscalls: Simplify syscall profile
kernel/trace/trace_syscalls.c end_recursion: · line 528
Quoted 10 lines · tip-bot for Lai Jiangshan
kernel/trace/trace_syscalls.c +2
-4-int reg_prof_syscall_enter (char *name) +int prof_sysenter_enable (struct ftrace_event_call *call) {int ret =0 ;int num; - num =syscall_name_to_nr (name); -if (num <0 || num >= NR_syscalls) -return -ENOSYS ; + num = ((struct syscall_metadata *)call->data)->syscall_nr;
Now that you use the above construct very often. Could you please wrap it using a quick helper?
This will be more proper than having this explicit scary cast everywhere :)
Thanks.
Quoted 52 lines
kernel/trace/trace_syscalls.c +6
-12mutex_lock (&syscall_trace_lock);if (!sys_prof_refcount_enter)@@ -543,13 +541,11 @@ int reg_prof_syscall_enter(char *name)return ret; } -void unreg_prof_syscall_enter (char *name) +void prof_sysenter_disable (struct ftrace_event_call *call) {int num; - num =syscall_name_to_nr (name); -if (num <0 || num >= NR_syscalls) -return ; + num = ((struct syscall_metadata *)call->data)->syscall_nr;mutex_lock (&syscall_trace_lock); sys_prof_refcount_enter--;@@ -625,14 +621,12 @@ end_recursion:local_irq_restore (flags); } -int reg_prof_syscall_exit (char *name) +int prof_sysexit_enable (struct ftrace_event_call *call) {int ret =0 ;int num; - num =syscall_name_to_nr (name); -if (num <0 || num >= NR_syscalls) -return -ENOSYS ; + num = ((struct syscall_metadata *)call->data)->syscall_nr;mutex_lock (&syscall_trace_lock);if (!sys_prof_refcount_exit)@@ -648,13 +642,11 @@ int reg_prof_syscall_exit(char *name)return ret; } -void unreg_prof_syscall_exit (char *name) +void prof_sysexit_disable (struct ftrace_event_call *call) {int num; - num =syscall_name_to_nr (name); -if (num <0 || num >= NR_syscalls) -return ; + num = ((struct syscall_metadata *)call->data)->syscall_nr;mutex_lock (&syscall_trace_lock); sys_prof_refcount_exit--;