Skip to content

L
linux
Commit 7f1d2f82 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files
Options

tracing: Rename ftrace_event_file to trace_event_file 

The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The structure ftrace_event_file is really
about trace events and not "ftrace". Rename it to trace_event_file.
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 9023c930
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 169 deletions
include/linux/trace_events.h
View file @ 7f1d2f82
...@@ -157,11 +157,11 @@ static inline enum print_line_t trace_handle_return(struct trace_seq *s) ...@@ -157,11 +157,11 @@ static inline enum print_line_t trace_handle_return(struct trace_seq *s)
void tracing_generic_entry_update(struct trace_entry *entry, void tracing_generic_entry_update(struct trace_entry *entry,
unsigned long flags, unsigned long flags,
int pc); int pc);
struct ftrace_event_file; struct trace_event_file;
struct ring_buffer_event * struct ring_buffer_event *
trace_event_buffer_lock_reserve(struct ring_buffer **current_buffer, trace_event_buffer_lock_reserve(struct ring_buffer **current_buffer,
struct ftrace_event_file *ftrace_file, struct trace_event_file *trace_file,
int type, unsigned long len, int type, unsigned long len,
unsigned long flags, int pc); unsigned long flags, int pc);
struct ring_buffer_event * struct ring_buffer_event *
...@@ -222,14 +222,14 @@ extern int trace_event_reg(struct ftrace_event_call *event, ...@@ -222,14 +222,14 @@ extern int trace_event_reg(struct ftrace_event_call *event,
struct ftrace_event_buffer { struct ftrace_event_buffer {
struct ring_buffer *buffer; struct ring_buffer *buffer;
struct ring_buffer_event *event; struct ring_buffer_event *event;
struct ftrace_event_file *ftrace_file; struct trace_event_file *trace_file;
void *entry; void *entry;
unsigned long flags; unsigned long flags;
int pc; int pc;
}; };
void *ftrace_event_buffer_reserve(struct ftrace_event_buffer *fbuffer, void *ftrace_event_buffer_reserve(struct ftrace_event_buffer *fbuffer,
struct ftrace_event_file *ftrace_file, struct trace_event_file *trace_file,
unsigned long len); unsigned long len);
void ftrace_event_buffer_commit(struct ftrace_event_buffer *fbuffer); void ftrace_event_buffer_commit(struct ftrace_event_buffer *fbuffer);
...@@ -349,7 +349,7 @@ enum { ...@@ -349,7 +349,7 @@ enum {
FTRACE_EVENT_FL_TRIGGER_COND = (1 << FTRACE_EVENT_FL_TRIGGER_COND_BIT), FTRACE_EVENT_FL_TRIGGER_COND = (1 << FTRACE_EVENT_FL_TRIGGER_COND_BIT),
}; };
struct ftrace_event_file { struct trace_event_file {
struct list_head list; struct list_head list;
struct ftrace_event_call *event_call; struct ftrace_event_call *event_call;
struct event_filter *filter; struct event_filter *filter;
...@@ -414,15 +414,15 @@ enum event_trigger_type { ...@@ -414,15 +414,15 @@ enum event_trigger_type {
extern int filter_match_preds(struct event_filter *filter, void *rec); extern int filter_match_preds(struct event_filter *filter, void *rec);
extern int filter_check_discard(struct ftrace_event_file *file, void *rec, extern int filter_check_discard(struct trace_event_file *file, void *rec,
struct ring_buffer *buffer, struct ring_buffer *buffer,
struct ring_buffer_event *event); 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 ftrace_event_call *call, void *rec,
struct ring_buffer *buffer, struct ring_buffer *buffer,
struct ring_buffer_event *event); struct ring_buffer_event *event);
extern enum event_trigger_type event_triggers_call(struct ftrace_event_file *file, extern enum event_trigger_type event_triggers_call(struct trace_event_file *file,
void *rec); void *rec);
extern void event_triggers_post_call(struct ftrace_event_file *file, extern void event_triggers_post_call(struct trace_event_file *file,
enum event_trigger_type tt); enum event_trigger_type tt);
/** /**
...@@ -435,7 +435,7 @@ extern void event_triggers_post_call(struct ftrace_event_file *file, ...@@ -435,7 +435,7 @@ extern void event_triggers_post_call(struct ftrace_event_file *file,
* otherwise false. * otherwise false.
*/ */
static inline bool static inline bool
ftrace_trigger_soft_disabled(struct ftrace_event_file *file) ftrace_trigger_soft_disabled(struct trace_event_file *file)
{ {
unsigned long eflags = file->flags; unsigned long eflags = file->flags;
...@@ -462,7 +462,7 @@ ftrace_trigger_soft_disabled(struct ftrace_event_file *file) ...@@ -462,7 +462,7 @@ ftrace_trigger_soft_disabled(struct ftrace_event_file *file)
* Returns true if the event is discarded, false otherwise. * Returns true if the event is discarded, false otherwise.
*/ */
static inline bool static inline bool
__event_trigger_test_discard(struct ftrace_event_file *file, __event_trigger_test_discard(struct trace_event_file *file,
struct ring_buffer *buffer, struct ring_buffer *buffer,
struct ring_buffer_event *event, struct ring_buffer_event *event,
void *entry, void *entry,
...@@ -495,7 +495,7 @@ __event_trigger_test_discard(struct ftrace_event_file *file, ...@@ -495,7 +495,7 @@ __event_trigger_test_discard(struct ftrace_event_file *file,
* if the event is soft disabled and should be discarded. * if the event is soft disabled and should be discarded.
*/ */
static inline void static inline void
event_trigger_unlock_commit(struct ftrace_event_file *file, event_trigger_unlock_commit(struct trace_event_file *file,
struct ring_buffer *buffer, struct ring_buffer *buffer,
struct ring_buffer_event *event, struct ring_buffer_event *event,
void *entry, unsigned long irq_flags, int pc) void *entry, unsigned long irq_flags, int pc)
...@@ -526,7 +526,7 @@ event_trigger_unlock_commit(struct ftrace_event_file *file, ...@@ -526,7 +526,7 @@ event_trigger_unlock_commit(struct ftrace_event_file *file,
* trace_buffer_unlock_commit_regs() instead of trace_buffer_unlock_commit(). * trace_buffer_unlock_commit_regs() instead of trace_buffer_unlock_commit().
*/ */
static inline void static inline void
event_trigger_unlock_commit_regs(struct ftrace_event_file *file, event_trigger_unlock_commit_regs(struct trace_event_file *file,
struct ring_buffer *buffer, struct ring_buffer *buffer,
struct ring_buffer_event *event, struct ring_buffer_event *event,
void *entry, unsigned long irq_flags, int pc, void *entry, unsigned long irq_flags, int pc,
......
include/trace/perf.h
View file @ 7f1d2f82
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
* *
* static void ftrace_raw_event_<call>(void *__data, proto) * static void ftrace_raw_event_<call>(void *__data, proto)
* { * {
* struct ftrace_event_file *ftrace_file = __data; * struct trace_event_file *trace_file = __data;
* struct ftrace_event_call *event_call = ftrace_file->event_call; * struct ftrace_event_call *event_call = trace_file->event_call;
* struct ftrace_data_offsets_<call> __maybe_unused __data_offsets; * struct ftrace_data_offsets_<call> __maybe_unused __data_offsets;
* unsigned long eflags = ftrace_file->flags; * unsigned long eflags = trace_file->flags;
* enum event_trigger_type __tt = ETT_NONE; * enum event_trigger_type __tt = ETT_NONE;
* struct ring_buffer_event *event; * struct ring_buffer_event *event;
* struct ftrace_raw_<call> *entry; <-- defined in stage 1 * struct ftrace_raw_<call> *entry; <-- defined in stage 1
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* *
* if (!(eflags & FTRACE_EVENT_FL_TRIGGER_COND)) { * if (!(eflags & FTRACE_EVENT_FL_TRIGGER_COND)) {
* if (eflags & FTRACE_EVENT_FL_TRIGGER_MODE) * if (eflags & FTRACE_EVENT_FL_TRIGGER_MODE)
* event_triggers_call(ftrace_file, NULL); * event_triggers_call(trace_file, NULL);
* if (eflags & FTRACE_EVENT_FL_SOFT_DISABLED) * if (eflags & FTRACE_EVENT_FL_SOFT_DISABLED)
* return; * return;
* } * }
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
* *
* __data_size = ftrace_get_offsets_<call>(&__data_offsets, args); * __data_size = ftrace_get_offsets_<call>(&__data_offsets, args);
* *
* event = trace_event_buffer_lock_reserve(&buffer, ftrace_file, * event = trace_event_buffer_lock_reserve(&buffer, trace_file,
* event_<call>->event.type, * event_<call>->event.type,
* sizeof(*entry) + __data_size, * sizeof(*entry) + __data_size,
* irq_flags, pc); * irq_flags, pc);
...@@ -45,16 +45,16 @@ ...@@ -45,16 +45,16 @@
* __array macros. * __array macros.
* *
* if (eflags & FTRACE_EVENT_FL_TRIGGER_COND) * if (eflags & FTRACE_EVENT_FL_TRIGGER_COND)
* __tt = event_triggers_call(ftrace_file, entry); * __tt = event_triggers_call(trace_file, entry);
* *
* if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT, * if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT,
* &ftrace_file->flags)) * &trace_file->flags))
* ring_buffer_discard_commit(buffer, event); * ring_buffer_discard_commit(buffer, event);
* else if (!filter_check_discard(ftrace_file, entry, buffer, event)) * else if (!filter_check_discard(trace_file, entry, buffer, event))
* trace_buffer_unlock_commit(buffer, event, irq_flags, pc); * trace_buffer_unlock_commit(buffer, event, irq_flags, pc);
* *
* if (__tt) * if (__tt)
* event_triggers_post_call(ftrace_file, __tt); * event_triggers_post_call(trace_file, __tt);
* } * }
* *
* static struct trace_event ftrace_event_type_<call> = { * static struct trace_event ftrace_event_type_<call> = {
...@@ -153,18 +153,18 @@ ...@@ -153,18 +153,18 @@
static notrace void \ static notrace void \
ftrace_raw_event_##call(void *__data, proto) \ ftrace_raw_event_##call(void *__data, proto) \
{ \ { \
struct ftrace_event_file *ftrace_file = __data; \ struct trace_event_file *trace_file = __data; \
struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\ struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\
struct ftrace_event_buffer fbuffer; \ struct ftrace_event_buffer fbuffer; \
struct ftrace_raw_##call *entry; \ struct ftrace_raw_##call *entry; \
int __data_size; \ int __data_size; \
\ \
if (ftrace_trigger_soft_disabled(ftrace_file)) \ if (ftrace_trigger_soft_disabled(trace_file)) \
return; \ return; \
\ \
__data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \
\ \
entry = ftrace_event_buffer_reserve(&fbuffer, ftrace_file, \ entry = ftrace_event_buffer_reserve(&fbuffer, trace_file, \
sizeof(*entry) + __data_size); \ sizeof(*entry) + __data_size); \
\ \
if (!entry) \ if (!entry) \
......
kernel/trace/trace.c
View file @ 7f1d2f82
...@@ -297,7 +297,7 @@ void trace_array_put(struct trace_array *this_tr) ...@@ -297,7 +297,7 @@ void trace_array_put(struct trace_array *this_tr)
mutex_unlock(&trace_types_lock); mutex_unlock(&trace_types_lock);
} }
int filter_check_discard(struct ftrace_event_file *file, void *rec, int filter_check_discard(struct trace_event_file *file, void *rec,
struct ring_buffer *buffer, struct ring_buffer *buffer,
struct ring_buffer_event *event) struct ring_buffer_event *event)
{ {
...@@ -1694,13 +1694,13 @@ static struct ring_buffer *temp_buffer; ...@@ -1694,13 +1694,13 @@ static struct ring_buffer *temp_buffer;
struct ring_buffer_event * struct ring_buffer_event *
trace_event_buffer_lock_reserve(struct ring_buffer **current_rb, trace_event_buffer_lock_reserve(struct ring_buffer **current_rb,
struct ftrace_event_file *ftrace_file, struct trace_event_file *trace_file,
int type, unsigned long len, int type, unsigned long len,
unsigned long flags, int pc) unsigned long flags, int pc)
{ {
struct ring_buffer_event *entry; struct ring_buffer_event *entry;
*current_rb = ftrace_file->tr->trace_buffer.buffer; *current_rb = trace_file->tr->trace_buffer.buffer;
entry = trace_buffer_lock_reserve(*current_rb, entry = trace_buffer_lock_reserve(*current_rb,
type, len, flags, pc); type, len, flags, pc);
/* /*
...@@ -1709,7 +1709,7 @@ trace_event_buffer_lock_reserve(struct ring_buffer **current_rb, ...@@ -1709,7 +1709,7 @@ trace_event_buffer_lock_reserve(struct ring_buffer **current_rb,
* to store the trace event for the tigger to use. It's recusive * to store the trace event for the tigger to use. It's recusive
* safe and will not be recorded anywhere. * safe and will not be recorded anywhere.
*/ */
if (!entry && ftrace_file->flags & FTRACE_EVENT_FL_TRIGGER_COND) { if (!entry && trace_file->flags & FTRACE_EVENT_FL_TRIGGER_COND) {
*current_rb = temp_buffer; *current_rb = temp_buffer;
entry = trace_buffer_lock_reserve(*current_rb, entry = trace_buffer_lock_reserve(*current_rb,
type, len, flags, pc); type, len, flags, pc);
......
kernel/trace/trace.h
View file @ 7f1d2f82
...@@ -211,8 +211,8 @@ struct trace_array { ...@@ -211,8 +211,8 @@ struct trace_array {
#ifdef CONFIG_FTRACE_SYSCALLS #ifdef CONFIG_FTRACE_SYSCALLS
int sys_refcount_enter; int sys_refcount_enter;
int sys_refcount_exit; int sys_refcount_exit;
struct ftrace_event_file __rcu *enter_syscall_files[NR_syscalls]; struct trace_event_file __rcu *enter_syscall_files[NR_syscalls];
struct ftrace_event_file __rcu *exit_syscall_files[NR_syscalls]; struct trace_event_file __rcu *exit_syscall_files[NR_syscalls];
#endif #endif
int stop_count; int stop_count;
int clock_id; int clock_id;
...@@ -1052,9 +1052,9 @@ struct filter_pred { ...@@ -1052,9 +1052,9 @@ struct filter_pred {
extern enum regex_type extern enum regex_type
filter_parse_regex(char *buff, int len, char **search, int *not); filter_parse_regex(char *buff, int len, char **search, int *not);
extern void print_event_filter(struct ftrace_event_file *file, extern void print_event_filter(struct trace_event_file *file,
struct trace_seq *s); struct trace_seq *s);
extern int apply_event_filter(struct ftrace_event_file *file, extern int apply_event_filter(struct trace_event_file *file,
char *filter_string); char *filter_string);
extern int apply_subsystem_event_filter(struct ftrace_subsystem_dir *dir, extern int apply_subsystem_event_filter(struct ftrace_subsystem_dir *dir,
char *filter_string); char *filter_string);
...@@ -1073,9 +1073,9 @@ extern void trace_event_enable_cmd_record(bool enable); ...@@ -1073,9 +1073,9 @@ extern void trace_event_enable_cmd_record(bool enable);
extern int event_trace_add_tracer(struct dentry *parent, struct trace_array *tr); extern int event_trace_add_tracer(struct dentry *parent, struct trace_array *tr);
extern int event_trace_del_tracer(struct trace_array *tr); extern int event_trace_del_tracer(struct trace_array *tr);
extern struct ftrace_event_file *find_event_file(struct trace_array *tr, extern struct trace_event_file *find_event_file(struct trace_array *tr,
const char *system, const char *system,
const char *event); const char *event);
static inline void *event_file_data(struct file *filp) static inline void *event_file_data(struct file *filp)
{ {
...@@ -1242,23 +1242,23 @@ struct event_command { ...@@ -1242,23 +1242,23 @@ struct event_command {
enum event_trigger_type trigger_type; enum event_trigger_type trigger_type;
bool post_trigger; bool post_trigger;
int (*func)(struct event_command *cmd_ops, int (*func)(struct event_command *cmd_ops,
struct ftrace_event_file *file, struct trace_event_file *file,
char *glob, char *cmd, char *params); char *glob, char *cmd, char *params);
int (*reg)(char *glob, int (*reg)(char *glob,
struct event_trigger_ops *ops, struct event_trigger_ops *ops,
struct event_trigger_data *data, struct event_trigger_data *data,
struct ftrace_event_file *file); struct trace_event_file *file);
void (*unreg)(char *glob, void (*unreg)(char *glob,
struct event_trigger_ops *ops, struct event_trigger_ops *ops,
struct event_trigger_data *data, struct event_trigger_data *data,
struct ftrace_event_file *file); struct trace_event_file *file);
int (*set_filter)(char *filter_str, int (*set_filter)(char *filter_str,
struct event_trigger_data *data, struct event_trigger_data *data,
struct ftrace_event_file *file); struct trace_event_file *file);
struct event_trigger_ops *(*get_trigger_ops)(char *cmd, char *param); struct event_trigger_ops *(*get_trigger_ops)(char *cmd, char *param);
}; };
extern int trace_event_enable_disable(struct ftrace_event_file *file, extern int trace_event_enable_disable(struct trace_event_file *file,
int enable, int soft_disable); int enable, int soft_disable);
extern int tracing_alloc_snapshot(void); extern int tracing_alloc_snapshot(void);
......
kernel/trace/trace_events.c
View file @ 7f1d2f82
This diff is collapsed.
kernel/trace/trace_events_filter.c
View file @ 7f1d2f82
...@@ -643,7 +643,7 @@ static void append_filter_err(struct filter_parse_state *ps, ...@@ -643,7 +643,7 @@ static void append_filter_err(struct filter_parse_state *ps,
free_page((unsigned long) buf); free_page((unsigned long) buf);
} }
static inline struct event_filter *event_filter(struct ftrace_event_file *file) static inline struct event_filter *event_filter(struct trace_event_file *file)
{ {
if (file->event_call->flags & TRACE_EVENT_FL_USE_CALL_FILTER) if (file->event_call->flags & TRACE_EVENT_FL_USE_CALL_FILTER)
return file->event_call->filter; return file->event_call->filter;
...@@ -652,7 +652,7 @@ static inline struct event_filter *event_filter(struct ftrace_event_file *file) ...@@ -652,7 +652,7 @@ static inline struct event_filter *event_filter(struct ftrace_event_file *file)
} }
/* caller must hold event_mutex */ /* caller must hold event_mutex */
void print_event_filter(struct ftrace_event_file *file, struct trace_seq *s) void print_event_filter(struct trace_event_file *file, struct trace_seq *s)
{ {
struct event_filter *filter = event_filter(file); struct event_filter *filter = event_filter(file);
...@@ -780,7 +780,7 @@ static void __free_preds(struct event_filter *filter) ...@@ -780,7 +780,7 @@ static void __free_preds(struct event_filter *filter)
filter->n_preds = 0; filter->n_preds = 0;
} }
static void filter_disable(struct ftrace_event_file *file) static void filter_disable(struct trace_event_file *file)
{ {
struct ftrace_event_call *call = file->event_call; struct ftrace_event_call *call = file->event_call;
...@@ -837,7 +837,7 @@ static int __alloc_preds(struct event_filter *filter, int n_preds) ...@@ -837,7 +837,7 @@ static int __alloc_preds(struct event_filter *filter, int n_preds)
return 0; return 0;
} }
static inline void __remove_filter(struct ftrace_event_file *file) static inline void __remove_filter(struct trace_event_file *file)
{ {
struct ftrace_event_call *call = file->event_call; struct ftrace_event_call *call = file->event_call;
...@@ -851,7 +851,7 @@ static inline void __remove_filter(struct ftrace_event_file *file) ...@@ -851,7 +851,7 @@ static inline void __remove_filter(struct ftrace_event_file *file)
static void filter_free_subsystem_preds(struct ftrace_subsystem_dir *dir, static void filter_free_subsystem_preds(struct ftrace_subsystem_dir *dir,
struct trace_array *tr) struct trace_array *tr)
{ {
struct ftrace_event_file *file; struct trace_event_file *file;
list_for_each_entry(file, &tr->events, list) { list_for_each_entry(file, &tr->events, list) {
if (file->system != dir) if (file->system != dir)
...@@ -860,7 +860,7 @@ static void filter_free_subsystem_preds(struct ftrace_subsystem_dir *dir, ...@@ -860,7 +860,7 @@ static void filter_free_subsystem_preds(struct ftrace_subsystem_dir *dir,
} }
} }
static inline void __free_subsystem_filter(struct ftrace_event_file *file) static inline void __free_subsystem_filter(struct trace_event_file *file)
{ {
struct ftrace_event_call *call = file->event_call; struct ftrace_event_call *call = file->event_call;
...@@ -876,7 +876,7 @@ static inline void __free_subsystem_filter(struct ftrace_event_file *file) ...@@ -876,7 +876,7 @@ static inline void __free_subsystem_filter(struct ftrace_event_file *file)
static void filter_free_subsystem_filters(struct ftrace_subsystem_dir *dir, static void filter_free_subsystem_filters(struct ftrace_subsystem_dir *dir,
struct trace_array *tr) struct trace_array *tr)
{ {
struct ftrace_event_file *file; struct trace_event_file *file;
list_for_each_entry(file, &tr->events, list) { list_for_each_entry(file, &tr->events, list) {
if (file->system != dir) if (file->system != dir)
...@@ -1662,7 +1662,7 @@ static int replace_preds(struct ftrace_event_call *call, ...@@ -1662,7 +1662,7 @@ static int replace_preds(struct ftrace_event_call *call,
return err; return err;
} }
static inline void event_set_filtered_flag(struct ftrace_event_file *file) static inline void event_set_filtered_flag(struct trace_event_file *file)
{ {
struct ftrace_event_call *call = file->event_call; struct ftrace_event_call *call = file->event_call;
...@@ -1672,7 +1672,7 @@ static inline void event_set_filtered_flag(struct ftrace_event_file *file) ...@@ -1672,7 +1672,7 @@ static inline void event_set_filtered_flag(struct ftrace_event_file *file)
file->flags |= FTRACE_EVENT_FL_FILTERED; file->flags |= FTRACE_EVENT_FL_FILTERED;
} }
static inline void event_set_filter(struct ftrace_event_file *file, static inline void event_set_filter(struct trace_event_file *file,
struct event_filter *filter) struct event_filter *filter)
{ {
struct ftrace_event_call *call = file->event_call; struct ftrace_event_call *call = file->event_call;
...@@ -1683,7 +1683,7 @@ static inline void event_set_filter(struct ftrace_event_file *file, ...@@ -1683,7 +1683,7 @@ static inline void event_set_filter(struct ftrace_event_file *file,
rcu_assign_pointer(file->filter, filter); rcu_assign_pointer(file->filter, filter);
} }
static inline void event_clear_filter(struct ftrace_event_file *file) static inline void event_clear_filter(struct trace_event_file *file)
{ {
struct ftrace_event_call *call = file->event_call; struct ftrace_event_call *call = file->event_call;
...@@ -1694,7 +1694,7 @@ static inline void event_clear_filter(struct ftrace_event_file *file) ...@@ -1694,7 +1694,7 @@ static inline void event_clear_filter(struct ftrace_event_file *file)
} }
static inline void static inline void
event_set_no_set_filter_flag(struct ftrace_event_file *file) event_set_no_set_filter_flag(struct trace_event_file *file)
{ {
struct ftrace_event_call *call = file->event_call; struct ftrace_event_call *call = file->event_call;
...@@ -1705,7 +1705,7 @@ event_set_no_set_filter_flag(struct ftrace_event_file *file) ...@@ -1705,7 +1705,7 @@ event_set_no_set_filter_flag(struct ftrace_event_file *file)
} }
static inline void static inline void
event_clear_no_set_filter_flag(struct ftrace_event_file *file) event_clear_no_set_filter_flag(struct trace_event_file *file)
{ {
struct ftrace_event_call *call = file->event_call; struct ftrace_event_call *call = file->event_call;
...@@ -1716,7 +1716,7 @@ event_clear_no_set_filter_flag(struct ftrace_event_file *file) ...@@ -1716,7 +1716,7 @@ event_clear_no_set_filter_flag(struct ftrace_event_file *file)
} }
static inline bool static inline bool
event_no_set_filter_flag(struct ftrace_event_file *file) event_no_set_filter_flag(struct trace_event_file *file)
{ {
struct ftrace_event_call *call = file->event_call; struct ftrace_event_call *call = file->event_call;
...@@ -1740,7 +1740,7 @@ static int replace_system_preds(struct ftrace_subsystem_dir *dir, ...@@ -1740,7 +1740,7 @@ static int replace_system_preds(struct ftrace_subsystem_dir *dir,
struct filter_parse_state *ps, struct filter_parse_state *ps,
char *filter_string) char *filter_string)
{ {
struct ftrace_event_file *file; struct trace_event_file *file;
struct filter_list *filter_item; struct filter_list *filter_item;
struct filter_list *tmp; struct filter_list *tmp;
LIST_HEAD(filter_list); LIST_HEAD(filter_list);
...@@ -1961,7 +1961,7 @@ static int create_system_filter(struct ftrace_subsystem_dir *dir, ...@@ -1961,7 +1961,7 @@ static int create_system_filter(struct ftrace_subsystem_dir *dir,
} }
/* caller must hold event_mutex */ /* caller must hold event_mutex */
int apply_event_filter(struct ftrace_event_file *file, char *filter_string) int apply_event_filter(struct trace_event_file *file, char *filter_string)
{ {
struct ftrace_event_call *call = file->event_call; struct ftrace_event_call *call = file->event_call;
struct event_filter *filter; struct event_filter *filter;
......
kernel/trace/trace_events_trigger.c
View file @ 7f1d2f82
...@@ -40,7 +40,7 @@ trigger_data_free(struct event_trigger_data *data) ...@@ -40,7 +40,7 @@ trigger_data_free(struct event_trigger_data *data)
/** /**
* event_triggers_call - Call triggers associated with a trace event * event_triggers_call - Call triggers associated with a trace event
* @file: The ftrace_event_file associated with the event * @file: The trace_event_file associated with the event
* @rec: The trace entry for the event, NULL for unconditional invocation * @rec: The trace entry for the event, NULL for unconditional invocation
* *
* For each trigger associated with an event, invoke the trigger * For each trigger associated with an event, invoke the trigger
...@@ -63,7 +63,7 @@ trigger_data_free(struct event_trigger_data *data) ...@@ -63,7 +63,7 @@ trigger_data_free(struct event_trigger_data *data)
* any trigger that should be deferred, ETT_NONE if nothing to defer. * any trigger that should be deferred, ETT_NONE if nothing to defer.
*/ */
enum event_trigger_type enum event_trigger_type
event_triggers_call(struct ftrace_event_file *file, void *rec) event_triggers_call(struct trace_event_file *file, void *rec)
{ {
struct event_trigger_data *data; struct event_trigger_data *data;
enum event_trigger_type tt = ETT_NONE; enum event_trigger_type tt = ETT_NONE;
...@@ -92,7 +92,7 @@ EXPORT_SYMBOL_GPL(event_triggers_call); ...@@ -92,7 +92,7 @@ EXPORT_SYMBOL_GPL(event_triggers_call);
/** /**
* event_triggers_post_call - Call 'post_triggers' for a trace event * event_triggers_post_call - Call 'post_triggers' for a trace event
* @file: The ftrace_event_file associated with the event * @file: The trace_event_file associated with the event
* @tt: enum event_trigger_type containing a set bit for each trigger to invoke * @tt: enum event_trigger_type containing a set bit for each trigger to invoke
* *
* For each trigger associated with an event, invoke the trigger * For each trigger associated with an event, invoke the trigger
...@@ -103,7 +103,7 @@ EXPORT_SYMBOL_GPL(event_triggers_call); ...@@ -103,7 +103,7 @@ EXPORT_SYMBOL_GPL(event_triggers_call);
* Called from tracepoint handlers (with rcu_read_lock_sched() held). * Called from tracepoint handlers (with rcu_read_lock_sched() held).
*/ */
void void
event_triggers_post_call(struct ftrace_event_file *file, event_triggers_post_call(struct trace_event_file *file,
enum event_trigger_type tt) enum event_trigger_type tt)
{ {
struct event_trigger_data *data; struct event_trigger_data *data;
...@@ -119,7 +119,7 @@ EXPORT_SYMBOL_GPL(event_triggers_post_call); ...@@ -119,7 +119,7 @@ EXPORT_SYMBOL_GPL(event_triggers_post_call);
static void *trigger_next(struct seq_file *m, void *t, loff_t *pos) static void *trigger_next(struct seq_file *m, void *t, loff_t *pos)
{ {
struct ftrace_event_file *event_file = event_file_data(m->private); struct trace_event_file *event_file = event_file_data(m->private);
if (t == SHOW_AVAILABLE_TRIGGERS) if (t == SHOW_AVAILABLE_TRIGGERS)
return NULL; return NULL;
...@@ -129,7 +129,7 @@ static void *trigger_next(struct seq_file *m, void *t, loff_t *pos) ...@@ -129,7 +129,7 @@ static void *trigger_next(struct seq_file *m, void *t, loff_t *pos)
static void *trigger_start(struct seq_file *m, loff_t *pos) static void *trigger_start(struct seq_file *m, loff_t *pos)
{ {
struct ftrace_event_file *event_file; struct trace_event_file *event_file;
/* ->stop() is called even if ->start() fails */ /* ->stop() is called even if ->start() fails */
mutex_lock(&event_mutex); mutex_lock(&event_mutex);
...@@ -201,7 +201,7 @@ static int event_trigger_regex_open(struct inode *inode, struct file *file) ...@@ -201,7 +201,7 @@ static int event_trigger_regex_open(struct inode *inode, struct file *file)
return ret; return ret;
} }
static int trigger_process_regex(struct ftrace_event_file *file, char *buff) static int trigger_process_regex(struct trace_event_file *file, char *buff)
{ {
char *command, *next = buff; char *command, *next = buff;
struct event_command *p; struct event_command *p;
...@@ -227,7 +227,7 @@ static ssize_t event_trigger_regex_write(struct file *file, ...@@ -227,7 +227,7 @@ static ssize_t event_trigger_regex_write(struct file *file,
const char __user *ubuf, const char __user *ubuf,
size_t cnt, loff_t *ppos) size_t cnt, loff_t *ppos)
{ {
struct ftrace_event_file *event_file; struct trace_event_file *event_file;
ssize_t ret; ssize_t ret;
char *buf; char *buf;
...@@ -430,7 +430,7 @@ event_trigger_free(struct event_trigger_ops *ops, ...@@ -430,7 +430,7 @@ event_trigger_free(struct event_trigger_ops *ops,
trigger_data_free(data); trigger_data_free(data);
} }
static int trace_event_trigger_enable_disable(struct ftrace_event_file *file, static int trace_event_trigger_enable_disable(struct trace_event_file *file,
int trigger_enable) int trigger_enable)
{ {
int ret = 0; int ret = 0;
...@@ -466,7 +466,7 @@ static int trace_event_trigger_enable_disable(struct ftrace_event_file *file, ...@@ -466,7 +466,7 @@ static int trace_event_trigger_enable_disable(struct ftrace_event_file *file,
void void
clear_event_triggers(struct trace_array *tr) clear_event_triggers(struct trace_array *tr)
{ {
struct ftrace_event_file *file; struct trace_event_file *file;
list_for_each_entry(file, &tr->events, list) { list_for_each_entry(file, &tr->events, list) {
struct event_trigger_data *data; struct event_trigger_data *data;
...@@ -480,7 +480,7 @@ clear_event_triggers(struct trace_array *tr) ...@@ -480,7 +480,7 @@ clear_event_triggers(struct trace_array *tr)
/** /**
* update_cond_flag - Set or reset the TRIGGER_COND bit * update_cond_flag - Set or reset the TRIGGER_COND bit
* @file: The ftrace_event_file associated with the event * @file: The trace_event_file associated with the event
* *
* If an event has triggers and any of those triggers has a filter or * If an event has triggers and any of those triggers has a filter or
* a post_trigger, trigger invocation needs to be deferred until after * a post_trigger, trigger invocation needs to be deferred until after
...@@ -488,7 +488,7 @@ clear_event_triggers(struct trace_array *tr) ...@@ -488,7 +488,7 @@ clear_event_triggers(struct trace_array *tr)
* its TRIGGER_COND bit set, otherwise the TRIGGER_COND bit should be * its TRIGGER_COND bit set, otherwise the TRIGGER_COND bit should be
* cleared. * cleared.
*/ */
static void update_cond_flag(struct ftrace_event_file *file) static void update_cond_flag(struct trace_event_file *file)
{ {
struct event_trigger_data *data; struct event_trigger_data *data;
bool set_cond = false; bool set_cond = false;
...@@ -511,7 +511,7 @@ static void update_cond_flag(struct ftrace_event_file *file) ...@@ -511,7 +511,7 @@ static void update_cond_flag(struct ftrace_event_file *file)
* @glob: The raw string used to register the trigger * @glob: The raw string used to register the trigger
* @ops: The trigger ops associated with the trigger * @ops: The trigger ops associated with the trigger
* @data: Trigger-specific data to associate with the trigger * @data: Trigger-specific data to associate with the trigger
* @file: The ftrace_event_file associated with the event * @file: The trace_event_file associated with the event
* *
* Common implementation for event trigger registration. * Common implementation for event trigger registration.
* *
...@@ -522,7 +522,7 @@ static void update_cond_flag(struct ftrace_event_file *file) ...@@ -522,7 +522,7 @@ static void update_cond_flag(struct ftrace_event_file *file)
*/ */
static int register_trigger(char *glob, struct event_trigger_ops *ops, static int register_trigger(char *glob, struct event_trigger_ops *ops,
struct event_trigger_data *data, struct event_trigger_data *data,
struct ftrace_event_file *file) struct trace_event_file *file)
{ {
struct event_trigger_data *test; struct event_trigger_data *test;
int ret = 0; int ret = 0;
...@@ -557,7 +557,7 @@ static int register_trigger(char *glob, struct event_trigger_ops *ops, ...@@ -557,7 +557,7 @@ static int register_trigger(char *glob, struct event_trigger_ops *ops,
* @glob: The raw string used to register the trigger * @glob: The raw string used to register the trigger
* @ops: The trigger ops associated with the trigger * @ops: The trigger ops associated with the trigger
* @test: Trigger-specific data used to find the trigger to remove * @test: Trigger-specific data used to find the trigger to remove
* @file: The ftrace_event_file associated with the event * @file: The trace_event_file associated with the event
* *
* Common implementation for event trigger unregistration. * Common implementation for event trigger unregistration.
* *
...@@ -566,7 +566,7 @@ static int register_trigger(char *glob, struct event_trigger_ops *ops, ...@@ -566,7 +566,7 @@ static int register_trigger(char *glob, struct event_trigger_ops *ops,
*/ */
static void unregister_trigger(char *glob, struct event_trigger_ops *ops, static void unregister_trigger(char *glob, struct event_trigger_ops *ops,
struct event_trigger_data *test, struct event_trigger_data *test,
struct ftrace_event_file *file) struct trace_event_file *file)
{ {
struct event_trigger_data *data; struct event_trigger_data *data;
bool unregistered = false; bool unregistered = false;
...@@ -588,7 +588,7 @@ static void unregister_trigger(char *glob, struct event_trigger_ops *ops, ...@@ -588,7 +588,7 @@ static void unregister_trigger(char *glob, struct event_trigger_ops *ops,
/** /**
* event_trigger_callback - Generic event_command @func implementation * event_trigger_callback - Generic event_command @func implementation
* @cmd_ops: The command ops, used for trigger registration * @cmd_ops: The command ops, used for trigger registration
* @file: The ftrace_event_file associated with the event * @file: The trace_event_file associated with the event
* @glob: The raw string used to register the trigger * @glob: The raw string used to register the trigger
* @cmd: The cmd portion of the string used to register the trigger * @cmd: The cmd portion of the string used to register the trigger
* @param: The params portion of the string used to register the trigger * @param: The params portion of the string used to register the trigger
...@@ -603,7 +603,7 @@ static void unregister_trigger(char *glob, struct event_trigger_ops *ops, ...@@ -603,7 +603,7 @@ static void unregister_trigger(char *glob, struct event_trigger_ops *ops,
*/ */
static int static int
event_trigger_callback(struct event_command *cmd_ops, event_trigger_callback(struct event_command *cmd_ops,
struct ftrace_event_file *file, struct trace_event_file *file,
char *glob, char *cmd, char *param) char *glob, char *cmd, char *param)
{ {
struct event_trigger_data *trigger_data; struct event_trigger_data *trigger_data;
...@@ -688,7 +688,7 @@ event_trigger_callback(struct event_command *cmd_ops, ...@@ -688,7 +688,7 @@ event_trigger_callback(struct event_command *cmd_ops,
* set_trigger_filter - Generic event_command @set_filter implementation * set_trigger_filter - Generic event_command @set_filter implementation
* @filter_str: The filter string for the trigger, NULL to remove filter * @filter_str: The filter string for the trigger, NULL to remove filter
* @trigger_data: Trigger-specific data * @trigger_data: Trigger-specific data
* @file: The ftrace_event_file associated with the event * @file: The trace_event_file associated with the event
* *
* Common implementation for event command filter parsing and filter * Common implementation for event command filter parsing and filter
* instantiation. * instantiation.
...@@ -702,7 +702,7 @@ event_trigger_callback(struct event_command *cmd_ops, ...@@ -702,7 +702,7 @@ event_trigger_callback(struct event_command *cmd_ops,
*/ */
static int set_trigger_filter(char *filter_str, static int set_trigger_filter(char *filter_str,
struct event_trigger_data *trigger_data, struct event_trigger_data *trigger_data,
struct ftrace_event_file *file) struct trace_event_file *file)
{ {
struct event_trigger_data *data = trigger_data; struct event_trigger_data *data = trigger_data;
struct event_filter *filter = NULL, *tmp; struct event_filter *filter = NULL, *tmp;
...@@ -900,7 +900,7 @@ snapshot_count_trigger(struct event_trigger_data *data) ...@@ -900,7 +900,7 @@ snapshot_count_trigger(struct event_trigger_data *data)
static int static int
register_snapshot_trigger(char *glob, struct event_trigger_ops *ops, register_snapshot_trigger(char *glob, struct event_trigger_ops *ops,
struct event_trigger_data *data, struct event_trigger_data *data,
struct ftrace_event_file *file) struct trace_event_file *file)
{ {
int ret = register_trigger(glob, ops, data, file); int ret = register_trigger(glob, ops, data, file);
...@@ -1053,7 +1053,7 @@ static __init void unregister_trigger_traceon_traceoff_cmds(void) ...@@ -1053,7 +1053,7 @@ static __init void unregister_trigger_traceon_traceoff_cmds(void)
#define DISABLE_EVENT_STR "disable_event" #define DISABLE_EVENT_STR "disable_event"
struct enable_trigger_data { struct enable_trigger_data {
struct ftrace_event_file *file; struct trace_event_file *file;
bool enable; bool enable;
}; };
...@@ -1159,10 +1159,10 @@ static struct event_trigger_ops event_disable_count_trigger_ops = { ...@@ -1159,10 +1159,10 @@ static struct event_trigger_ops event_disable_count_trigger_ops = {
static int static int
event_enable_trigger_func(struct event_command *cmd_ops, event_enable_trigger_func(struct event_command *cmd_ops,
struct ftrace_event_file *file, struct trace_event_file *file,
char *glob, char *cmd, char *param) char *glob, char *cmd, char *param)
{ {
struct ftrace_event_file *event_enable_file; struct trace_event_file *event_enable_file;
struct enable_trigger_data *enable_data; struct enable_trigger_data *enable_data;
struct event_trigger_data *trigger_data; struct event_trigger_data *trigger_data;
struct event_trigger_ops *trigger_ops; struct event_trigger_ops *trigger_ops;
...@@ -1294,7 +1294,7 @@ event_enable_trigger_func(struct event_command *cmd_ops, ...@@ -1294,7 +1294,7 @@ event_enable_trigger_func(struct event_command *cmd_ops,
static int event_enable_register_trigger(char *glob, static int event_enable_register_trigger(char *glob,
struct event_trigger_ops *ops, struct event_trigger_ops *ops,
struct event_trigger_data *data, struct event_trigger_data *data,
struct ftrace_event_file *file) struct trace_event_file *file)
{ {
struct enable_trigger_data *enable_data = data->private_data; struct enable_trigger_data *enable_data = data->private_data;
struct enable_trigger_data *test_enable_data; struct enable_trigger_data *test_enable_data;
...@@ -1331,7 +1331,7 @@ static int event_enable_register_trigger(char *glob, ...@@ -1331,7 +1331,7 @@ static int event_enable_register_trigger(char *glob,
static void event_enable_unregister_trigger(char *glob, static void event_enable_unregister_trigger(char *glob,
struct event_trigger_ops *ops, struct event_trigger_ops *ops,
struct event_trigger_data *test, struct event_trigger_data *test,
struct ftrace_event_file *file) struct trace_event_file *file)
{ {
struct enable_trigger_data *test_enable_data = test->private_data; struct enable_trigger_data *test_enable_data = test->private_data;
struct enable_trigger_data *enable_data; struct enable_trigger_data *enable_data;
......
kernel/trace/trace_kprobe.c
View file @ 7f1d2f82
...@@ -359,7 +359,7 @@ static struct trace_kprobe *find_trace_kprobe(const char *event, ...@@ -359,7 +359,7 @@ static struct trace_kprobe *find_trace_kprobe(const char *event,
* if the file is NULL, enable "perf" handler, or enable "trace" handler. * if the file is NULL, enable "perf" handler, or enable "trace" handler.
*/ */
static int static int
enable_trace_kprobe(struct trace_kprobe *tk, struct ftrace_event_file *file) enable_trace_kprobe(struct trace_kprobe *tk, struct trace_event_file *file)
{ {
int ret = 0; int ret = 0;
...@@ -394,7 +394,7 @@ enable_trace_kprobe(struct trace_kprobe *tk, struct ftrace_event_file *file) ...@@ -394,7 +394,7 @@ enable_trace_kprobe(struct trace_kprobe *tk, struct ftrace_event_file *file)
* if the file is NULL, disable "perf" handler, or disable "trace" handler. * if the file is NULL, disable "perf" handler, or disable "trace" handler.
*/ */
static int static int
disable_trace_kprobe(struct trace_kprobe *tk, struct ftrace_event_file *file) disable_trace_kprobe(struct trace_kprobe *tk, struct trace_event_file *file)
{ {
struct event_file_link *link = NULL; struct event_file_link *link = NULL;
int wait = 0; int wait = 0;
...@@ -917,7 +917,7 @@ static const struct file_operations kprobe_profile_ops = { ...@@ -917,7 +917,7 @@ static const struct file_operations kprobe_profile_ops = {
/* Kprobe handler */ /* Kprobe handler */
static nokprobe_inline void static nokprobe_inline void
__kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs, __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs,
struct ftrace_event_file *ftrace_file) struct trace_event_file *trace_file)
{ {
struct kprobe_trace_entry_head *entry; struct kprobe_trace_entry_head *entry;
struct ring_buffer_event *event; struct ring_buffer_event *event;
...@@ -926,9 +926,9 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs, ...@@ -926,9 +926,9 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs,
unsigned long irq_flags; unsigned long irq_flags;
struct ftrace_event_call *call = &tk->tp.call; struct ftrace_event_call *call = &tk->tp.call;
WARN_ON(call != ftrace_file->event_call); WARN_ON(call != trace_file->event_call);
if (ftrace_trigger_soft_disabled(ftrace_file)) if (ftrace_trigger_soft_disabled(trace_file))
return; return;
local_save_flags(irq_flags); local_save_flags(irq_flags);
...@@ -937,7 +937,7 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs, ...@@ -937,7 +937,7 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs,
dsize = __get_data_size(&tk->tp, regs); dsize = __get_data_size(&tk->tp, regs);
size = sizeof(*entry) + tk->tp.size + dsize; size = sizeof(*entry) + tk->tp.size + dsize;
event = trace_event_buffer_lock_reserve(&buffer, ftrace_file, event = trace_event_buffer_lock_reserve(&buffer, trace_file,
call->event.type, call->event.type,
size, irq_flags, pc); size, irq_flags, pc);
if (!event) if (!event)
...@@ -947,7 +947,7 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs, ...@@ -947,7 +947,7 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs,
entry->ip = (unsigned long)tk->rp.kp.addr; entry->ip = (unsigned long)tk->rp.kp.addr;
store_trace_args(sizeof(*entry), &tk->tp, regs, (u8 *)&entry[1], dsize); store_trace_args(sizeof(*entry), &tk->tp, regs, (u8 *)&entry[1], dsize);
event_trigger_unlock_commit_regs(ftrace_file, buffer, event, event_trigger_unlock_commit_regs(trace_file, buffer, event,
entry, irq_flags, pc, regs); entry, irq_flags, pc, regs);
} }
...@@ -965,7 +965,7 @@ NOKPROBE_SYMBOL(kprobe_trace_func); ...@@ -965,7 +965,7 @@ NOKPROBE_SYMBOL(kprobe_trace_func);
static nokprobe_inline void static nokprobe_inline void
__kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri, __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
struct pt_regs *regs, struct pt_regs *regs,
struct ftrace_event_file *ftrace_file) struct trace_event_file *trace_file)
{ {
struct kretprobe_trace_entry_head *entry; struct kretprobe_trace_entry_head *entry;
struct ring_buffer_event *event; struct ring_buffer_event *event;
...@@ -974,9 +974,9 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri, ...@@ -974,9 +974,9 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
unsigned long irq_flags; unsigned long irq_flags;
struct ftrace_event_call *call = &tk->tp.call; struct ftrace_event_call *call = &tk->tp.call;
WARN_ON(call != ftrace_file->event_call); WARN_ON(call != trace_file->event_call);
if (ftrace_trigger_soft_disabled(ftrace_file)) if (ftrace_trigger_soft_disabled(trace_file))
return; return;
local_save_flags(irq_flags); local_save_flags(irq_flags);
...@@ -985,7 +985,7 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri, ...@@ -985,7 +985,7 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
dsize = __get_data_size(&tk->tp, regs); dsize = __get_data_size(&tk->tp, regs);
size = sizeof(*entry) + tk->tp.size + dsize; size = sizeof(*entry) + tk->tp.size + dsize;
event = trace_event_buffer_lock_reserve(&buffer, ftrace_file, event = trace_event_buffer_lock_reserve(&buffer, trace_file,
call->event.type, call->event.type,
size, irq_flags, pc); size, irq_flags, pc);
if (!event) if (!event)
...@@ -996,7 +996,7 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri, ...@@ -996,7 +996,7 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
entry->ret_ip = (unsigned long)ri->ret_addr; entry->ret_ip = (unsigned long)ri->ret_addr;
store_trace_args(sizeof(*entry), &tk->tp, regs, (u8 *)&entry[1], dsize); store_trace_args(sizeof(*entry), &tk->tp, regs, (u8 *)&entry[1], dsize);
event_trigger_unlock_commit_regs(ftrace_file, buffer, event, event_trigger_unlock_commit_regs(trace_file, buffer, event,
entry, irq_flags, pc, regs); entry, irq_flags, pc, regs);
} }
...@@ -1210,7 +1210,7 @@ static int kprobe_register(struct ftrace_event_call *event, ...@@ -1210,7 +1210,7 @@ static int kprobe_register(struct ftrace_event_call *event,
enum trace_reg type, void *data) enum trace_reg type, void *data)
{ {
struct trace_kprobe *tk = (struct trace_kprobe *)event->data; struct trace_kprobe *tk = (struct trace_kprobe *)event->data;
struct ftrace_event_file *file = data; struct trace_event_file *file = data;
switch (type) { switch (type) {
case TRACE_REG_REGISTER: case TRACE_REG_REGISTER:
...@@ -1364,10 +1364,10 @@ static __used int kprobe_trace_selftest_target(int a1, int a2, int a3, ...@@ -1364,10 +1364,10 @@ static __used int kprobe_trace_selftest_target(int a1, int a2, int a3,
return a1 + a2 + a3 + a4 + a5 + a6; return a1 + a2 + a3 + a4 + a5 + a6;
} }
static struct ftrace_event_file * static struct trace_event_file *
find_trace_probe_file(struct trace_kprobe *tk, struct trace_array *tr) find_trace_probe_file(struct trace_kprobe *tk, struct trace_array *tr)
{ {
struct ftrace_event_file *file; struct trace_event_file *file;
list_for_each_entry(file, &tr->events, list) list_for_each_entry(file, &tr->events, list)
if (file->event_call == &tk->tp.call) if (file->event_call == &tk->tp.call)
...@@ -1385,7 +1385,7 @@ static __init int kprobe_trace_self_tests_init(void) ...@@ -1385,7 +1385,7 @@ static __init int kprobe_trace_self_tests_init(void)
int ret, warn = 0; int ret, warn = 0;
int (*target)(int, int, int, int, int, int); int (*target)(int, int, int, int, int, int);
struct trace_kprobe *tk; struct trace_kprobe *tk;
struct ftrace_event_file *file; struct trace_event_file *file;
if (tracing_is_disabled()) if (tracing_is_disabled())
return -ENODEV; return -ENODEV;
......
kernel/trace/trace_probe.h
View file @ 7f1d2f82
...@@ -281,7 +281,7 @@ struct trace_probe { ...@@ -281,7 +281,7 @@ struct trace_probe {
}; };
struct event_file_link { struct event_file_link {
struct ftrace_event_file *file; struct trace_event_file *file;
struct list_head list; struct list_head list;
}; };
...@@ -314,7 +314,7 @@ static inline int is_good_name(const char *name) ...@@ -314,7 +314,7 @@ static inline int is_good_name(const char *name)
} }
static inline struct event_file_link * static inline struct event_file_link *
find_event_file_link(struct trace_probe *tp, struct ftrace_event_file *file) find_event_file_link(struct trace_probe *tp, struct trace_event_file *file)
{ {
struct event_file_link *link; struct event_file_link *link;
......
kernel/trace/trace_syscalls.c
View file @ 7f1d2f82
...@@ -293,7 +293,7 @@ static int __init syscall_exit_define_fields(struct ftrace_event_call *call) ...@@ -293,7 +293,7 @@ static int __init syscall_exit_define_fields(struct ftrace_event_call *call)
static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id) static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id)
{ {
struct trace_array *tr = data; struct trace_array *tr = data;
struct ftrace_event_file *ftrace_file; struct trace_event_file *trace_file;
struct syscall_trace_enter *entry; struct syscall_trace_enter *entry;
struct syscall_metadata *sys_data; struct syscall_metadata *sys_data;
struct ring_buffer_event *event; struct ring_buffer_event *event;
...@@ -308,11 +308,11 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id) ...@@ -308,11 +308,11 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id)
return; return;
/* Here we're inside tp handler's rcu_read_lock_sched (__DO_TRACE) */ /* Here we're inside tp handler's rcu_read_lock_sched (__DO_TRACE) */
ftrace_file = rcu_dereference_sched(tr->enter_syscall_files[syscall_nr]); trace_file = rcu_dereference_sched(tr->enter_syscall_files[syscall_nr]);
if (!ftrace_file) if (!trace_file)
return; return;
if (ftrace_trigger_soft_disabled(ftrace_file)) if (ftrace_trigger_soft_disabled(trace_file))
return; return;
sys_data = syscall_nr_to_meta(syscall_nr); sys_data = syscall_nr_to_meta(syscall_nr);
...@@ -334,14 +334,14 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id) ...@@ -334,14 +334,14 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id)
entry->nr = syscall_nr; entry->nr = syscall_nr;
syscall_get_arguments(current, regs, 0, sys_data->nb_args, entry->args); syscall_get_arguments(current, regs, 0, sys_data->nb_args, entry->args);
event_trigger_unlock_commit(ftrace_file, buffer, event, entry, event_trigger_unlock_commit(trace_file, buffer, event, entry,
irq_flags, pc); irq_flags, pc);
} }
static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret) static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret)
{ {
struct trace_array *tr = data; struct trace_array *tr = data;
struct ftrace_event_file *ftrace_file; struct trace_event_file *trace_file;
struct syscall_trace_exit *entry; struct syscall_trace_exit *entry;
struct syscall_metadata *sys_data; struct syscall_metadata *sys_data;
struct ring_buffer_event *event; struct ring_buffer_event *event;
...@@ -355,11 +355,11 @@ static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret) ...@@ -355,11 +355,11 @@ static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret)
return; return;
/* Here we're inside tp handler's rcu_read_lock_sched (__DO_TRACE()) */ /* Here we're inside tp handler's rcu_read_lock_sched (__DO_TRACE()) */
ftrace_file = rcu_dereference_sched(tr->exit_syscall_files[syscall_nr]); trace_file = rcu_dereference_sched(tr->exit_syscall_files[syscall_nr]);
if (!ftrace_file) if (!trace_file)
return; return;
if (ftrace_trigger_soft_disabled(ftrace_file)) if (ftrace_trigger_soft_disabled(trace_file))
return; return;
sys_data = syscall_nr_to_meta(syscall_nr); sys_data = syscall_nr_to_meta(syscall_nr);
...@@ -380,11 +380,11 @@ static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret) ...@@ -380,11 +380,11 @@ static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret)
entry->nr = syscall_nr; entry->nr = syscall_nr;
entry->ret = syscall_get_return_value(current, regs); entry->ret = syscall_get_return_value(current, regs);
event_trigger_unlock_commit(ftrace_file, buffer, event, entry, event_trigger_unlock_commit(trace_file, buffer, event, entry,
irq_flags, pc); irq_flags, pc);
} }
static int reg_event_syscall_enter(struct ftrace_event_file *file, static int reg_event_syscall_enter(struct trace_event_file *file,
struct ftrace_event_call *call) struct ftrace_event_call *call)
{ {
struct trace_array *tr = file->tr; struct trace_array *tr = file->tr;
...@@ -405,7 +405,7 @@ static int reg_event_syscall_enter(struct ftrace_event_file *file, ...@@ -405,7 +405,7 @@ static int reg_event_syscall_enter(struct ftrace_event_file *file,
return ret; return ret;
} }
static void unreg_event_syscall_enter(struct ftrace_event_file *file, static void unreg_event_syscall_enter(struct trace_event_file *file,
struct ftrace_event_call *call) struct ftrace_event_call *call)
{ {
struct trace_array *tr = file->tr; struct trace_array *tr = file->tr;
...@@ -422,7 +422,7 @@ static void unreg_event_syscall_enter(struct ftrace_event_file *file, ...@@ -422,7 +422,7 @@ static void unreg_event_syscall_enter(struct ftrace_event_file *file,
mutex_unlock(&syscall_trace_lock); mutex_unlock(&syscall_trace_lock);
} }
static int reg_event_syscall_exit(struct ftrace_event_file *file, static int reg_event_syscall_exit(struct trace_event_file *file,
struct ftrace_event_call *call) struct ftrace_event_call *call)
{ {
struct trace_array *tr = file->tr; struct trace_array *tr = file->tr;
...@@ -443,7 +443,7 @@ static int reg_event_syscall_exit(struct ftrace_event_file *file, ...@@ -443,7 +443,7 @@ static int reg_event_syscall_exit(struct ftrace_event_file *file,
return ret; return ret;
} }
static void unreg_event_syscall_exit(struct ftrace_event_file *file, static void unreg_event_syscall_exit(struct trace_event_file *file,
struct ftrace_event_call *call) struct ftrace_event_call *call)
{ {
struct trace_array *tr = file->tr; struct trace_array *tr = file->tr;
...@@ -696,7 +696,7 @@ static void perf_sysexit_disable(struct ftrace_event_call *call) ...@@ -696,7 +696,7 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
static int syscall_enter_register(struct ftrace_event_call *event, static int syscall_enter_register(struct ftrace_event_call *event,
enum trace_reg type, void *data) enum trace_reg type, void *data)
{ {
struct ftrace_event_file *file = data; struct trace_event_file *file = data;
switch (type) { switch (type) {
case TRACE_REG_REGISTER: case TRACE_REG_REGISTER:
...@@ -724,7 +724,7 @@ static int syscall_enter_register(struct ftrace_event_call *event, ...@@ -724,7 +724,7 @@ static int syscall_enter_register(struct ftrace_event_call *event,
static int syscall_exit_register(struct ftrace_event_call *event, static int syscall_exit_register(struct ftrace_event_call *event,
enum trace_reg type, void *data) enum trace_reg type, void *data)
{ {
struct ftrace_event_file *file = data; struct trace_event_file *file = data;
switch (type) { switch (type) {
case TRACE_REG_REGISTER: case TRACE_REG_REGISTER:
......
kernel/trace/trace_uprobe.c
View file @ 7f1d2f82
...@@ -770,7 +770,7 @@ static void uprobe_buffer_put(struct uprobe_cpu_buffer *ucb) ...@@ -770,7 +770,7 @@ static void uprobe_buffer_put(struct uprobe_cpu_buffer *ucb)
static void __uprobe_trace_func(struct trace_uprobe *tu, static void __uprobe_trace_func(struct trace_uprobe *tu,
unsigned long func, struct pt_regs *regs, unsigned long func, struct pt_regs *regs,
struct uprobe_cpu_buffer *ucb, int dsize, struct uprobe_cpu_buffer *ucb, int dsize,
struct ftrace_event_file *ftrace_file) struct trace_event_file *trace_file)
{ {
struct uprobe_trace_entry_head *entry; struct uprobe_trace_entry_head *entry;
struct ring_buffer_event *event; struct ring_buffer_event *event;
...@@ -779,17 +779,17 @@ static void __uprobe_trace_func(struct trace_uprobe *tu, ...@@ -779,17 +779,17 @@ static void __uprobe_trace_func(struct trace_uprobe *tu,
int size, esize; int size, esize;
struct ftrace_event_call *call = &tu->tp.call; struct ftrace_event_call *call = &tu->tp.call;
WARN_ON(call != ftrace_file->event_call); WARN_ON(call != trace_file->event_call);
if (WARN_ON_ONCE(tu->tp.size + dsize > PAGE_SIZE)) if (WARN_ON_ONCE(tu->tp.size + dsize > PAGE_SIZE))
return; return;
if (ftrace_trigger_soft_disabled(ftrace_file)) if (ftrace_trigger_soft_disabled(trace_file))
return; return;
esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu)); esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));
size = esize + tu->tp.size + dsize; size = esize + tu->tp.size + dsize;
event = trace_event_buffer_lock_reserve(&buffer, ftrace_file, event = trace_event_buffer_lock_reserve(&buffer, trace_file,
call->event.type, size, 0, 0); call->event.type, size, 0, 0);
if (!event) if (!event)
return; return;
...@@ -806,7 +806,7 @@ static void __uprobe_trace_func(struct trace_uprobe *tu, ...@@ -806,7 +806,7 @@ static void __uprobe_trace_func(struct trace_uprobe *tu,
memcpy(data, ucb->buf, tu->tp.size + dsize); memcpy(data, ucb->buf, tu->tp.size + dsize);
event_trigger_unlock_commit(ftrace_file, buffer, event, entry, 0, 0); event_trigger_unlock_commit(trace_file, buffer, event, entry, 0, 0);
} }
/* uprobe handler */ /* uprobe handler */
...@@ -881,7 +881,7 @@ typedef bool (*filter_func_t)(struct uprobe_consumer *self, ...@@ -881,7 +881,7 @@ typedef bool (*filter_func_t)(struct uprobe_consumer *self,
struct mm_struct *mm); struct mm_struct *mm);
static int static int
probe_event_enable(struct trace_uprobe *tu, struct ftrace_event_file *file, probe_event_enable(struct trace_uprobe *tu, struct trace_event_file *file,
filter_func_t filter) filter_func_t filter)
{ {
bool enabled = trace_probe_is_enabled(&tu->tp); bool enabled = trace_probe_is_enabled(&tu->tp);
...@@ -938,7 +938,7 @@ probe_event_enable(struct trace_uprobe *tu, struct ftrace_event_file *file, ...@@ -938,7 +938,7 @@ probe_event_enable(struct trace_uprobe *tu, struct ftrace_event_file *file,
} }
static void static void
probe_event_disable(struct trace_uprobe *tu, struct ftrace_event_file *file) probe_event_disable(struct trace_uprobe *tu, struct trace_event_file *file)
{ {
if (!trace_probe_is_enabled(&tu->tp)) if (!trace_probe_is_enabled(&tu->tp))
return; return;
...@@ -1163,7 +1163,7 @@ trace_uprobe_register(struct ftrace_event_call *event, enum trace_reg type, ...@@ -1163,7 +1163,7 @@ trace_uprobe_register(struct ftrace_event_call *event, enum trace_reg type,
void *data) void *data)
{ {
struct trace_uprobe *tu = event->data; struct trace_uprobe *tu = event->data;
struct ftrace_event_file *file = data; struct trace_event_file *file = data;
switch (type) { switch (type) {
case TRACE_REG_REGISTER: case TRACE_REG_REGISTER:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7