Skip to contentSkip to conversation

trace_syscalls: remove unused event_syscall_enter and event_syscall_exit

PATCH In review Lai Jiangshan 2 participants 6 messages Dec 1, 2009 – Dec 2, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/7 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

---

include/linux/syscalls.h +2 -2
index b50974a..2f7c539 100644
@@ -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,	\
include/trace/syscall.h +0 -2
index 51ee17d..5f8827c 100644
@@ -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);
kernel/trace/trace_syscalls.c +0 -8
index 63aa807..00d6e17 100644
@@ -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;
#1 lore raw

[tip:perf/core] trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit

Commit-ID:  bf56a4ea9f1683c5b223fd3a5dbea23f1fa91c34
Gitweb:     http://git.kernel.org/tip/bf56a4ea9f1683c5b223fd3a5dbea23f1fa91c34
Author:     Lai Jiangshan <[email protected]>
AuthorDate: Tue, 1 Dec 2009 16:23:20 +0800
Committer:  Ingo Molnar <[email protected]>
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

Cc Steven Rostedt <[email protected]>
Cc Frederic Weisbecker <[email protected]>

LKML-Reference: <[email protected]>

---
 include/linux/syscalls.h      |    4 ++--
 include/trace/syscall.h       |    2 --
 kernel/trace/trace_syscalls.c |    8 --------
 3 files changed, 2 insertions(+), 12 deletions(-)
include/linux/syscalls.h +2 -2
index b50974a..2f7c539 100644
@@ -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,	\
include/trace/syscall.h +0 -2
index 51ee17d..5f8827c 100644
@@ -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);
kernel/trace/trace_syscalls.c +0 -8
index 63aa807..00d6e17 100644
@@ -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;
#2 lore raw

Re: [tip:perf/core] trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit

Quoted 14 lines · tip-bot for Lai Jiangshan
Commit-ID:  bf56a4ea9f1683c5b223fd3a5dbea23f1fa91c34
Gitweb:     http://git.kernel.org/tip/bf56a4ea9f1683c5b223fd3a5dbea23f1fa91c34
Author:     Lai Jiangshan <[email protected]>
AuthorDate: Tue, 1 Dec 2009 16:23:20 +0800
Committer:  Ingo Molnar <[email protected]>
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

Quoted 7 lines
Cc Steven Rostedt <[email protected]>
Cc Frederic Weisbecker <[email protected]>

LKML-Reference: <[email protected]>

---

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.

Quoted 59 lines
 include/linux/syscalls.h      |    4 ++--
 include/trace/syscall.h       |    2 --
 kernel/trace/trace_syscalls.c |    8 --------
 3 files changed, 2 insertions(+), 12 deletions(-)
include/linux/syscalls.h +2 -2
index b50974a..2f7c539 100644
@@ -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,	\
include/trace/syscall.h +0 -2
index 51ee17d..5f8827c 100644
@@ -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);
kernel/trace/trace_syscalls.c +0 -8
index 63aa807..00d6e17 100644
@@ -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;
#3 lore raw

Re: [tip:perf/core] trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit

In reply to tip-bot for Lai Jiangshan
Quoted 12 lines · tip-bot for Lai Jiangshan
Commit-ID:  bf56a4ea9f1683c5b223fd3a5dbea23f1fa91c34
Gitweb:     http://git.kernel.org/tip/bf56a4ea9f1683c5b223fd3a5dbea23f1fa91c34
Author:     Lai Jiangshan <[email protected]>
AuthorDate: Tue, 1 Dec 2009 16:23:20 +0800
Committer:  Ingo Molnar <[email protected]>
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

Quoted 8 lines

remove unused event_syscall_enter and event_syscall_exit

Cc Steven Rostedt <[email protected]>
Cc Frederic Weisbecker <[email protected]>

LKML-Reference: <[email protected]>

Except for this patch. The whole series is really nice, thanks a lot for this cleanup!

#4 lore raw

Re: [tip:perf/core] trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit

Quoted 9 lines · Frederic Weisbecker

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.

Quoted 9 lines

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 <[email protected]>
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

#5 lore raw

Re: [tip:perf/core] trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit

Quoted 26 lines · Lai Jiangshan
Quoted 9 lines · Frederic Weisbecker

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.

Quoted 9 lines

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:

Quoted 7 lines

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 :)