* [PATCH 1/7] trace_syscalls: remove unused event_syscall_enter and event_syscall_exit
@ 2009-12-01 8:23 Lai Jiangshan
2009-12-01 16:42 ` [tip:perf/core] trace_syscalls: Remove " tip-bot for Lai Jiangshan
0 siblings, 1 reply; 6+ messages in thread
From: Lai Jiangshan @ 2009-12-01 8:23 UTC (permalink / raw)
To: Steven Rostedt, Ingo Molnar, Jason Baron, Frederic Weisbecker, LKML
fix event_enter_##sname->event
fix event_exit_##sname->event
remove unused event_syscall_enter and event_syscall_exit
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index b50974a..2f7c539 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -178,7 +178,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \
event_enter_##sname = { \
.name = "sys_enter"#sname, \
.system = "syscalls", \
- .event = &event_syscall_enter, \
+ .event = &enter_syscall_print_##sname, \
.raw_init = init_enter_##sname, \
.show_format = syscall_enter_format, \
.define_fields = syscall_enter_define_fields, \
@@ -214,7 +214,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \
event_exit_##sname = { \
.name = "sys_exit"#sname, \
.system = "syscalls", \
- .event = &event_syscall_exit, \
+ .event = &exit_syscall_print_##sname, \
.raw_init = init_exit_##sname, \
.show_format = syscall_exit_format, \
.define_fields = syscall_exit_define_fields, \
diff --git a/include/trace/syscall.h b/include/trace/syscall.h
index 51ee17d..5f8827c 100644
--- a/include/trace/syscall.h
+++ b/include/trace/syscall.h
@@ -37,8 +37,6 @@ extern unsigned long arch_syscall_addr(int nr);
extern int syscall_name_to_nr(char *name);
void set_syscall_enter_id(int num, int id);
void set_syscall_exit_id(int num, int id);
-extern struct trace_event event_syscall_enter;
-extern struct trace_event event_syscall_exit;
extern int syscall_enter_format(struct ftrace_event_call *call,
struct trace_seq *s);
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 63aa807..00d6e17 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -444,14 +444,6 @@ void unreg_event_syscall_exit(struct ftrace_event_call *call)
mutex_unlock(&syscall_trace_lock);
}
-struct trace_event event_syscall_enter = {
- .trace = print_syscall_enter,
-};
-
-struct trace_event event_syscall_exit = {
- .trace = print_syscall_exit,
-};
-
int __init init_ftrace_syscalls(void)
{
struct syscall_metadata *meta;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [tip:perf/core] trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit
2009-12-01 8:23 [PATCH 1/7] trace_syscalls: remove unused event_syscall_enter and event_syscall_exit Lai Jiangshan
@ 2009-12-01 16:42 ` tip-bot for Lai Jiangshan
2009-12-01 17:40 ` Frederic Weisbecker
2009-12-01 17:54 ` Frederic Weisbecker
0 siblings, 2 replies; 6+ messages in thread
From: tip-bot for Lai Jiangshan @ 2009-12-01 16:42 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, fweisbec, rostedt, tglx, jbaron, laijs, mingo
Commit-ID: bf56a4ea9f1683c5b223fd3a5dbea23f1fa91c34
Gitweb: http://git.kernel.org/tip/bf56a4ea9f1683c5b223fd3a5dbea23f1fa91c34
Author: Lai Jiangshan <laijs@cn.fujitsu.com>
AuthorDate: Tue, 1 Dec 2009 16:23:20 +0800
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 1 Dec 2009 17:33:28 +0100
trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit
fix event_enter_##sname->event
fix event_exit_##sname->event
remove unused event_syscall_enter and event_syscall_exit
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: Jason Baron <jbaron@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <4B14D278.4090209@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
include/linux/syscalls.h | 4 ++--
include/trace/syscall.h | 2 --
kernel/trace/trace_syscalls.c | 8 --------
3 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index b50974a..2f7c539 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -178,7 +178,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \
event_enter_##sname = { \
.name = "sys_enter"#sname, \
.system = "syscalls", \
- .event = &event_syscall_enter, \
+ .event = &enter_syscall_print_##sname, \
.raw_init = init_enter_##sname, \
.show_format = syscall_enter_format, \
.define_fields = syscall_enter_define_fields, \
@@ -214,7 +214,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \
event_exit_##sname = { \
.name = "sys_exit"#sname, \
.system = "syscalls", \
- .event = &event_syscall_exit, \
+ .event = &exit_syscall_print_##sname, \
.raw_init = init_exit_##sname, \
.show_format = syscall_exit_format, \
.define_fields = syscall_exit_define_fields, \
diff --git a/include/trace/syscall.h b/include/trace/syscall.h
index 51ee17d..5f8827c 100644
--- a/include/trace/syscall.h
+++ b/include/trace/syscall.h
@@ -37,8 +37,6 @@ extern unsigned long arch_syscall_addr(int nr);
extern int syscall_name_to_nr(char *name);
void set_syscall_enter_id(int num, int id);
void set_syscall_exit_id(int num, int id);
-extern struct trace_event event_syscall_enter;
-extern struct trace_event event_syscall_exit;
extern int syscall_enter_format(struct ftrace_event_call *call,
struct trace_seq *s);
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 63aa807..00d6e17 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -444,14 +444,6 @@ void unreg_event_syscall_exit(struct ftrace_event_call *call)
mutex_unlock(&syscall_trace_lock);
}
-struct trace_event event_syscall_enter = {
- .trace = print_syscall_enter,
-};
-
-struct trace_event event_syscall_exit = {
- .trace = print_syscall_exit,
-};
-
int __init init_ftrace_syscalls(void)
{
struct syscall_metadata *meta;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [tip:perf/core] trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit
2009-12-01 16:42 ` [tip:perf/core] trace_syscalls: Remove " tip-bot for Lai Jiangshan
@ 2009-12-01 17:40 ` Frederic Weisbecker
2009-12-01 17:54 ` Frederic Weisbecker
1 sibling, 0 replies; 6+ messages in thread
From: Frederic Weisbecker @ 2009-12-01 17:40 UTC (permalink / raw)
To: mingo, hpa, linux-kernel, rostedt, jbaron, tglx, laijs, mingo
Cc: linux-tip-commits
On Tue, Dec 01, 2009 at 04:42:35PM +0000, tip-bot for Lai Jiangshan wrote:
> Commit-ID: bf56a4ea9f1683c5b223fd3a5dbea23f1fa91c34
> Gitweb: http://git.kernel.org/tip/bf56a4ea9f1683c5b223fd3a5dbea23f1fa91c34
> Author: Lai Jiangshan <laijs@cn.fujitsu.com>
> AuthorDate: Tue, 1 Dec 2009 16:23:20 +0800
> Committer: Ingo Molnar <mingo@elte.hu>
> CommitDate: Tue, 1 Dec 2009 17:33:28 +0100
>
> trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit
>
> fix event_enter_##sname->event
> fix event_exit_##sname->event
>
> remove unused event_syscall_enter and event_syscall_exit
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
> Acked-by: Jason Baron <jbaron@redhat.com>
> Cc: Steven Rostedt <rostedt@goodmis.org>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> LKML-Reference: <4B14D278.4090209@cn.fujitsu.com>
> Signed-off-by: Ingo Molnar <mingo@elte.hu>
> ---
I'm confused.
Each syscall has a enter_syscall_print_##sname,
all of them are identical (they all map to print_syscall_enter())
OTOH we have event_syscall_enter, which is exactly
the same than enter_syscall_print_##sname.
But we are using a strange mix of them: we do that on
init: register_ftrace_event(&enter_syscall_print_##sname)
but we use event_syscall_enter as the "event" field
of the trace_event. It means that we unregister the wrong
event when we remove a module.
Thanks for fixing this!
But I think you fixed it the wrong way.
Why do we need a copy of this event_syscall_enter
for each syscall event?
Can't we actually drop enter_syscall_print_##sname
and always use event_syscall_enter instead?
The same applies to exit syscall events.
Thanks.
> include/linux/syscalls.h | 4 ++--
> include/trace/syscall.h | 2 --
> kernel/trace/trace_syscalls.c | 8 --------
> 3 files changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
> index b50974a..2f7c539 100644
> --- a/include/linux/syscalls.h
> +++ b/include/linux/syscalls.h
> @@ -178,7 +178,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \
> event_enter_##sname = { \
> .name = "sys_enter"#sname, \
> .system = "syscalls", \
> - .event = &event_syscall_enter, \
> + .event = &enter_syscall_print_##sname, \
> .raw_init = init_enter_##sname, \
> .show_format = syscall_enter_format, \
> .define_fields = syscall_enter_define_fields, \
> @@ -214,7 +214,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \
> event_exit_##sname = { \
> .name = "sys_exit"#sname, \
> .system = "syscalls", \
> - .event = &event_syscall_exit, \
> + .event = &exit_syscall_print_##sname, \
> .raw_init = init_exit_##sname, \
> .show_format = syscall_exit_format, \
> .define_fields = syscall_exit_define_fields, \
> diff --git a/include/trace/syscall.h b/include/trace/syscall.h
> index 51ee17d..5f8827c 100644
> --- a/include/trace/syscall.h
> +++ b/include/trace/syscall.h
> @@ -37,8 +37,6 @@ extern unsigned long arch_syscall_addr(int nr);
> extern int syscall_name_to_nr(char *name);
> void set_syscall_enter_id(int num, int id);
> void set_syscall_exit_id(int num, int id);
> -extern struct trace_event event_syscall_enter;
> -extern struct trace_event event_syscall_exit;
>
> extern int syscall_enter_format(struct ftrace_event_call *call,
> struct trace_seq *s);
> diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
> index 63aa807..00d6e17 100644
> --- a/kernel/trace/trace_syscalls.c
> +++ b/kernel/trace/trace_syscalls.c
> @@ -444,14 +444,6 @@ void unreg_event_syscall_exit(struct ftrace_event_call *call)
> mutex_unlock(&syscall_trace_lock);
> }
>
> -struct trace_event event_syscall_enter = {
> - .trace = print_syscall_enter,
> -};
> -
> -struct trace_event event_syscall_exit = {
> - .trace = print_syscall_exit,
> -};
> -
> int __init init_ftrace_syscalls(void)
> {
> struct syscall_metadata *meta;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [tip:perf/core] trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit
2009-12-01 16:42 ` [tip:perf/core] trace_syscalls: Remove " tip-bot for Lai Jiangshan
2009-12-01 17:40 ` Frederic Weisbecker
@ 2009-12-01 17:54 ` Frederic Weisbecker
2009-12-02 1:13 ` Lai Jiangshan
1 sibling, 1 reply; 6+ messages in thread
From: Frederic Weisbecker @ 2009-12-01 17:54 UTC (permalink / raw)
To: mingo, hpa, linux-kernel, rostedt, jbaron, tglx, laijs, mingo
Cc: linux-tip-commits
On Tue, Dec 01, 2009 at 04:42:35PM +0000, tip-bot for Lai Jiangshan wrote:
> Commit-ID: bf56a4ea9f1683c5b223fd3a5dbea23f1fa91c34
> Gitweb: http://git.kernel.org/tip/bf56a4ea9f1683c5b223fd3a5dbea23f1fa91c34
> Author: Lai Jiangshan <laijs@cn.fujitsu.com>
> AuthorDate: Tue, 1 Dec 2009 16:23:20 +0800
> Committer: Ingo Molnar <mingo@elte.hu>
> CommitDate: Tue, 1 Dec 2009 17:33:28 +0100
>
> trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit
>
> fix event_enter_##sname->event
> fix event_exit_##sname->event
>
> remove unused event_syscall_enter and event_syscall_exit
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
> Acked-by: Jason Baron <jbaron@redhat.com>
> Cc: Steven Rostedt <rostedt@goodmis.org>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> LKML-Reference: <4B14D278.4090209@cn.fujitsu.com>
> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Except for this patch. The whole series is really nice, thanks
a lot for this cleanup!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [tip:perf/core] trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit
2009-12-01 17:54 ` Frederic Weisbecker
@ 2009-12-02 1:13 ` Lai Jiangshan
2009-12-02 4:24 ` Frederic Weisbecker
0 siblings, 1 reply; 6+ messages in thread
From: Lai Jiangshan @ 2009-12-02 1:13 UTC (permalink / raw)
To: Frederic Weisbecker
Cc: mingo, hpa, linux-kernel, rostedt, jbaron, tglx, mingo,
linux-tip-commits
Frederic Weisbecker wrote:
>
> Except for this patch. The whole series is really nice, thanks
> a lot for this cleanup!
>
>
>
> But I think you fixed it the wrong way.
>
> Why do we need a copy of this event_syscall_enter
> for each syscall event?
> Can't we actually drop enter_syscall_print_##sname
> and always use event_syscall_enter instead?
>
> The same applies to exit syscall events.
>
> Thanks.
>
64c12e0444fcc6b75eb49144ba46d43dbdc6bc8f is a nice patch from
Jason Baron, this patch introduces enter_syscall_print_##sname.
This patch only forgot to do some cleanups. My patch make up it:
fix event_enter_##sname->event
fix event_exit_##sname->event
remove unused event_syscall_enter and event_syscall_exit
Thanks,
Lai
commit 64c12e0444fcc6b75eb49144ba46d43dbdc6bc8f
Author: Jason Baron <jbaron@redhat.com>
Date: Mon Aug 10 16:52:53 2009 -0400
tracing: Add individual syscalls tracepoint id support
The current state of syscalls tracepoints generates only one event id
for every syscall events.
This patch associates an id with each syscall trace event, so that we
can identify each syscall trace event using the 'perf' too
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [tip:perf/core] trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit
2009-12-02 1:13 ` Lai Jiangshan
@ 2009-12-02 4:24 ` Frederic Weisbecker
0 siblings, 0 replies; 6+ messages in thread
From: Frederic Weisbecker @ 2009-12-02 4:24 UTC (permalink / raw)
To: Lai Jiangshan
Cc: mingo, hpa, linux-kernel, rostedt, jbaron, tglx, mingo,
linux-tip-commits
On Wed, Dec 02, 2009 at 09:13:50AM +0800, Lai Jiangshan wrote:
> Frederic Weisbecker wrote:
>
> >
> > Except for this patch. The whole series is really nice, thanks
> > a lot for this cleanup!
> >
> >
> >
>
> > But I think you fixed it the wrong way.
> >
> > Why do we need a copy of this event_syscall_enter
> > for each syscall event?
> > Can't we actually drop enter_syscall_print_##sname
> > and always use event_syscall_enter instead?
> >
> > The same applies to exit syscall events.
> >
> > Thanks.
> >
>
> 64c12e0444fcc6b75eb49144ba46d43dbdc6bc8f is a nice patch from
> Jason Baron, this patch introduces enter_syscall_print_##sname.
>
> This patch only forgot to do some cleanups. My patch make up it:
>
> fix event_enter_##sname->event
> fix event_exit_##sname->event
>
> remove unused event_syscall_enter and event_syscall_exit
>
> Thanks,
> Lai
Ah right I forgot about this. We need different enter_syscall_print_##sname
so that we can have different event ids for each syscalls.
Ok, fine then, thanks :)
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-12-02 4:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-12-01 8:23 [PATCH 1/7] trace_syscalls: remove unused event_syscall_enter and event_syscall_exit Lai Jiangshan
2009-12-01 16:42 ` [tip:perf/core] trace_syscalls: Remove " tip-bot for Lai Jiangshan
2009-12-01 17:40 ` Frederic Weisbecker
2009-12-01 17:54 ` Frederic Weisbecker
2009-12-02 1:13 ` Lai Jiangshan
2009-12-02 4:24 ` Frederic Weisbecker
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.