Commit 0a7418f5 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'trace-3.15-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull more tracing updates from Steven Rostedt:
 "This includes the final patch to clean up and fix the issue with the
  design of tracepoints and how a user could register a tracepoint and
  have that tracepoint not be activated but no error was shown.

  The design was for an out of tree module but broke in tree users.  The
  clean up was to remove the saving of the hash table of tracepoint
  names such that they can be enabled before they exist (enabling a
  module tracepoint before that module is loaded).  This added more
  complexity than needed.  The clean up was to remove that code and just
  enable tracepoints that exist or fail if they do not.

  This removed a lot of code as well as the complexity that it brought.
  As a side effect, instead of registering a tracepoint by its name, the
  tracepoint needs to be registered with the tracepoint descriptor.
  This removes having to duplicate the tracepoint names that are
  enabled.

  The second patch was added that simplified the way modules were
  searched for.

  This cleanup required changes that were in the 3.15 queue as well as
  some changes that were added late in the 3.14-rc cycle.  This final
  change waited till the two were merged in upstream and then the change
  was added and full tests were run.  Unfortunately, the test found some
  errors, but after it was already submitted to the for-next branch and
  not to be rebased.  Sparse errors were detected by Fengguang Wu's bot
  tests, and my internal tests discovered that the anonymous union
  initialization triggered a bug in older gcc compilers.  Luckily, there
  was a bugzilla for the gcc bug which gave a work around to the
  problem.  The third and fourth patch handled the sparse error and the
  gcc bug respectively.

  A final patch was tagged along to fix a missing documentation for the
  README file"

* tag 'trace-3.15-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Add missing function triggers dump and cpudump to README
  tracing: Fix anonymous unions in struct ftrace_event_call
  tracepoint: Fix sparse warnings in tracepoint.c
  tracepoint: Simplify tracepoint module search
  tracepoint: Use struct pointer instead of name hash for reg/unreg tracepoints
parents 0b747172 17a280ea
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <linux/perf_event.h> #include <linux/perf_event.h>
#include <linux/tracepoint.h>
struct trace_array; struct trace_array;
struct trace_buffer; struct trace_buffer;
...@@ -232,6 +233,7 @@ enum { ...@@ -232,6 +233,7 @@ enum {
TRACE_EVENT_FL_IGNORE_ENABLE_BIT, TRACE_EVENT_FL_IGNORE_ENABLE_BIT,
TRACE_EVENT_FL_WAS_ENABLED_BIT, TRACE_EVENT_FL_WAS_ENABLED_BIT,
TRACE_EVENT_FL_USE_CALL_FILTER_BIT, TRACE_EVENT_FL_USE_CALL_FILTER_BIT,
TRACE_EVENT_FL_TRACEPOINT_BIT,
}; };
/* /*
...@@ -244,6 +246,7 @@ enum { ...@@ -244,6 +246,7 @@ enum {
* (used for module unloading, if a module event is enabled, * (used for module unloading, if a module event is enabled,
* it is best to clear the buffers that used it). * it is best to clear the buffers that used it).
* USE_CALL_FILTER - For ftrace internal events, don't use file filter * USE_CALL_FILTER - For ftrace internal events, don't use file filter
* TRACEPOINT - Event is a tracepoint
*/ */
enum { enum {
TRACE_EVENT_FL_FILTERED = (1 << TRACE_EVENT_FL_FILTERED_BIT), TRACE_EVENT_FL_FILTERED = (1 << TRACE_EVENT_FL_FILTERED_BIT),
...@@ -252,12 +255,17 @@ enum { ...@@ -252,12 +255,17 @@ enum {
TRACE_EVENT_FL_IGNORE_ENABLE = (1 << TRACE_EVENT_FL_IGNORE_ENABLE_BIT), TRACE_EVENT_FL_IGNORE_ENABLE = (1 << TRACE_EVENT_FL_IGNORE_ENABLE_BIT),
TRACE_EVENT_FL_WAS_ENABLED = (1 << TRACE_EVENT_FL_WAS_ENABLED_BIT), TRACE_EVENT_FL_WAS_ENABLED = (1 << TRACE_EVENT_FL_WAS_ENABLED_BIT),
TRACE_EVENT_FL_USE_CALL_FILTER = (1 << TRACE_EVENT_FL_USE_CALL_FILTER_BIT), TRACE_EVENT_FL_USE_CALL_FILTER = (1 << TRACE_EVENT_FL_USE_CALL_FILTER_BIT),
TRACE_EVENT_FL_TRACEPOINT = (1 << TRACE_EVENT_FL_TRACEPOINT_BIT),
}; };
struct ftrace_event_call { struct ftrace_event_call {
struct list_head list; struct list_head list;
struct ftrace_event_class *class; struct ftrace_event_class *class;
union {
char *name; char *name;
/* Set TRACE_EVENT_FL_TRACEPOINT flag when using "tp" */
struct tracepoint *tp;
};
struct trace_event event; struct trace_event event;
const char *print_fmt; const char *print_fmt;
struct event_filter *filter; struct event_filter *filter;
...@@ -271,6 +279,7 @@ struct ftrace_event_call { ...@@ -271,6 +279,7 @@ struct ftrace_event_call {
* bit 3: ftrace internal event (do not enable) * bit 3: ftrace internal event (do not enable)
* bit 4: Event was enabled by module * bit 4: Event was enabled by module
* bit 5: use call filter rather than file filter * bit 5: use call filter rather than file filter
* bit 6: Event is a tracepoint
*/ */
int flags; /* static flags of different events */ int flags; /* static flags of different events */
...@@ -283,6 +292,15 @@ struct ftrace_event_call { ...@@ -283,6 +292,15 @@ struct ftrace_event_call {
#endif #endif
}; };
static inline const char *
ftrace_event_name(struct ftrace_event_call *call)
{
if (call->flags & TRACE_EVENT_FL_TRACEPOINT)
return call->tp ? call->tp->name : NULL;
else
return call->name;
}
struct trace_array; struct trace_array;
struct ftrace_subsystem_dir; struct ftrace_subsystem_dir;
...@@ -353,7 +371,7 @@ struct ftrace_event_file { ...@@ -353,7 +371,7 @@ struct ftrace_event_file {
#define __TRACE_EVENT_FLAGS(name, value) \ #define __TRACE_EVENT_FLAGS(name, value) \
static int __init trace_init_flags_##name(void) \ static int __init trace_init_flags_##name(void) \
{ \ { \
event_##name.flags = value; \ event_##name.flags |= value; \
return 0; \ return 0; \
} \ } \
early_initcall(trace_init_flags_##name); early_initcall(trace_init_flags_##name);
......
...@@ -119,8 +119,10 @@ extern struct trace_event_functions exit_syscall_print_funcs; ...@@ -119,8 +119,10 @@ extern struct trace_event_functions exit_syscall_print_funcs;
static struct syscall_metadata __syscall_meta_##sname; \ static struct syscall_metadata __syscall_meta_##sname; \
static struct ftrace_event_call __used \ static struct ftrace_event_call __used \
event_enter_##sname = { \ event_enter_##sname = { \
.name = "sys_enter"#sname, \
.class = &event_class_syscall_enter, \ .class = &event_class_syscall_enter, \
{ \
.name = "sys_enter"#sname, \
}, \
.event.funcs = &enter_syscall_print_funcs, \ .event.funcs = &enter_syscall_print_funcs, \
.data = (void *)&__syscall_meta_##sname,\ .data = (void *)&__syscall_meta_##sname,\
.flags = TRACE_EVENT_FL_CAP_ANY, \ .flags = TRACE_EVENT_FL_CAP_ANY, \
...@@ -133,8 +135,10 @@ extern struct trace_event_functions exit_syscall_print_funcs; ...@@ -133,8 +135,10 @@ extern struct trace_event_functions exit_syscall_print_funcs;
static struct syscall_metadata __syscall_meta_##sname; \ static struct syscall_metadata __syscall_meta_##sname; \
static struct ftrace_event_call __used \ static struct ftrace_event_call __used \
event_exit_##sname = { \ event_exit_##sname = { \
.name = "sys_exit"#sname, \
.class = &event_class_syscall_exit, \ .class = &event_class_syscall_exit, \
{ \
.name = "sys_exit"#sname, \
}, \
.event.funcs = &exit_syscall_print_funcs, \ .event.funcs = &exit_syscall_print_funcs, \
.data = (void *)&__syscall_meta_##sname,\ .data = (void *)&__syscall_meta_##sname,\
.flags = TRACE_EVENT_FL_CAP_ANY, \ .flags = TRACE_EVENT_FL_CAP_ANY, \
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* See Documentation/trace/tracepoints.txt. * See Documentation/trace/tracepoints.txt.
* *
* (C) Copyright 2008 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> * Copyright (C) 2008-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
* *
* Heavily inspired from the Linux Kernel Markers. * Heavily inspired from the Linux Kernel Markers.
* *
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
struct module; struct module;
struct tracepoint; struct tracepoint;
struct notifier_block;
struct tracepoint_func { struct tracepoint_func {
void *func; void *func;
...@@ -35,31 +36,38 @@ struct tracepoint { ...@@ -35,31 +36,38 @@ struct tracepoint {
struct tracepoint_func __rcu *funcs; struct tracepoint_func __rcu *funcs;
}; };
/*
* Connect a probe to a tracepoint.
* Internal API, should not be used directly.
*/
extern int tracepoint_probe_register(const char *name, void *probe, void *data);
/*
* Disconnect a probe from a tracepoint.
* Internal API, should not be used directly.
*/
extern int extern int
tracepoint_probe_unregister(const char *name, void *probe, void *data); tracepoint_probe_register(struct tracepoint *tp, void *probe, void *data);
extern int
tracepoint_probe_unregister(struct tracepoint *tp, void *probe, void *data);
extern void
for_each_kernel_tracepoint(void (*fct)(struct tracepoint *tp, void *priv),
void *priv);
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
struct tp_module { struct tp_module {
struct list_head list; struct list_head list;
unsigned int num_tracepoints; struct module *mod;
struct tracepoint * const *tracepoints_ptrs;
}; };
bool trace_module_has_bad_taint(struct module *mod); bool trace_module_has_bad_taint(struct module *mod);
extern int register_tracepoint_module_notifier(struct notifier_block *nb);
extern int unregister_tracepoint_module_notifier(struct notifier_block *nb);
#else #else
static inline bool trace_module_has_bad_taint(struct module *mod) static inline bool trace_module_has_bad_taint(struct module *mod)
{ {
return false; return false;
} }
static inline
int register_tracepoint_module_notifier(struct notifier_block *nb)
{
return 0;
}
static inline
int unregister_tracepoint_module_notifier(struct notifier_block *nb)
{
return 0;
}
#endif /* CONFIG_MODULES */ #endif /* CONFIG_MODULES */
/* /*
...@@ -72,6 +80,11 @@ static inline void tracepoint_synchronize_unregister(void) ...@@ -72,6 +80,11 @@ static inline void tracepoint_synchronize_unregister(void)
synchronize_sched(); synchronize_sched();
} }
#ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS
extern void syscall_regfunc(void);
extern void syscall_unregfunc(void);
#endif /* CONFIG_HAVE_SYSCALL_TRACEPOINTS */
#define PARAMS(args...) args #define PARAMS(args...) args
#endif /* _LINUX_TRACEPOINT_H */ #endif /* _LINUX_TRACEPOINT_H */
...@@ -160,14 +173,14 @@ static inline void tracepoint_synchronize_unregister(void) ...@@ -160,14 +173,14 @@ static inline void tracepoint_synchronize_unregister(void)
static inline int \ static inline int \
register_trace_##name(void (*probe)(data_proto), void *data) \ register_trace_##name(void (*probe)(data_proto), void *data) \
{ \ { \
return tracepoint_probe_register(#name, (void *)probe, \ return tracepoint_probe_register(&__tracepoint_##name, \
data); \ (void *)probe, data); \
} \ } \
static inline int \ static inline int \
unregister_trace_##name(void (*probe)(data_proto), void *data) \ unregister_trace_##name(void (*probe)(data_proto), void *data) \
{ \ { \
return tracepoint_probe_unregister(#name, (void *)probe, \ return tracepoint_probe_unregister(&__tracepoint_##name,\
data); \ (void *)probe, data); \
} \ } \
static inline void \ static inline void \
check_trace_callback_type_##name(void (*cb)(data_proto)) \ check_trace_callback_type_##name(void (*cb)(data_proto)) \
......
...@@ -13,9 +13,6 @@ ...@@ -13,9 +13,6 @@
#ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS #ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS
extern void syscall_regfunc(void);
extern void syscall_unregfunc(void);
TRACE_EVENT_FN(sys_enter, TRACE_EVENT_FN(sys_enter,
TP_PROTO(struct pt_regs *regs, long id), TP_PROTO(struct pt_regs *regs, long id),
......
...@@ -470,10 +470,13 @@ static inline notrace int ftrace_get_offsets_##call( \ ...@@ -470,10 +470,13 @@ static inline notrace int ftrace_get_offsets_##call( \
* }; * };
* *
* static struct ftrace_event_call event_<call> = { * static struct ftrace_event_call event_<call> = {
* .name = "<call>",
* .class = event_class_<template>, * .class = event_class_<template>,
* {
* .tp = &__tracepoint_<call>,
* },
* .event = &ftrace_event_type_<call>, * .event = &ftrace_event_type_<call>,
* .print_fmt = print_fmt_<call>, * .print_fmt = print_fmt_<call>,
* .flags = TRACE_EVENT_FL_TRACEPOINT,
* }; * };
* // its only safe to use pointers when doing linker tricks to * // its only safe to use pointers when doing linker tricks to
* // create an array. * // create an array.
...@@ -605,10 +608,13 @@ static struct ftrace_event_class __used __refdata event_class_##call = { \ ...@@ -605,10 +608,13 @@ static struct ftrace_event_class __used __refdata event_class_##call = { \
#define DEFINE_EVENT(template, call, proto, args) \ #define DEFINE_EVENT(template, call, proto, args) \
\ \
static struct ftrace_event_call __used event_##call = { \ static struct ftrace_event_call __used event_##call = { \
.name = #call, \
.class = &event_class_##template, \ .class = &event_class_##template, \
{ \
.tp = &__tracepoint_##call, \
}, \
.event.funcs = &ftrace_event_type_funcs_##template, \ .event.funcs = &ftrace_event_type_funcs_##template, \
.print_fmt = print_fmt_##template, \ .print_fmt = print_fmt_##template, \
.flags = TRACE_EVENT_FL_TRACEPOINT, \
}; \ }; \
static struct ftrace_event_call __used \ static struct ftrace_event_call __used \
__attribute__((section("_ftrace_events"))) *__event_##call = &event_##call __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call
...@@ -619,10 +625,13 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call ...@@ -619,10 +625,13 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call
static const char print_fmt_##call[] = print; \ static const char print_fmt_##call[] = print; \
\ \
static struct ftrace_event_call __used event_##call = { \ static struct ftrace_event_call __used event_##call = { \
.name = #call, \
.class = &event_class_##template, \ .class = &event_class_##template, \
{ \
.tp = &__tracepoint_##call, \
}, \
.event.funcs = &ftrace_event_type_funcs_##call, \ .event.funcs = &ftrace_event_type_funcs_##call, \
.print_fmt = print_fmt_##call, \ .print_fmt = print_fmt_##call, \
.flags = TRACE_EVENT_FL_TRACEPOINT, \
}; \ }; \
static struct ftrace_event_call __used \ static struct ftrace_event_call __used \
__attribute__((section("_ftrace_events"))) *__event_##call = &event_##call __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call
......
...@@ -3611,6 +3611,8 @@ static const char readme_msg[] = ...@@ -3611,6 +3611,8 @@ static const char readme_msg[] =
#ifdef CONFIG_TRACER_SNAPSHOT #ifdef CONFIG_TRACER_SNAPSHOT
"\t\t snapshot\n" "\t\t snapshot\n"
#endif #endif
"\t\t dump\n"
"\t\t cpudump\n"
"\t example: echo do_fault:traceoff > set_ftrace_filter\n" "\t example: echo do_fault:traceoff > set_ftrace_filter\n"
"\t echo do_trap:traceoff:3 > set_ftrace_filter\n" "\t echo do_trap:traceoff:3 > set_ftrace_filter\n"
"\t The first one will disable tracing every time do_fault is hit\n" "\t The first one will disable tracing every time do_fault is hit\n"
......
...@@ -223,24 +223,25 @@ int ftrace_event_reg(struct ftrace_event_call *call, ...@@ -223,24 +223,25 @@ int ftrace_event_reg(struct ftrace_event_call *call,
{ {
struct ftrace_event_file *file = data; struct ftrace_event_file *file = data;
WARN_ON(!(call->flags & TRACE_EVENT_FL_TRACEPOINT));
switch (type) { switch (type) {
case TRACE_REG_REGISTER: case TRACE_REG_REGISTER:
return tracepoint_probe_register(call->name, return tracepoint_probe_register(call->tp,
call->class->probe, call->class->probe,
file); file);
case TRACE_REG_UNREGISTER: case TRACE_REG_UNREGISTER:
tracepoint_probe_unregister(call->name, tracepoint_probe_unregister(call->tp,
call->class->probe, call->class->probe,
file); file);
return 0; return 0;
#ifdef CONFIG_PERF_EVENTS #ifdef CONFIG_PERF_EVENTS
case TRACE_REG_PERF_REGISTER: case TRACE_REG_PERF_REGISTER:
return tracepoint_probe_register(call->name, return tracepoint_probe_register(call->tp,
call->class->perf_probe, call->class->perf_probe,
call); call);
case TRACE_REG_PERF_UNREGISTER: case TRACE_REG_PERF_UNREGISTER:
tracepoint_probe_unregister(call->name, tracepoint_probe_unregister(call->tp,
call->class->perf_probe, call->class->perf_probe,
call); call);
return 0; return 0;
...@@ -352,7 +353,7 @@ static int __ftrace_event_enable_disable(struct ftrace_event_file *file, ...@@ -352,7 +353,7 @@ static int __ftrace_event_enable_disable(struct ftrace_event_file *file,
if (ret) { if (ret) {
tracing_stop_cmdline_record(); tracing_stop_cmdline_record();
pr_info("event trace: Could not enable event " pr_info("event trace: Could not enable event "
"%s\n", call->name); "%s\n", ftrace_event_name(call));
break; break;
} }
set_bit(FTRACE_EVENT_FL_ENABLED_BIT, &file->flags); set_bit(FTRACE_EVENT_FL_ENABLED_BIT, &file->flags);
...@@ -481,27 +482,29 @@ __ftrace_set_clr_event_nolock(struct trace_array *tr, const char *match, ...@@ -481,27 +482,29 @@ __ftrace_set_clr_event_nolock(struct trace_array *tr, const char *match,
{ {
struct ftrace_event_file *file; struct ftrace_event_file *file;
struct ftrace_event_call *call; struct ftrace_event_call *call;
const char *name;
int ret = -EINVAL; int ret = -EINVAL;
list_for_each_entry(file, &tr->events, list) { list_for_each_entry(file, &tr->events, list) {
call = file->event_call; call = file->event_call;
name = ftrace_event_name(call);
if (!call->name || !call->class || !call->class->reg) if (!name || !call->class || !call->class->reg)
continue; continue;
if (call->flags & TRACE_EVENT_FL_IGNORE_ENABLE) if (call->flags & TRACE_EVENT_FL_IGNORE_ENABLE)
continue; continue;
if (match && if (match &&
strcmp(match, call->name) != 0 && strcmp(match, name) != 0 &&
strcmp(match, call->class->system) != 0) strcmp(match, call->class->system) != 0)
continue; continue;
if (sub && strcmp(sub, call->class->system) != 0) if (sub && strcmp(sub, call->class->system) != 0)
continue; continue;
if (event && strcmp(event, call->name) != 0) if (event && strcmp(event, name) != 0)
continue; continue;
ftrace_event_enable_disable(file, set); ftrace_event_enable_disable(file, set);
...@@ -699,7 +702,7 @@ static int t_show(struct seq_file *m, void *v) ...@@ -699,7 +702,7 @@ static int t_show(struct seq_file *m, void *v)
if (strcmp(call->class->system, TRACE_SYSTEM) != 0) if (strcmp(call->class->system, TRACE_SYSTEM) != 0)
seq_printf(m, "%s:", call->class->system); seq_printf(m, "%s:", call->class->system);
seq_printf(m, "%s\n", call->name); seq_printf(m, "%s\n", ftrace_event_name(call));
return 0; return 0;
} }
...@@ -792,7 +795,7 @@ system_enable_read(struct file *filp, char __user *ubuf, size_t cnt, ...@@ -792,7 +795,7 @@ system_enable_read(struct file *filp, char __user *ubuf, size_t cnt,
mutex_lock(&event_mutex); mutex_lock(&event_mutex);
list_for_each_entry(file, &tr->events, list) { list_for_each_entry(file, &tr->events, list) {
call = file->event_call; call = file->event_call;
if (!call->name || !call->class || !call->class->reg) if (!ftrace_event_name(call) || !call->class || !call->class->reg)
continue; continue;
if (system && strcmp(call->class->system, system->name) != 0) if (system && strcmp(call->class->system, system->name) != 0)
...@@ -907,7 +910,7 @@ static int f_show(struct seq_file *m, void *v) ...@@ -907,7 +910,7 @@ static int f_show(struct seq_file *m, void *v)
switch ((unsigned long)v) { switch ((unsigned long)v) {
case FORMAT_HEADER: case FORMAT_HEADER:
seq_printf(m, "name: %s\n", call->name); seq_printf(m, "name: %s\n", ftrace_event_name(call));
seq_printf(m, "ID: %d\n", call->event.type); seq_printf(m, "ID: %d\n", call->event.type);
seq_printf(m, "format:\n"); seq_printf(m, "format:\n");
return 0; return 0;
...@@ -1527,6 +1530,7 @@ event_create_dir(struct dentry *parent, struct ftrace_event_file *file) ...@@ -1527,6 +1530,7 @@ event_create_dir(struct dentry *parent, struct ftrace_event_file *file)
struct trace_array *tr = file->tr; struct trace_array *tr = file->tr;
struct list_head *head; struct list_head *head;
struct dentry *d_events; struct dentry *d_events;
const char *name;
int ret; int ret;
/* /*
...@@ -1540,10 +1544,11 @@ event_create_dir(struct dentry *parent, struct ftrace_event_file *file) ...@@ -1540,10 +1544,11 @@ event_create_dir(struct dentry *parent, struct ftrace_event_file *file)
} else } else
d_events = parent; d_events = parent;
file->dir = debugfs_create_dir(call->name, d_events); name = ftrace_event_name(call);
file->dir = debugfs_create_dir(name, d_events);
if (!file->dir) { if (!file->dir) {
pr_warning("Could not create debugfs '%s' directory\n", pr_warning("Could not create debugfs '%s' directory\n",
call->name); name);
return -1; return -1;
} }
...@@ -1567,7 +1572,7 @@ event_create_dir(struct dentry *parent, struct ftrace_event_file *file) ...@@ -1567,7 +1572,7 @@ event_create_dir(struct dentry *parent, struct ftrace_event_file *file)
ret = call->class->define_fields(call); ret = call->class->define_fields(call);
if (ret < 0) { if (ret < 0) {
pr_warning("Could not initialize trace point" pr_warning("Could not initialize trace point"
" events/%s\n", call->name); " events/%s\n", name);
return -1; return -1;
} }
} }
...@@ -1631,15 +1636,17 @@ static void event_remove(struct ftrace_event_call *call) ...@@ -1631,15 +1636,17 @@ static void event_remove(struct ftrace_event_call *call)
static int event_init(struct ftrace_event_call *call) static int event_init(struct ftrace_event_call *call)
{ {
int ret = 0; int ret = 0;
const char *name;
if (WARN_ON(!call->name)) name = ftrace_event_name(call);
if (WARN_ON(!name))
return -EINVAL; return -EINVAL;
if (call->class->raw_init) { if (call->class->raw_init) {
ret = call->class->raw_init(call); ret = call->class->raw_init(call);
if (ret < 0 && ret != -ENOSYS) if (ret < 0 && ret != -ENOSYS)
pr_warn("Could not initialize trace events/%s\n", pr_warn("Could not initialize trace events/%s\n",
call->name); name);
} }
return ret; return ret;
...@@ -1885,7 +1892,7 @@ __trace_add_event_dirs(struct trace_array *tr) ...@@ -1885,7 +1892,7 @@ __trace_add_event_dirs(struct trace_array *tr)
ret = __trace_add_new_event(call, tr); ret = __trace_add_new_event(call, tr);
if (ret < 0) if (ret < 0)
pr_warning("Could not create directory for event %s\n", pr_warning("Could not create directory for event %s\n",
call->name); ftrace_event_name(call));
} }
} }
...@@ -1894,18 +1901,20 @@ find_event_file(struct trace_array *tr, const char *system, const char *event) ...@@ -1894,18 +1901,20 @@ find_event_file(struct trace_array *tr, const char *system, const char *event)
{ {
struct ftrace_event_file *file; struct ftrace_event_file *file;
struct ftrace_event_call *call; struct ftrace_event_call *call;
const char *name;
list_for_each_entry(file, &tr->events, list) { list_for_each_entry(file, &tr->events, list) {
call = file->event_call; call = file->event_call;
name = ftrace_event_name(call);
if (!call->name || !call->class || !call->class->reg) if (!name || !call->class || !call->class->reg)
continue; continue;
if (call->flags & TRACE_EVENT_FL_IGNORE_ENABLE) if (call->flags & TRACE_EVENT_FL_IGNORE_ENABLE)
continue; continue;
if (strcmp(event, call->name) == 0 && if (strcmp(event, name) == 0 &&
strcmp(system, call->class->system) == 0) strcmp(system, call->class->system) == 0)
return file; return file;
} }
...@@ -1973,7 +1982,7 @@ event_enable_print(struct seq_file *m, unsigned long ip, ...@@ -1973,7 +1982,7 @@ event_enable_print(struct seq_file *m, unsigned long ip,
seq_printf(m, "%s:%s:%s", seq_printf(m, "%s:%s:%s",
data->enable ? ENABLE_EVENT_STR : DISABLE_EVENT_STR, data->enable ? ENABLE_EVENT_STR : DISABLE_EVENT_STR,
data->file->event_call->class->system, data->file->event_call->class->system,
data->file->event_call->name); ftrace_event_name(data->file->event_call));
if (data->count == -1) if (data->count == -1)
seq_printf(m, ":unlimited\n"); seq_printf(m, ":unlimited\n");
...@@ -2193,7 +2202,7 @@ __trace_early_add_event_dirs(struct trace_array *tr) ...@@ -2193,7 +2202,7 @@ __trace_early_add_event_dirs(struct trace_array *tr)
ret = event_create_dir(tr->event_dir, file); ret = event_create_dir(tr->event_dir, file);
if (ret < 0) if (ret < 0)
pr_warning("Could not create directory for event %s\n", pr_warning("Could not create directory for event %s\n",
file->event_call->name); ftrace_event_name(file->event_call));
} }
} }
...@@ -2217,7 +2226,7 @@ __trace_early_add_events(struct trace_array *tr) ...@@ -2217,7 +2226,7 @@ __trace_early_add_events(struct trace_array *tr)
ret = __trace_early_add_new_event(call, tr); ret = __trace_early_add_new_event(call, tr);
if (ret < 0) if (ret < 0)
pr_warning("Could not create early event %s\n", pr_warning("Could not create early event %s\n",
call->name); ftrace_event_name(call));
} }
} }
...@@ -2549,7 +2558,7 @@ static __init void event_trace_self_tests(void) ...@@ -2549,7 +2558,7 @@ static __init void event_trace_self_tests(void)
continue; continue;
#endif #endif
pr_info("Testing event %s: ", call->name); pr_info("Testing event %s: ", ftrace_event_name(call));
/* /*
* If an event is already enabled, someone is using * If an event is already enabled, someone is using
......
...@@ -1095,7 +1095,7 @@ event_enable_trigger_print(struct seq_file *m, struct event_trigger_ops *ops, ...@@ -1095,7 +1095,7 @@ event_enable_trigger_print(struct seq_file *m, struct event_trigger_ops *ops,
seq_printf(m, "%s:%s:%s", seq_printf(m, "%s:%s:%s",
enable_data->enable ? ENABLE_EVENT_STR : DISABLE_EVENT_STR, enable_data->enable ? ENABLE_EVENT_STR : DISABLE_EVENT_STR,
enable_data->file->event_call->class->system, enable_data->file->event_call->class->system,
enable_data->file->event_call->name); ftrace_event_name(enable_data->file->event_call));
if (data->count == -1) if (data->count == -1)
seq_puts(m, ":unlimited"); seq_puts(m, ":unlimited");
......
...@@ -173,9 +173,11 @@ struct ftrace_event_class __refdata event_class_ftrace_##call = { \ ...@@ -173,9 +173,11 @@ struct ftrace_event_class __refdata event_class_ftrace_##call = { \
}; \ }; \
\ \
struct ftrace_event_call __used event_##call = { \ struct ftrace_event_call __used event_##call = { \
.class = &event_class_ftrace_##call, \
{ \
.name = #call, \ .name = #call, \
}, \
.event.type = etype, \ .event.type = etype, \
.class = &event_class_ftrace_##call, \
.print_fmt = print, \ .print_fmt = print, \
.flags = TRACE_EVENT_FL_IGNORE_ENABLE | TRACE_EVENT_FL_USE_CALL_FILTER, \ .flags = TRACE_EVENT_FL_IGNORE_ENABLE | TRACE_EVENT_FL_USE_CALL_FILTER, \
}; \ }; \
......
...@@ -341,7 +341,7 @@ static struct trace_kprobe *find_trace_kprobe(const char *event, ...@@ -341,7 +341,7 @@ static struct trace_kprobe *find_trace_kprobe(const char *event,
struct trace_kprobe *tk; struct trace_kprobe *tk;
list_for_each_entry(tk, &probe_list, list) list_for_each_entry(tk, &probe_list, list)
if (strcmp(tk->tp.call.name, event) == 0 && if (strcmp(ftrace_event_name(&tk->tp.call), event) == 0 &&
strcmp(tk->tp.call.class->system, group) == 0) strcmp(tk->tp.call.class->system, group) == 0)
return tk; return tk;
return NULL; return NULL;
...@@ -516,7 +516,8 @@ static int register_trace_kprobe(struct trace_kprobe *tk) ...@@ -516,7 +516,8 @@ static int register_trace_kprobe(struct trace_kprobe *tk)
mutex_lock(&probe_lock); mutex_lock(&probe_lock);
/* Delete old (same name) event if exist */ /* Delete old (same name) event if exist */
old_tk = find_trace_kprobe(tk->tp.call.name, tk->tp.call.class->system); old_tk = find_trace_kprobe(ftrace_event_name(&tk->tp.call),
tk->tp.call.class->system);
if (old_tk) { if (old_tk) {
ret = unregister_trace_kprobe(old_tk); ret = unregister_trace_kprobe(old_tk);
if (ret < 0) if (ret < 0)
...@@ -564,7 +565,8 @@ static int trace_kprobe_module_callback(struct notifier_block *nb, ...@@ -564,7 +565,8 @@ static int trace_kprobe_module_callback(struct notifier_block *nb,
if (ret) if (ret)
pr_warning("Failed to re-register probe %s on" pr_warning("Failed to re-register probe %s on"
"%s: %d\n", "%s: %d\n",
tk->tp.call.name, mod->name, ret); ftrace_event_name(&tk->tp.call),
mod->name, ret);
} }
} }
mutex_unlock(&probe_lock); mutex_unlock(&probe_lock);
...@@ -818,7 +820,8 @@ static int probes_seq_show(struct seq_file *m, void *v) ...@@ -818,7 +820,8 @@ static int probes_seq_show(struct seq_file *m, void *v)
int i; int i;
seq_printf(m, "%c", trace_kprobe_is_return(tk) ? 'r' : 'p'); seq_printf(m, "%c", trace_kprobe_is_return(tk) ? 'r' : 'p');
seq_printf(m, ":%s/%s", tk->tp.call.class->system, tk->tp.call.name); seq_printf(m, ":%s/%s", tk->tp.call.class->system,
ftrace_event_name(&tk->tp.call));
if (!tk->symbol) if (!tk->symbol)
seq_printf(m, " 0x%p", tk->rp.kp.addr); seq_printf(m, " 0x%p", tk->rp.kp.addr);
...@@ -876,7 +879,8 @@ static int probes_profile_seq_show(struct seq_file *m, void *v) ...@@ -876,7 +879,8 @@ static int probes_profile_seq_show(struct seq_file *m, void *v)
{ {
struct trace_kprobe *tk = v; struct trace_kprobe *tk = v;
seq_printf(m, " %-44s %15lu %15lu\n", tk->tp.call.name, tk->nhit, seq_printf(m, " %-44s %15lu %15lu\n",
ftrace_event_name(&tk->tp.call), tk->nhit,
tk->rp.kp.nmissed); tk->rp.kp.nmissed);
return 0; return 0;
...@@ -1011,7 +1015,7 @@ print_kprobe_event(struct trace_iterator *iter, int flags, ...@@ -1011,7 +1015,7 @@ print_kprobe_event(struct trace_iterator *iter, int flags,
field = (struct kprobe_trace_entry_head *)iter->ent; field = (struct kprobe_trace_entry_head *)iter->ent;
tp = container_of(event, struct trace_probe, call.event); tp = container_of(event, struct trace_probe, call.event);
if (!trace_seq_printf(s, "%s: (", tp->call.name)) if (!trace_seq_printf(s, "%s: (", ftrace_event_name(&tp->call)))
goto partial; goto partial;
if (!seq_print_ip_sym(s, field->ip, flags | TRACE_ITER_SYM_OFFSET)) if (!seq_print_ip_sym(s, field->ip, flags | TRACE_ITER_SYM_OFFSET))
...@@ -1047,7 +1051,7 @@ print_kretprobe_event(struct trace_iterator *iter, int flags, ...@@ -1047,7 +1051,7 @@ print_kretprobe_event(struct trace_iterator *iter, int flags,
field = (struct kretprobe_trace_entry_head *)iter->ent; field = (struct kretprobe_trace_entry_head *)iter->ent;
tp = container_of(event, struct trace_probe, call.event); tp = container_of(event, struct trace_probe, call.event);
if (!trace_seq_printf(s, "%s: (", tp->call.name)) if (!trace_seq_printf(s, "%s: (", ftrace_event_name(&tp->call)))
goto partial; goto partial;
if (!seq_print_ip_sym(s, field->ret_ip, flags | TRACE_ITER_SYM_OFFSET)) if (!seq_print_ip_sym(s, field->ret_ip, flags | TRACE_ITER_SYM_OFFSET))
...@@ -1286,7 +1290,8 @@ static int register_kprobe_event(struct trace_kprobe *tk) ...@@ -1286,7 +1290,8 @@ static int register_kprobe_event(struct trace_kprobe *tk)
call->data = tk; call->data = tk;
ret = trace_add_event_call(call); ret = trace_add_event_call(call);
if (ret) { if (ret) {
pr_info("Failed to register kprobe event: %s\n", call->name); pr_info("Failed to register kprobe event: %s\n",
ftrace_event_name(call));
kfree(call->print_fmt); kfree(call->print_fmt);
unregister_ftrace_event(&call->event); unregister_ftrace_event(&call->event);
} }
......
...@@ -431,7 +431,7 @@ int ftrace_raw_output_prep(struct trace_iterator *iter, ...@@ -431,7 +431,7 @@ int ftrace_raw_output_prep(struct trace_iterator *iter,
} }
trace_seq_init(p); trace_seq_init(p);
ret = trace_seq_printf(s, "%s: ", event->name); ret = trace_seq_printf(s, "%s: ", ftrace_event_name(event));
if (!ret) if (!ret)
return TRACE_TYPE_PARTIAL_LINE; return TRACE_TYPE_PARTIAL_LINE;
......
...@@ -294,7 +294,7 @@ static struct trace_uprobe *find_probe_event(const char *event, const char *grou ...@@ -294,7 +294,7 @@ static struct trace_uprobe *find_probe_event(const char *event, const char *grou
struct trace_uprobe *tu; struct trace_uprobe *tu;
list_for_each_entry(tu, &uprobe_list, list) list_for_each_entry(tu, &uprobe_list, list)
if (strcmp(tu->tp.call.name, event) == 0 && if (strcmp(ftrace_event_name(&tu->tp.call), event) == 0 &&
strcmp(tu->tp.call.class->system, group) == 0) strcmp(tu->tp.call.class->system, group) == 0)
return tu; return tu;
...@@ -324,7 +324,8 @@ static int register_trace_uprobe(struct trace_uprobe *tu) ...@@ -324,7 +324,8 @@ static int register_trace_uprobe(struct trace_uprobe *tu)
mutex_lock(&uprobe_lock); mutex_lock(&uprobe_lock);
/* register as an event */ /* register as an event */
old_tu = find_probe_event(tu->tp.call.name, tu->tp.call.class->system); old_tu = find_probe_event(ftrace_event_name(&tu->tp.call),
tu->tp.call.class->system);
if (old_tu) { if (old_tu) {
/* delete old event */ /* delete old event */
ret = unregister_trace_uprobe(old_tu); ret = unregister_trace_uprobe(old_tu);
...@@ -599,7 +600,8 @@ static int probes_seq_show(struct seq_file *m, void *v) ...@@ -599,7 +600,8 @@ static int probes_seq_show(struct seq_file *m, void *v)
char c = is_ret_probe(tu) ? 'r' : 'p'; char c = is_ret_probe(tu) ? 'r' : 'p';
int i; int i;
seq_printf(m, "%c:%s/%s", c, tu->tp.call.class->system, tu->tp.call.name); seq_printf(m, "%c:%s/%s", c, tu->tp.call.class->system,
ftrace_event_name(&tu->tp.call));
seq_printf(m, " %s:0x%p", tu->filename, (void *)tu->offset); seq_printf(m, " %s:0x%p", tu->filename, (void *)tu->offset);
for (i = 0; i < tu->tp.nr_args; i++) for (i = 0; i < tu->tp.nr_args; i++)
...@@ -649,7 +651,8 @@ static int probes_profile_seq_show(struct seq_file *m, void *v) ...@@ -649,7 +651,8 @@ static int probes_profile_seq_show(struct seq_file *m, void *v)
{ {
struct trace_uprobe *tu = v; struct trace_uprobe *tu = v;
seq_printf(m, " %s %-44s %15lu\n", tu->filename, tu->tp.call.name, tu->nhit); seq_printf(m, " %s %-44s %15lu\n", tu->filename,
ftrace_event_name(&tu->tp.call), tu->nhit);
return 0; return 0;
} }
...@@ -844,12 +847,14 @@ print_uprobe_event(struct trace_iterator *iter, int flags, struct trace_event *e ...@@ -844,12 +847,14 @@ print_uprobe_event(struct trace_iterator *iter, int flags, struct trace_event *e
tu = container_of(event, struct trace_uprobe, tp.call.event); tu = container_of(event, struct trace_uprobe, tp.call.event);
if (is_ret_probe(tu)) { if (is_ret_probe(tu)) {
if (!trace_seq_printf(s, "%s: (0x%lx <- 0x%lx)", tu->tp.call.name, if (!trace_seq_printf(s, "%s: (0x%lx <- 0x%lx)",
ftrace_event_name(&tu->tp.call),
entry->vaddr[1], entry->vaddr[0])) entry->vaddr[1], entry->vaddr[0]))
goto partial; goto partial;
data = DATAOF_TRACE_ENTRY(entry, true); data = DATAOF_TRACE_ENTRY(entry, true);
} else { } else {
if (!trace_seq_printf(s, "%s: (0x%lx)", tu->tp.call.name, if (!trace_seq_printf(s, "%s: (0x%lx)",
ftrace_event_name(&tu->tp.call),
entry->vaddr[0])) entry->vaddr[0]))
goto partial; goto partial;
data = DATAOF_TRACE_ENTRY(entry, false); data = DATAOF_TRACE_ENTRY(entry, false);
...@@ -1275,7 +1280,8 @@ static int register_uprobe_event(struct trace_uprobe *tu) ...@@ -1275,7 +1280,8 @@ static int register_uprobe_event(struct trace_uprobe *tu)
ret = trace_add_event_call(call); ret = trace_add_event_call(call);
if (ret) { if (ret) {
pr_info("Failed to register uprobe event: %s\n", call->name); pr_info("Failed to register uprobe event: %s\n",
ftrace_event_name(call));
kfree(call->print_fmt); kfree(call->print_fmt);
unregister_ftrace_event(&call->event); unregister_ftrace_event(&call->event);
} }
......
This diff is collapsed.
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