Commit 3d56e331 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

tracing: Replace syscall_meta_data struct array with pointer array 



Currently the syscall_meta structures for the syscall tracepoints are
placed in the __syscall_metadata section, and at link time, the linker
makes one large array of all these syscall metadata structures. On boot
up, this array is read (much like the initcall sections) and the syscall
data is processed.

The problem is that there is no guarantee that gcc will place complex
structures nicely together in an array format. Two structures in the
same file may be placed awkwardly, because gcc has no clue that they
are suppose to be in an array.

A hack was used previous to force the alignment to 4, to pack the
structures together. But this caused alignment issues with other
architectures (sparc).

Instead of packing the structures into an array, the structures' addresses
are now put into the __syscall_metadata section. As pointers are always the
natural alignment, gcc should always pack them tightly together
(otherwise initcall, extable, etc would also fail).

By having the pointers to the structures in the section, we can still
iterate the trace_events without causing unnecessary alignment problems
with other architectures, or depending on the current behaviour of
gcc that will likely change in the future just to tick us kernel developers
off a little more.

The __syscall_metadata section is also moved into the .init.data section
as it is now only needed at boot up.

Suggested-by: default avatarDavid Miller <davem@davemloft.net>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 65498646

include/asm-generic/vmlinux.lds.h

+4 −5
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ 
#endif



#ifdef CONFIG_FTRACE_SYSCALLS

#define TRACE_SYSCALLS() VMLINUX_SYMBOL(__start_syscalls_metadata) = .;	\

#define TRACE_SYSCALLS() . = ALIGN(8);					\

			 VMLINUX_SYMBOL(__start_syscalls_metadata) = .;	\

			 *(__syscalls_metadata)				\

			 VMLINUX_SYMBOL(__stop_syscalls_metadata) = .;

#else
@@ -175,10 +176,7 @@ 
	VMLINUX_SYMBOL(__stop___verbose) = .;				\

	LIKELY_PROFILE()		       				\

	BRANCH_PROFILE()						\

	TRACE_PRINTKS()							\

									\

	STRUCT_ALIGN();							\

	TRACE_SYSCALLS()

	TRACE_PRINTKS()



/*

 * Data section helpers
@@ -483,6 +481,7 @@ 
	*(.init.rodata)							\

	MCOUNT_REC()							\

	FTRACE_EVENTS()							\

	TRACE_SYSCALLS()						\

	DEV_DISCARD(init.rodata)					\

	CPU_DISCARD(init.rodata)					\

	MEM_DISCARD(init.rodata)					\

include/linux/syscalls.h

+9 −9
Original line number Diff line number Diff line
@@ -125,8 +125,7 @@ extern struct trace_event_functions enter_syscall_print_funcs; 
extern struct trace_event_functions exit_syscall_print_funcs;



#define SYSCALL_TRACE_ENTER_EVENT(sname)				\

	static struct syscall_metadata					\

	__attribute__((__aligned__(4))) __syscall_meta_##sname;		\

	static struct syscall_metadata __syscall_meta_##sname;		\

	static struct ftrace_event_call __used				\

	  event_enter_##sname = {					\

		.name                   = "sys_enter"#sname,		\
@@ -140,8 +139,7 @@ extern struct trace_event_functions exit_syscall_print_funcs; 
	__TRACE_EVENT_FLAGS(enter_##sname, TRACE_EVENT_FL_CAP_ANY)



#define SYSCALL_TRACE_EXIT_EVENT(sname)					\

	static struct syscall_metadata					\

	__attribute__((__aligned__(4))) __syscall_meta_##sname;		\

	static struct syscall_metadata __syscall_meta_##sname;		\

	static struct ftrace_event_call __used				\

	  event_exit_##sname = {					\

		.name                   = "sys_exit"#sname,		\
@@ -158,8 +156,6 @@ extern struct trace_event_functions exit_syscall_print_funcs; 
	SYSCALL_TRACE_ENTER_EVENT(sname);			\

	SYSCALL_TRACE_EXIT_EVENT(sname);			\

	static struct syscall_metadata __used			\

	  __attribute__((__aligned__(4)))			\

	  __attribute__((section("__syscalls_metadata")))	\

	  __syscall_meta_##sname = {				\

		.name 		= "sys"#sname,			\

		.nb_args 	= nb,				\
@@ -168,14 +164,15 @@ extern struct trace_event_functions exit_syscall_print_funcs; 
		.enter_event	= &event_enter_##sname,		\

		.exit_event	= &event_exit_##sname,		\

		.enter_fields	= LIST_HEAD_INIT(__syscall_meta_##sname.enter_fields), \

	};

	};							\

	static struct syscall_metadata __used			\

	  __attribute__((section("__syscalls_metadata")))	\

	 *__p_syscall_meta_##sname = &__syscall_meta_##sname;



#define SYSCALL_DEFINE0(sname)					\

	SYSCALL_TRACE_ENTER_EVENT(_##sname);			\

	SYSCALL_TRACE_EXIT_EVENT(_##sname);			\

	static struct syscall_metadata __used			\

	  __attribute__((__aligned__(4)))			\

	  __attribute__((section("__syscalls_metadata")))	\

	  __syscall_meta__##sname = {				\

		.name 		= "sys_"#sname,			\

		.nb_args 	= 0,				\
@@ -183,6 +180,9 @@ extern struct trace_event_functions exit_syscall_print_funcs; 
		.exit_event	= &event_exit__##sname,		\

		.enter_fields	= LIST_HEAD_INIT(__syscall_meta__##sname.enter_fields), \

	};							\

	static struct syscall_metadata __used			\

	  __attribute__((section("__syscalls_metadata")))	\

	 *__p_syscall_meta_##sname = &__syscall_meta__##sname;	\

	asmlinkage long sys_##sname(void)

#else

#define SYSCALL_DEFINE0(name)	   asmlinkage long sys_##name(void)

kernel/trace/trace_syscalls.c

+10 −9
Original line number Diff line number Diff line
@@ -55,20 +55,21 @@ struct ftrace_event_class event_class_syscall_exit = { 
	.raw_init	= init_syscall_trace,

};



extern unsigned long __start_syscalls_metadata[];

extern unsigned long __stop_syscalls_metadata[];

extern struct syscall_metadata *__start_syscalls_metadata[];

extern struct syscall_metadata *__stop_syscalls_metadata[];



static struct syscall_metadata **syscalls_metadata;



static struct syscall_metadata *find_syscall_meta(unsigned long syscall)

static __init struct syscall_metadata *

find_syscall_meta(unsigned long syscall)

{

	struct syscall_metadata *start;

	struct syscall_metadata *stop;

	struct syscall_metadata **start;

	struct syscall_metadata **stop;

	char str[KSYM_SYMBOL_LEN];





	start = (struct syscall_metadata *)__start_syscalls_metadata;

	stop = (struct syscall_metadata *)__stop_syscalls_metadata;

	start = __start_syscalls_metadata;

	stop = __stop_syscalls_metadata;

	kallsyms_lookup(syscall, NULL, NULL, NULL, str);



	for ( ; start < stop; start++) {
@@ -78,8 +79,8 @@ static struct syscall_metadata *find_syscall_meta(unsigned long syscall) 
		 * with "SyS" instead of "sys", leading to an unwanted

		 * mismatch.

		 */

		if (start->name && !strcmp(start->name + 3, str + 3))

			return start;

		if ((*start)->name && !strcmp((*start)->name + 3, str + 3))

			return *start;

	}

	return NULL;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE