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

Commit 2425bcb9 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

tracing: Rename ftrace_event_{call,class} to trace_event_{call,class} 



The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The structures ftrace_event_call and
ftrace_event_class have nothing to do with the function hooks, and are
really trace_event structures. Rename ftrace_event_* to trace_event_*.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 7f1d2f82

include/linux/module.h

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ struct module { 
	const char **trace_bprintk_fmt_start;

#endif

#ifdef CONFIG_EVENT_TRACING

	struct ftrace_event_call **trace_events;

	struct trace_event_call **trace_events;

	unsigned int num_trace_events;

	struct trace_enum_map **trace_enums;

	unsigned int num_trace_enums;

include/linux/perf_event.h

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ struct perf_event { 
	void				*overflow_handler_context;



#ifdef CONFIG_EVENT_TRACING

	struct ftrace_event_call	*tp_event;

	struct trace_event_call		*tp_event;

	struct event_filter		*filter;

#ifdef CONFIG_FUNCTION_TRACER

	struct ftrace_ops               ftrace_ops;

include/linux/syscalls.h

+6 −6
Original line number Diff line number Diff line
@@ -111,14 +111,14 @@ union bpf_attr; 
#define __SC_STR_ADECL(t, a)	#a

#define __SC_STR_TDECL(t, a)	#t



extern struct ftrace_event_class event_class_syscall_enter;

extern struct ftrace_event_class event_class_syscall_exit;

extern struct trace_event_class event_class_syscall_enter;

extern struct trace_event_class event_class_syscall_exit;

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 __syscall_meta_##sname;		\

	static struct ftrace_event_call __used				\

	static struct trace_event_call __used				\

	  event_enter_##sname = {					\

		.class			= &event_class_syscall_enter,	\

		{							\
@@ -128,13 +128,13 @@ extern struct trace_event_functions exit_syscall_print_funcs; 
		.data			= (void *)&__syscall_meta_##sname,\

		.flags                  = TRACE_EVENT_FL_CAP_ANY,	\

	};								\

	static struct ftrace_event_call __used				\

	static struct trace_event_call __used				\

	  __attribute__((section("_ftrace_events")))			\

	 *__event_enter_##sname = &event_enter_##sname;



#define SYSCALL_TRACE_EXIT_EVENT(sname)					\

	static struct syscall_metadata __syscall_meta_##sname;		\

	static struct ftrace_event_call __used				\

	static struct trace_event_call __used				\

	  event_exit_##sname = {					\

		.class			= &event_class_syscall_exit,	\

		{							\
@@ -144,7 +144,7 @@ extern struct trace_event_functions exit_syscall_print_funcs; 
		.data			= (void *)&__syscall_meta_##sname,\

		.flags                  = TRACE_EVENT_FL_CAP_ANY,	\

	};								\

	static struct ftrace_event_call __used				\

	static struct trace_event_call __used				\

	  __attribute__((section("_ftrace_events")))			\

	*__event_exit_##sname = &event_exit_##sname;

include/linux/trace_events.h

+19 −19
Original line number Diff line number Diff line
@@ -200,23 +200,23 @@ enum trace_reg { 
#endif

};



struct ftrace_event_call;

struct trace_event_call;



struct ftrace_event_class {

struct trace_event_class {

	const char		*system;

	void			*probe;

#ifdef CONFIG_PERF_EVENTS

	void			*perf_probe;

#endif

	int			(*reg)(struct ftrace_event_call *event,

	int			(*reg)(struct trace_event_call *event,

				       enum trace_reg type, void *data);

	int			(*define_fields)(struct ftrace_event_call *);

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

	int			(*define_fields)(struct trace_event_call *);

	struct list_head	*(*get_fields)(struct trace_event_call *);

	struct list_head	fields;

	int			(*raw_init)(struct ftrace_event_call *);

	int			(*raw_init)(struct trace_event_call *);

};



extern int trace_event_reg(struct ftrace_event_call *event,

extern int trace_event_reg(struct trace_event_call *event,

			    enum trace_reg type, void *data);



struct ftrace_event_buffer {
@@ -269,9 +269,9 @@ enum { 
	TRACE_EVENT_FL_KPROBE		= (1 << TRACE_EVENT_FL_KPROBE_BIT),

};



struct ftrace_event_call {

struct trace_event_call {

	struct list_head	list;

	struct ftrace_event_class *class;

	struct trace_event_class *class;

	union {

		char			*name;

		/* Set TRACE_EVENT_FL_TRACEPOINT flag when using "tp" */
@@ -298,13 +298,13 @@ struct ftrace_event_call { 
	struct hlist_head __percpu	*perf_events;

	struct bpf_prog			*prog;



	int	(*perf_perm)(struct ftrace_event_call *,

	int	(*perf_perm)(struct trace_event_call *,

			     struct perf_event *);

#endif

};



static inline const char *

ftrace_event_name(struct ftrace_event_call *call)

ftrace_event_name(struct trace_event_call *call)

{

	if (call->flags & TRACE_EVENT_FL_TRACEPOINT)

		return call->tp ? call->tp->name : NULL;
@@ -351,7 +351,7 @@ enum { 


struct trace_event_file {

	struct list_head		list;

	struct ftrace_event_call	*event_call;

	struct trace_event_call		*event_call;

	struct event_filter		*filter;

	struct dentry			*dir;

	struct trace_array		*tr;
@@ -388,7 +388,7 @@ struct trace_event_file { 
	early_initcall(trace_init_flags_##name);



#define __TRACE_EVENT_PERF_PERM(name, expr...)				\

	static int perf_perm_##name(struct ftrace_event_call *tp_event, \

	static int perf_perm_##name(struct trace_event_call *tp_event, \

				    struct perf_event *p_event)		\

	{								\

		return ({ expr; });					\
@@ -417,7 +417,7 @@ extern int filter_match_preds(struct event_filter *filter, void *rec); 
extern int filter_check_discard(struct trace_event_file *file, void *rec,

				struct ring_buffer *buffer,

				struct ring_buffer_event *event);

extern int call_filter_check_discard(struct ftrace_event_call *call, void *rec,

extern int call_filter_check_discard(struct trace_event_call *call, void *rec,

				     struct ring_buffer *buffer,

				     struct ring_buffer_event *event);

extern enum event_trigger_type event_triggers_call(struct trace_event_file *file,
@@ -559,12 +559,12 @@ enum { 
	FILTER_TRACE_FN,

};



extern int trace_event_raw_init(struct ftrace_event_call *call);

extern int trace_define_field(struct ftrace_event_call *call, const char *type,

extern int trace_event_raw_init(struct trace_event_call *call);

extern int trace_define_field(struct trace_event_call *call, const char *type,

			      const char *name, int offset, int size,

			      int is_signed, int filter_type);

extern int trace_add_event_call(struct ftrace_event_call *call);

extern int trace_remove_event_call(struct ftrace_event_call *call);

extern int trace_add_event_call(struct trace_event_call *call);

extern int trace_remove_event_call(struct trace_event_call *call);



#define is_signed_type(type)	(((type)(-1)) < (type)1)
@@ -613,4 +613,4 @@ perf_trace_buf_submit(void *raw_data, int size, int rctx, u64 addr, 
}

#endif



#endif /* _LINUX_FTRACE_EVENT_H */
 
#endif /* _LINUX_TRACE_EVENT_H */

include/trace/perf.h

+11 −11
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@ 
 *

 * For those macros defined with TRACE_EVENT:

 *

 * static struct ftrace_event_call event_<call>;

 * static struct trace_event_call event_<call>;

 *

 * static void ftrace_raw_event_<call>(void *__data, proto)

 * {

 *	struct trace_event_file *trace_file = __data;

 *	struct ftrace_event_call *event_call = trace_file->event_call;

 *	struct trace_event_call *event_call = trace_file->event_call;

 *	struct ftrace_data_offsets_<call> __maybe_unused __data_offsets;

 *	unsigned long eflags = trace_file->flags;

 *	enum event_trigger_type __tt = ETT_NONE;
@@ -63,7 +63,7 @@ 
 *

 * static char print_fmt_<call>[] = <TP_printk>;

 *

 * static struct ftrace_event_class __used event_class_<template> = {

 * static struct trace_event_class __used event_class_<template> = {

 *	.system			= "<system>",

 *	.define_fields		= ftrace_define_fields_<call>,

 *	.fields			= LIST_HEAD_INIT(event_class_##call.fields),
@@ -72,7 +72,7 @@ 
 *	.reg			= trace_event_reg,

 * };

 *

 * static struct ftrace_event_call event_<call> = {

 * static struct trace_event_call event_<call> = {

 *	.class			= event_class_<template>,

 *	{

 *		.tp			= &__tracepoint_<call>,
@@ -83,7 +83,7 @@ 
 * };

 * // its only safe to use pointers when doing linker tricks to

 * // create an array.

 * static struct ftrace_event_call __used

 * static struct trace_event_call __used

 * __attribute__((section("_ftrace_events"))) *__event_<call> = &event_<call>;

 *

 */
@@ -213,7 +213,7 @@ static inline void ftrace_test_probe_##call(void) \ 
#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)	\

_TRACE_PERF_PROTO(call, PARAMS(proto));					\

static char print_fmt_##call[] = print;					\

static struct ftrace_event_class __used __refdata event_class_##call = { \

static struct trace_event_class __used __refdata event_class_##call = { \

	.system			= TRACE_SYSTEM_STRING,			\

	.define_fields		= ftrace_define_fields_##call,		\

	.fields			= LIST_HEAD_INIT(event_class_##call.fields),\
@@ -226,7 +226,7 @@ static struct ftrace_event_class __used __refdata event_class_##call = { \ 
#undef DEFINE_EVENT

#define DEFINE_EVENT(template, call, proto, args)			\

									\

static struct ftrace_event_call __used event_##call = {			\

static struct trace_event_call __used event_##call = {			\

	.class			= &event_class_##template,		\

	{								\

		.tp			= &__tracepoint_##call,		\
@@ -235,7 +235,7 @@ static struct ftrace_event_call __used event_##call = { \ 
	.print_fmt		= print_fmt_##template,			\

	.flags			= TRACE_EVENT_FL_TRACEPOINT,		\

};									\

static struct ftrace_event_call __used					\

static struct trace_event_call __used					\

__attribute__((section("_ftrace_events"))) *__event_##call = &event_##call



#undef DEFINE_EVENT_PRINT
@@ -243,7 +243,7 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call 
									\

static char print_fmt_##call[] = print;					\

									\

static struct ftrace_event_call __used event_##call = {			\

static struct trace_event_call __used event_##call = {			\

	.class			= &event_class_##template,		\

	{								\

		.tp			= &__tracepoint_##call,		\
@@ -252,7 +252,7 @@ static struct ftrace_event_call __used event_##call = { \ 
	.print_fmt		= print_fmt_##call,			\

	.flags			= TRACE_EVENT_FL_TRACEPOINT,		\

};									\

static struct ftrace_event_call __used					\

static struct trace_event_call __used					\

__attribute__((section("_ftrace_events"))) *__event_##call = &event_##call



#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
@@ -292,7 +292,7 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call 
static notrace void							\

perf_trace_##call(void *__data, proto)					\

{									\

	struct ftrace_event_call *event_call = __data;			\

	struct trace_event_call *event_call = __data;			\

	struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\

	struct ftrace_raw_##call *entry;				\

	struct pt_regs *__regs;						\