Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0405ab80 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

tracing: Move raw_init from events to class 



The raw_init function pointer in the event is used to initialize
various kinds of events. The type of initialization needed is usually
classed to the kind of event it is.

Two events with the same class will always have the same initialization
function, so it makes sense to move this to the class structure.

Perhaps even making a special system structure would work since
the initialization is the same for all events within a system.
But since there's no system structure (yet), this will just move it
to the class.

   text	   data	    bss	    dec	    hex	filename
4913961	1088356	 861512	6863829	 68bbd5	vmlinux.orig
4900375	1053380	 861512	6815267	 67fe23	vmlinux.fields
4900382	1048964	 861512	6810858	 67ecea	vmlinux.init

The text grew very slightly, but this is a constant growth that happened
with the changing of the C files that call the init code.
The bigger savings is the data which will be saved the more events share
a class.

Acked-by: default avatarMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: default avatarMasami Hiramatsu <mhiramat@redhat.com>
Acked-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 2e33af02

include/linux/ftrace_event.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -133,6 +133,7 @@ struct ftrace_event_class { 
	int			(*define_fields)(struct ftrace_event_call *);

	int			(*define_fields)(struct ftrace_event_call *);

	struct list_head	*(*get_fields)(struct ftrace_event_call *);

	struct list_head	*(*get_fields)(struct ftrace_event_call *);

	struct list_head	fields;

	struct list_head	fields;

	int			(*raw_init)(struct ftrace_event_call *);

};

};





struct ftrace_event_call {

struct ftrace_event_call {
@@ -144,7 +145,6 @@ struct ftrace_event_call { 
	int			enabled;

	int			enabled;

	int			id;

	int			id;

	const char		*print_fmt;

	const char		*print_fmt;

	int			(*raw_init)(struct ftrace_event_call *);

	int			filter_active;

	int			filter_active;

	struct event_filter	*filter;

	struct event_filter	*filter;

	void			*mod;

	void			*mod;

include/linux/syscalls.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -135,7 +135,6 @@ extern struct ftrace_event_class event_class_syscall_exit; 
		.name                   = "sys_enter"#sname,		\

		.name                   = "sys_enter"#sname,		\

		.class			= &event_class_syscall_enter,	\

		.class			= &event_class_syscall_enter,	\

		.event                  = &enter_syscall_print_##sname,	\

		.event                  = &enter_syscall_print_##sname,	\

		.raw_init		= init_syscall_trace,		\

		.data			= (void *)&__syscall_meta_##sname,\

		.data			= (void *)&__syscall_meta_##sname,\

	}

	}
@@ -153,7 +152,6 @@ extern struct ftrace_event_class event_class_syscall_exit; 
		.name                   = "sys_exit"#sname,		\

		.name                   = "sys_exit"#sname,		\

		.class			= &event_class_syscall_exit,	\

		.class			= &event_class_syscall_exit,	\

		.event                  = &exit_syscall_print_##sname,	\

		.event                  = &exit_syscall_print_##sname,	\

		.raw_init		= init_syscall_trace,		\

		.data			= (void *)&__syscall_meta_##sname,\

		.data			= (void *)&__syscall_meta_##sname,\

	}

	}

include/trace/ftrace.h

+4 −5
Original line number Original line Diff line number Diff line
@@ -431,8 +431,9 @@ static inline notrace int ftrace_get_offsets_##call( \ 
 * static struct ftrace_event_class __used event_class_<template> = {

 * static struct ftrace_event_class __used event_class_<template> = {

 *	.system			= "<system>",

 *	.system			= "<system>",

 *	.define_fields		= ftrace_define_fields_<call>,

 *	.define_fields		= ftrace_define_fields_<call>,

 *	.fields			= LIST_HEAD_INIT(event_class_##call.fields), \

 *	.fields			= LIST_HEAD_INIT(event_class_##call.fields),

 *	.probe			= ftrace_raw_event_##call,		\

 *	.raw_init		= trace_event_raw_init,

 *	.probe			= ftrace_raw_event_##call,

 * };

 * };

 *

 *

 * static struct ftrace_event_call __used

 * static struct ftrace_event_call __used
@@ -440,7 +441,6 @@ static inline notrace int ftrace_get_offsets_##call( \ 
 * __attribute__((section("_ftrace_events"))) event_<call> = {

 * __attribute__((section("_ftrace_events"))) event_<call> = {

 *	.name			= "<call>",

 *	.name			= "<call>",

 *	.class			= event_class_<template>,

 *	.class			= event_class_<template>,

 *	.raw_init		= trace_event_raw_init,

 *	.event			= &ftrace_event_type_<call>,

 *	.event			= &ftrace_event_type_<call>,

 *	.print_fmt		= print_fmt_<call>,

 *	.print_fmt		= print_fmt_<call>,

 * };

 * };
@@ -566,6 +566,7 @@ static struct ftrace_event_class __used event_class_##call = { \ 
	.system			= __stringify(TRACE_SYSTEM),		\

	.system			= __stringify(TRACE_SYSTEM),		\

	.define_fields		= ftrace_define_fields_##call,		\

	.define_fields		= ftrace_define_fields_##call,		\

	.fields			= LIST_HEAD_INIT(event_class_##call.fields),\

	.fields			= LIST_HEAD_INIT(event_class_##call.fields),\

	.raw_init		= trace_event_raw_init,			\

	.probe			= ftrace_raw_event_##call,		\

	.probe			= ftrace_raw_event_##call,		\

	_TRACE_PERF_INIT(call)						\

	_TRACE_PERF_INIT(call)						\

};

};
@@ -579,7 +580,6 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ 
	.name			= #call,				\

	.name			= #call,				\

	.class			= &event_class_##template,		\

	.class			= &event_class_##template,		\

	.event			= &ftrace_event_type_##call,		\

	.event			= &ftrace_event_type_##call,		\

	.raw_init		= trace_event_raw_init,			\

	.print_fmt		= print_fmt_##template,			\

	.print_fmt		= print_fmt_##template,			\

};

};
@@ -594,7 +594,6 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ 
	.name			= #call,				\

	.name			= #call,				\

	.class			= &event_class_##template,		\

	.class			= &event_class_##template,		\

	.event			= &ftrace_event_type_##call,		\

	.event			= &ftrace_event_type_##call,		\

	.raw_init		= trace_event_raw_init,			\

	.print_fmt		= print_fmt_##call,			\

	.print_fmt		= print_fmt_##call,			\

}

}

kernel/trace/trace_events.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -1008,8 +1008,8 @@ static int __trace_add_event_call(struct ftrace_event_call *call) 
	if (!call->name)

	if (!call->name)

		return -EINVAL;

		return -EINVAL;





	if (call->raw_init) {

	if (call->class->raw_init) {

		ret = call->raw_init(call);

		ret = call->class->raw_init(call);

		if (ret < 0) {

		if (ret < 0) {

			if (ret != -ENOSYS)

			if (ret != -ENOSYS)

				pr_warning("Could not initialize trace "

				pr_warning("Could not initialize trace "
@@ -1170,8 +1170,8 @@ static void trace_module_add_events(struct module *mod) 
		/* The linker may leave blanks */

		/* The linker may leave blanks */

		if (!call->name)

		if (!call->name)

			continue;

			continue;

		if (call->raw_init) {

		if (call->class->raw_init) {

			ret = call->raw_init(call);

			ret = call->class->raw_init(call);

			if (ret < 0) {

			if (ret < 0) {

				if (ret != -ENOSYS)

				if (ret != -ENOSYS)

					pr_warning("Could not initialize trace "

					pr_warning("Could not initialize trace "
@@ -1324,8 +1324,8 @@ static __init int event_trace_init(void) 
		/* The linker may leave blanks */

		/* The linker may leave blanks */

		if (!call->name)

		if (!call->name)

			continue;

			continue;

		if (call->raw_init) {

		if (call->class->raw_init) {

			ret = call->raw_init(call);

			ret = call->class->raw_init(call);

			if (ret < 0) {

			if (ret < 0) {

				if (ret != -ENOSYS)

				if (ret != -ENOSYS)

					pr_warning("Could not initialize trace "

					pr_warning("Could not initialize trace "

kernel/trace/trace_export.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -158,6 +158,7 @@ static int ftrace_raw_init_event(struct ftrace_event_call *call) 
struct ftrace_event_class event_class_ftrace_##call = {			\

struct ftrace_event_class event_class_ftrace_##call = {			\

	.system			= __stringify(TRACE_SYSTEM),		\

	.system			= __stringify(TRACE_SYSTEM),		\

	.define_fields		= ftrace_define_fields_##call,		\

	.define_fields		= ftrace_define_fields_##call,		\

	.raw_init		= ftrace_raw_init_event,		\

};									\

};									\

									\

									\

struct ftrace_event_call __used						\

struct ftrace_event_call __used						\
@@ -166,7 +167,6 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ 
	.name			= #call,				\

	.name			= #call,				\

	.id			= type,					\

	.id			= type,					\

	.class			= &event_class_ftrace_##call,		\

	.class			= &event_class_ftrace_##call,		\

	.raw_init		= ftrace_raw_init_event,		\

	.print_fmt		= print,				\

	.print_fmt		= print,				\

};									\

};									\