Skip to contentSkip to conversation

trace_syscalls: fix SYSCALL_DEFINE0

PATCH In review Lai Jiangshan 1 participant 2 messages Dec 15, 2009 – Dec 30, 2009 ABI/API

lore
Share & tools
lore
#0 lore raw

PATCH 2/10 trace_syscalls: fix SYSCALL_DEFINE0

struct syscall_metadata variable name in SYSCALL_DEFINE0 is not the same as SYSCALL_DEFINE1/2/3/4/5/6.

SYSCALL_TRACE_ENTER_EVENT() and SYSCALL_TRACE_EXIT_EVENT() expect struct syscall_metadata's name is __syscall_meta__XXXXXX as SYSCALL_DEFINE1/2/3/4/5/6 defines.

It causes event_enter_##sname->data points to a wrong place. (event_enter_##sname->data points to a dummy struct syscall_metadata)

It causes syscalls which are defined by SYSCALL_DEFINE0() can not be traced.

---

include/linux/syscalls.h +1 -1
index 55e7108..bee1d41 100644
@@ -196,7 +196,7 @@ struct perf_event_attr;
 	static const struct syscall_metadata __used		\
 	  __attribute__((__aligned__(4)))			\
 	  __attribute__((section("__syscalls_metadata")))	\
-	  __syscall_meta_##sname = {				\
+	  __syscall_meta__##sname = {				\
 		.name 		= "sys_"#sname,			\
 		.nb_args 	= 0,				\
 		.enter_event	= &event_enter__##sname,	\
#1 lore raw

[tip:tracing/urgent] tracing/syscalls: Fix typo in SYSCALL_DEFINE0

Commit-ID:  e96dc9674cb597de4fee757ed005c8465072d13f
Gitweb:     http://git.kernel.org/tip/e96dc9674cb597de4fee757ed005c8465072d13f
Author:     Lai Jiangshan <[email protected]>
AuthorDate: Tue, 15 Dec 2009 15:39:26 +0800
Committer:  Steven Rostedt <[email protected]>
CommitDate: Wed, 30 Dec 2009 10:27:04 -0500

tracing/syscalls: Fix typo in SYSCALL_DEFINE0

The struct syscall_metadata variable name in SYSCALL_DEFINE0 should be __syscall_meta__##sname instead of __syscall_meta_##sname to match the name that is in SYSCALL_DEFINE1/2/3/4/5/6.

This error causes event_enter_##sname->data to point to the wrong location, which causes syscalls which are defined by SYSCALL_DEFINE0() not to be traced.

LKML-Reference: <[email protected]>

---
 include/linux/syscalls.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/syscalls.h +1 -1
index 65793e9..207466a 100644
@@ -195,7 +195,7 @@ struct perf_event_attr;
 	static const struct syscall_metadata __used		\
 	  __attribute__((__aligned__(4)))			\
 	  __attribute__((section("__syscalls_metadata")))	\
-	  __syscall_meta_##sname = {				\
+	  __syscall_meta__##sname = {				\
 		.name 		= "sys_"#sname,			\
 		.nb_args 	= 0,				\
 		.enter_event	= &event_enter__##sname,	\