Commit 2074006d authored by Linus Torvalds's avatar Linus Torvalds

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

Pull tracing updates from Steven Rostedt:
 "The new features of this release:

   - Added TRACE_DEFINE_SIZEOF() which allows trace events that use
     sizeof() it the TP_printk() to be converted to the actual size such
     that trace-cmd and perf can parse them correctly.

   - Some rework of the TRACE_DEFINE_ENUM() such that the above
     TRACE_DEFINE_SIZEOF() could reuse the same code.

   - Recording of tgid (Thread Group ID). This is similar to how task
     COMMs are recorded (cached at sched_switch), where it is in a table
     and used on output of the trace and trace_pipe files.

   - Have ":mod:<module>" be cached when written into set_ftrace_filter.
     Then the functions of the module will be traced at module load.

   - Some random clean ups and small fixes"

* tag 'trace-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (26 commits)
  ftrace: Test for NULL iter->tr in regex for stack_trace_filter changes
  ftrace: Decrement count for dyn_ftrace_total_info for init functions
  ftrace: Unlock hash mutex on failed allocation in process_mod_list()
  tracing: Add support for display of tgid in trace output
  tracing: Add support for recording tgid of tasks
  ftrace: Decrement count for dyn_ftrace_total_info file
  ftrace: Remove unused function ftrace_arch_read_dyn_info()
  sh/ftrace: Remove only user of ftrace_arch_read_dyn_info()
  ftrace: Have cached module filters be an active filter
  ftrace: Implement cached modules tracing on module load
  ftrace: Have the cached module list show in set_ftrace_filter
  ftrace: Add :mod: caching infrastructure to trace_array
  tracing: Show address when function names are not found
  ftrace: Add missing comment for FTRACE_OPS_FL_RCU
  tracing: Rename update the enum_map file
  tracing: Add TRACE_DEFINE_SIZEOF() macros
  tracing: define TRACE_DEFINE_SIZEOF() macro to map sizeof's to their values
  tracing: Rename enum_replace to eval_replace
  trace: rename enum_map functions
  trace: rename trace.c enum functions
  ...
parents f72e24a1 69d71879
...@@ -93,6 +93,8 @@ TRACE_EVENT(kvm_arm_set_dreg32, ...@@ -93,6 +93,8 @@ TRACE_EVENT(kvm_arm_set_dreg32,
TP_printk("%s: 0x%08x", __entry->name, __entry->value) TP_printk("%s: 0x%08x", __entry->name, __entry->value)
); );
TRACE_DEFINE_SIZEOF(__u64);
TRACE_EVENT(kvm_arm_set_regset, TRACE_EVENT(kvm_arm_set_regset,
TP_PROTO(const char *type, int len, __u64 *control, __u64 *value), TP_PROTO(const char *type, int len, __u64 *control, __u64 *value),
TP_ARGS(type, len, control, value), TP_ARGS(type, len, control, value),
......
...@@ -96,19 +96,6 @@ static int mod_code_status; /* holds return value of text write */ ...@@ -96,19 +96,6 @@ static int mod_code_status; /* holds return value of text write */
static void *mod_code_ip; /* holds the IP to write to */ static void *mod_code_ip; /* holds the IP to write to */
static void *mod_code_newcode; /* holds the text to write to the IP */ static void *mod_code_newcode; /* holds the text to write to the IP */
static unsigned nmi_wait_count;
static atomic_t nmi_update_count = ATOMIC_INIT(0);
int ftrace_arch_read_dyn_info(char *buf, int size)
{
int r;
r = snprintf(buf, size, "%u %u",
nmi_wait_count,
atomic_read(&nmi_update_count));
return r;
}
static void clear_mod_flag(void) static void clear_mod_flag(void)
{ {
int old = atomic_read(&nmi_running); int old = atomic_read(&nmi_running);
...@@ -144,7 +131,6 @@ void arch_ftrace_nmi_enter(void) ...@@ -144,7 +131,6 @@ void arch_ftrace_nmi_enter(void)
if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
smp_rmb(); smp_rmb();
ftrace_mod_code(); ftrace_mod_code();
atomic_inc(&nmi_update_count);
} }
/* Must have previous changes seen before executions */ /* Must have previous changes seen before executions */
smp_mb(); smp_mb();
...@@ -165,8 +151,6 @@ static void wait_for_nmi_and_set_mod_flag(void) ...@@ -165,8 +151,6 @@ static void wait_for_nmi_and_set_mod_flag(void)
do { do {
cpu_relax(); cpu_relax();
} while (atomic_cmpxchg(&nmi_running, 0, MOD_CODE_WRITE_FLAG)); } while (atomic_cmpxchg(&nmi_running, 0, MOD_CODE_WRITE_FLAG));
nmi_wait_count++;
} }
static void wait_for_nmi(void) static void wait_for_nmi(void)
...@@ -177,8 +161,6 @@ static void wait_for_nmi(void) ...@@ -177,8 +161,6 @@ static void wait_for_nmi(void)
do { do {
cpu_relax(); cpu_relax();
} while (atomic_read(&nmi_running)); } while (atomic_read(&nmi_running));
nmi_wait_count++;
} }
static int static int
......
...@@ -125,9 +125,9 @@ ...@@ -125,9 +125,9 @@
VMLINUX_SYMBOL(__start_ftrace_events) = .; \ VMLINUX_SYMBOL(__start_ftrace_events) = .; \
KEEP(*(_ftrace_events)) \ KEEP(*(_ftrace_events)) \
VMLINUX_SYMBOL(__stop_ftrace_events) = .; \ VMLINUX_SYMBOL(__stop_ftrace_events) = .; \
VMLINUX_SYMBOL(__start_ftrace_enum_maps) = .; \ VMLINUX_SYMBOL(__start_ftrace_eval_maps) = .; \
KEEP(*(_ftrace_enum_map)) \ KEEP(*(_ftrace_eval_map)) \
VMLINUX_SYMBOL(__stop_ftrace_enum_maps) = .; VMLINUX_SYMBOL(__stop_ftrace_eval_maps) = .;
#else #else
#define FTRACE_EVENTS() #define FTRACE_EVENTS()
#endif #endif
......
...@@ -119,6 +119,8 @@ ftrace_func_t ftrace_ops_get_func(struct ftrace_ops *ops); ...@@ -119,6 +119,8 @@ ftrace_func_t ftrace_ops_get_func(struct ftrace_ops *ops);
* for any of the functions that this ops will be registered for, then * for any of the functions that this ops will be registered for, then
* this ops will fail to register or set_filter_ip. * this ops will fail to register or set_filter_ip.
* PID - Is affected by set_ftrace_pid (allows filtering on those pids) * PID - Is affected by set_ftrace_pid (allows filtering on those pids)
* RCU - Set when the ops can only be called when RCU is watching.
* TRACE_ARRAY - The ops->private points to a trace_array descriptor.
*/ */
enum { enum {
FTRACE_OPS_FL_ENABLED = 1 << 0, FTRACE_OPS_FL_ENABLED = 1 << 0,
...@@ -137,6 +139,7 @@ enum { ...@@ -137,6 +139,7 @@ enum {
FTRACE_OPS_FL_IPMODIFY = 1 << 13, FTRACE_OPS_FL_IPMODIFY = 1 << 13,
FTRACE_OPS_FL_PID = 1 << 14, FTRACE_OPS_FL_PID = 1 << 14,
FTRACE_OPS_FL_RCU = 1 << 15, FTRACE_OPS_FL_RCU = 1 << 15,
FTRACE_OPS_FL_TRACE_ARRAY = 1 << 16,
}; };
#ifdef CONFIG_DYNAMIC_FTRACE #ifdef CONFIG_DYNAMIC_FTRACE
...@@ -445,7 +448,8 @@ enum { ...@@ -445,7 +448,8 @@ enum {
FTRACE_ITER_PRINTALL = (1 << 2), FTRACE_ITER_PRINTALL = (1 << 2),
FTRACE_ITER_DO_PROBES = (1 << 3), FTRACE_ITER_DO_PROBES = (1 << 3),
FTRACE_ITER_PROBE = (1 << 4), FTRACE_ITER_PROBE = (1 << 4),
FTRACE_ITER_ENABLED = (1 << 5), FTRACE_ITER_MOD = (1 << 5),
FTRACE_ITER_ENABLED = (1 << 6),
}; };
void arch_ftrace_update_code(int command); void arch_ftrace_update_code(int command);
......
...@@ -442,8 +442,8 @@ struct module { ...@@ -442,8 +442,8 @@ struct module {
#ifdef CONFIG_EVENT_TRACING #ifdef CONFIG_EVENT_TRACING
struct trace_event_call **trace_events; struct trace_event_call **trace_events;
unsigned int num_trace_events; unsigned int num_trace_events;
struct trace_enum_map **trace_enums; struct trace_eval_map **trace_evals;
unsigned int num_trace_enums; unsigned int num_trace_evals;
#endif #endif
#ifdef CONFIG_FTRACE_MCOUNT_RECORD #ifdef CONFIG_FTRACE_MCOUNT_RECORD
unsigned int num_ftrace_callsites; unsigned int num_ftrace_callsites;
......
...@@ -151,7 +151,15 @@ trace_event_buffer_lock_reserve(struct ring_buffer **current_buffer, ...@@ -151,7 +151,15 @@ trace_event_buffer_lock_reserve(struct ring_buffer **current_buffer,
int type, unsigned long len, int type, unsigned long len,
unsigned long flags, int pc); unsigned long flags, int pc);
void tracing_record_cmdline(struct task_struct *tsk); #define TRACE_RECORD_CMDLINE BIT(0)
#define TRACE_RECORD_TGID BIT(1)
void tracing_record_taskinfo(struct task_struct *task, int flags);
void tracing_record_taskinfo_sched_switch(struct task_struct *prev,
struct task_struct *next, int flags);
void tracing_record_cmdline(struct task_struct *task);
void tracing_record_tgid(struct task_struct *task);
int trace_output_call(struct trace_iterator *iter, char *name, char *fmt, ...); int trace_output_call(struct trace_iterator *iter, char *name, char *fmt, ...);
...@@ -290,6 +298,7 @@ struct trace_subsystem_dir; ...@@ -290,6 +298,7 @@ struct trace_subsystem_dir;
enum { enum {
EVENT_FILE_FL_ENABLED_BIT, EVENT_FILE_FL_ENABLED_BIT,
EVENT_FILE_FL_RECORDED_CMD_BIT, EVENT_FILE_FL_RECORDED_CMD_BIT,
EVENT_FILE_FL_RECORDED_TGID_BIT,
EVENT_FILE_FL_FILTERED_BIT, EVENT_FILE_FL_FILTERED_BIT,
EVENT_FILE_FL_NO_SET_FILTER_BIT, EVENT_FILE_FL_NO_SET_FILTER_BIT,
EVENT_FILE_FL_SOFT_MODE_BIT, EVENT_FILE_FL_SOFT_MODE_BIT,
...@@ -303,6 +312,7 @@ enum { ...@@ -303,6 +312,7 @@ enum {
* Event file flags: * Event file flags:
* ENABLED - The event is enabled * ENABLED - The event is enabled
* RECORDED_CMD - The comms should be recorded at sched_switch * RECORDED_CMD - The comms should be recorded at sched_switch
* RECORDED_TGID - The tgids should be recorded at sched_switch
* FILTERED - The event has a filter attached * FILTERED - The event has a filter attached
* NO_SET_FILTER - Set when filter has error and is to be ignored * NO_SET_FILTER - Set when filter has error and is to be ignored
* SOFT_MODE - The event is enabled/disabled by SOFT_DISABLED * SOFT_MODE - The event is enabled/disabled by SOFT_DISABLED
...@@ -315,6 +325,7 @@ enum { ...@@ -315,6 +325,7 @@ enum {
enum { enum {
EVENT_FILE_FL_ENABLED = (1 << EVENT_FILE_FL_ENABLED_BIT), EVENT_FILE_FL_ENABLED = (1 << EVENT_FILE_FL_ENABLED_BIT),
EVENT_FILE_FL_RECORDED_CMD = (1 << EVENT_FILE_FL_RECORDED_CMD_BIT), EVENT_FILE_FL_RECORDED_CMD = (1 << EVENT_FILE_FL_RECORDED_CMD_BIT),
EVENT_FILE_FL_RECORDED_TGID = (1 << EVENT_FILE_FL_RECORDED_TGID_BIT),
EVENT_FILE_FL_FILTERED = (1 << EVENT_FILE_FL_FILTERED_BIT), EVENT_FILE_FL_FILTERED = (1 << EVENT_FILE_FL_FILTERED_BIT),
EVENT_FILE_FL_NO_SET_FILTER = (1 << EVENT_FILE_FL_NO_SET_FILTER_BIT), EVENT_FILE_FL_NO_SET_FILTER = (1 << EVENT_FILE_FL_NO_SET_FILTER_BIT),
EVENT_FILE_FL_SOFT_MODE = (1 << EVENT_FILE_FL_SOFT_MODE_BIT), EVENT_FILE_FL_SOFT_MODE = (1 << EVENT_FILE_FL_SOFT_MODE_BIT),
......
...@@ -25,10 +25,10 @@ struct module; ...@@ -25,10 +25,10 @@ struct module;
struct tracepoint; struct tracepoint;
struct notifier_block; struct notifier_block;
struct trace_enum_map { struct trace_eval_map {
const char *system; const char *system;
const char *enum_string; const char *eval_string;
unsigned long enum_value; unsigned long eval_value;
}; };
#define TRACEPOINT_DEFAULT_PRIO 10 #define TRACEPOINT_DEFAULT_PRIO 10
...@@ -88,6 +88,7 @@ extern void syscall_unregfunc(void); ...@@ -88,6 +88,7 @@ extern void syscall_unregfunc(void);
#define PARAMS(args...) args #define PARAMS(args...) args
#define TRACE_DEFINE_ENUM(x) #define TRACE_DEFINE_ENUM(x)
#define TRACE_DEFINE_SIZEOF(x)
#endif /* _LINUX_TRACEPOINT_H */ #endif /* _LINUX_TRACEPOINT_H */
......
...@@ -30,6 +30,8 @@ DECLARE_EVENT_CLASS(xen_mc__batch, ...@@ -30,6 +30,8 @@ DECLARE_EVENT_CLASS(xen_mc__batch,
DEFINE_XEN_MC_BATCH(xen_mc_batch); DEFINE_XEN_MC_BATCH(xen_mc_batch);
DEFINE_XEN_MC_BATCH(xen_mc_issue); DEFINE_XEN_MC_BATCH(xen_mc_issue);
TRACE_DEFINE_SIZEOF(ulong);
TRACE_EVENT(xen_mc_entry, TRACE_EVENT(xen_mc_entry,
TP_PROTO(struct multicall_entry *mc, unsigned nargs), TP_PROTO(struct multicall_entry *mc, unsigned nargs),
TP_ARGS(mc, nargs), TP_ARGS(mc, nargs),
...@@ -40,8 +42,8 @@ TRACE_EVENT(xen_mc_entry, ...@@ -40,8 +42,8 @@ TRACE_EVENT(xen_mc_entry,
), ),
TP_fast_assign(__entry->op = mc->op; TP_fast_assign(__entry->op = mc->op;
__entry->nargs = nargs; __entry->nargs = nargs;
memcpy(__entry->args, mc->args, sizeof(unsigned long) * nargs); memcpy(__entry->args, mc->args, sizeof(ulong) * nargs);
memset(__entry->args + nargs, 0, sizeof(unsigned long) * (6 - nargs)); memset(__entry->args + nargs, 0, sizeof(ulong) * (6 - nargs));
), ),
TP_printk("op %u%s args [%lx, %lx, %lx, %lx, %lx, %lx]", TP_printk("op %u%s args [%lx, %lx, %lx, %lx, %lx, %lx]",
__entry->op, xen_hypercall_name(__entry->op), __entry->op, xen_hypercall_name(__entry->op),
...@@ -122,6 +124,7 @@ TRACE_EVENT(xen_mc_extend_args, ...@@ -122,6 +124,7 @@ TRACE_EVENT(xen_mc_extend_args,
__entry->res == XEN_MC_XE_NO_SPACE ? "NO_SPACE" : "???") __entry->res == XEN_MC_XE_NO_SPACE ? "NO_SPACE" : "???")
); );
TRACE_DEFINE_SIZEOF(pteval_t);
/* mmu */ /* mmu */
DECLARE_EVENT_CLASS(xen_mmu__set_pte, DECLARE_EVENT_CLASS(xen_mmu__set_pte,
TP_PROTO(pte_t *ptep, pte_t pteval), TP_PROTO(pte_t *ptep, pte_t pteval),
...@@ -199,6 +202,8 @@ TRACE_EVENT(xen_mmu_pte_clear, ...@@ -199,6 +202,8 @@ TRACE_EVENT(xen_mmu_pte_clear,
__entry->mm, __entry->addr, __entry->ptep) __entry->mm, __entry->addr, __entry->ptep)
); );
TRACE_DEFINE_SIZEOF(pmdval_t);
TRACE_EVENT(xen_mmu_set_pmd, TRACE_EVENT(xen_mmu_set_pmd,
TP_PROTO(pmd_t *pmdp, pmd_t pmdval), TP_PROTO(pmd_t *pmdp, pmd_t pmdval),
TP_ARGS(pmdp, pmdval), TP_ARGS(pmdp, pmdval),
...@@ -226,6 +231,8 @@ TRACE_EVENT(xen_mmu_pmd_clear, ...@@ -226,6 +231,8 @@ TRACE_EVENT(xen_mmu_pmd_clear,
#if CONFIG_PGTABLE_LEVELS >= 4 #if CONFIG_PGTABLE_LEVELS >= 4
TRACE_DEFINE_SIZEOF(pudval_t);
TRACE_EVENT(xen_mmu_set_pud, TRACE_EVENT(xen_mmu_set_pud,
TP_PROTO(pud_t *pudp, pud_t pudval), TP_PROTO(pud_t *pudp, pud_t pudval),
TP_ARGS(pudp, pudval), TP_ARGS(pudp, pudval),
...@@ -241,6 +248,8 @@ TRACE_EVENT(xen_mmu_set_pud, ...@@ -241,6 +248,8 @@ TRACE_EVENT(xen_mmu_set_pud,
(int)sizeof(pudval_t) * 2, (unsigned long long)__entry->pudval) (int)sizeof(pudval_t) * 2, (unsigned long long)__entry->pudval)
); );
TRACE_DEFINE_SIZEOF(p4dval_t);
TRACE_EVENT(xen_mmu_set_p4d, TRACE_EVENT(xen_mmu_set_p4d,
TP_PROTO(p4d_t *p4dp, p4d_t *user_p4dp, p4d_t p4dval), TP_PROTO(p4d_t *p4dp, p4d_t *user_p4dp, p4d_t p4dval),
TP_ARGS(p4dp, user_p4dp, p4dval), TP_ARGS(p4dp, user_p4dp, p4dval),
......
...@@ -35,15 +35,28 @@ TRACE_MAKE_SYSTEM_STR(); ...@@ -35,15 +35,28 @@ TRACE_MAKE_SYSTEM_STR();
#undef TRACE_DEFINE_ENUM #undef TRACE_DEFINE_ENUM
#define TRACE_DEFINE_ENUM(a) \ #define TRACE_DEFINE_ENUM(a) \
static struct trace_enum_map __used __initdata \ static struct trace_eval_map __used __initdata \
__##TRACE_SYSTEM##_##a = \ __##TRACE_SYSTEM##_##a = \
{ \ { \
.system = TRACE_SYSTEM_STRING, \ .system = TRACE_SYSTEM_STRING, \
.enum_string = #a, \ .eval_string = #a, \
.enum_value = a \ .eval_value = a \
}; \ }; \
static struct trace_enum_map __used \ static struct trace_eval_map __used \
__attribute__((section("_ftrace_enum_map"))) \ __attribute__((section("_ftrace_eval_map"))) \
*TRACE_SYSTEM##_##a = &__##TRACE_SYSTEM##_##a
#undef TRACE_DEFINE_SIZEOF
#define TRACE_DEFINE_SIZEOF(a) \
static struct trace_eval_map __used __initdata \
__##TRACE_SYSTEM##_##a = \
{ \
.system = TRACE_SYSTEM_STRING, \
.eval_string = "sizeof(" #a ")", \
.eval_value = sizeof(a) \
}; \
static struct trace_eval_map __used \
__attribute__((section("_ftrace_eval_map"))) \
*TRACE_SYSTEM##_##a = &__##TRACE_SYSTEM##_##a *TRACE_SYSTEM##_##a = &__##TRACE_SYSTEM##_##a
/* /*
...@@ -158,6 +171,9 @@ TRACE_MAKE_SYSTEM_STR(); ...@@ -158,6 +171,9 @@ TRACE_MAKE_SYSTEM_STR();
#undef TRACE_DEFINE_ENUM #undef TRACE_DEFINE_ENUM
#define TRACE_DEFINE_ENUM(a) #define TRACE_DEFINE_ENUM(a)
#undef TRACE_DEFINE_SIZEOF
#define TRACE_DEFINE_SIZEOF(a)
#undef __field #undef __field
#define __field(type, item) #define __field(type, item)
......
...@@ -3074,9 +3074,9 @@ static int find_module_sections(struct module *mod, struct load_info *info) ...@@ -3074,9 +3074,9 @@ static int find_module_sections(struct module *mod, struct load_info *info)
mod->trace_events = section_objs(info, "_ftrace_events", mod->trace_events = section_objs(info, "_ftrace_events",
sizeof(*mod->trace_events), sizeof(*mod->trace_events),
&mod->num_trace_events); &mod->num_trace_events);
mod->trace_enums = section_objs(info, "_ftrace_enum_map", mod->trace_evals = section_objs(info, "_ftrace_eval_map",
sizeof(*mod->trace_enums), sizeof(*mod->trace_evals),
&mod->num_trace_enums); &mod->num_trace_evals);
#endif #endif
#ifdef CONFIG_TRACING #ifdef CONFIG_TRACING
mod->trace_bprintk_fmt_start = section_objs(info, "__trace_printk_fmt", mod->trace_bprintk_fmt_start = section_objs(info, "__trace_printk_fmt",
......
...@@ -667,30 +667,30 @@ config RING_BUFFER_STARTUP_TEST ...@@ -667,30 +667,30 @@ config RING_BUFFER_STARTUP_TEST
If unsure, say N If unsure, say N
config TRACE_ENUM_MAP_FILE config TRACE_EVAL_MAP_FILE
bool "Show enum mappings for trace events" bool "Show eval mappings for trace events"
depends on TRACING depends on TRACING
help help
The "print fmt" of the trace events will show the enum names instead The "print fmt" of the trace events will show the enum/sizeof names
of their values. This can cause problems for user space tools that instead of their values. This can cause problems for user space tools
use this string to parse the raw data as user space does not know that use this string to parse the raw data as user space does not know
how to convert the string to its value. how to convert the string to its value.
To fix this, there's a special macro in the kernel that can be used To fix this, there's a special macro in the kernel that can be used
to convert the enum into its value. If this macro is used, then the to convert an enum/sizeof into its value. If this macro is used, then
print fmt strings will have the enums converted to their values. the print fmt strings will be converted to their values.
If something does not get converted properly, this option can be If something does not get converted properly, this option can be
used to show what enums the kernel tried to convert. used to show what enums/sizeof the kernel tried to convert.
This option is for debugging the enum conversions. A file is created This option is for debugging the conversions. A file is created
in the tracing directory called "enum_map" that will show the enum in the tracing directory called "eval_map" that will show the
names matched with their values and what trace event system they names matched with their values and what trace event system they
belong too. belong too.
Normally, the mapping of the strings to values will be freed after Normally, the mapping of the strings to values will be freed after
boot up or module load. With this option, they will not be freed, as boot up or module load. With this option, they will not be freed, as
they are needed for the "enum_map" file. Enabling this option will they are needed for the "eval_map" file. Enabling this option will
increase the memory footprint of the running kernel. increase the memory footprint of the running kernel.
If unsure, say N If unsure, say N
......
This diff is collapsed.
This diff is collapsed.
...@@ -263,7 +263,10 @@ struct trace_array { ...@@ -263,7 +263,10 @@ struct trace_array {
struct ftrace_ops *ops; struct ftrace_ops *ops;
struct trace_pid_list __rcu *function_pids; struct trace_pid_list __rcu *function_pids;
#ifdef CONFIG_DYNAMIC_FTRACE #ifdef CONFIG_DYNAMIC_FTRACE
/* All of these are protected by the ftrace_lock */
struct list_head func_probes; struct list_head func_probes;
struct list_head mod_trace;
struct list_head mod_notrace;
#endif #endif
/* function tracing enabled */ /* function tracing enabled */
int function_enabled; int function_enabled;
...@@ -637,6 +640,9 @@ void set_graph_array(struct trace_array *tr); ...@@ -637,6 +640,9 @@ void set_graph_array(struct trace_array *tr);
void tracing_start_cmdline_record(void); void tracing_start_cmdline_record(void);
void tracing_stop_cmdline_record(void); void tracing_stop_cmdline_record(void);
void tracing_start_tgid_record(void);
void tracing_stop_tgid_record(void);
int register_tracer(struct tracer *type); int register_tracer(struct tracer *type);
int is_tracing_stopped(void); int is_tracing_stopped(void);
...@@ -697,6 +703,7 @@ static inline void __trace_stack(struct trace_array *tr, unsigned long flags, ...@@ -697,6 +703,7 @@ static inline void __trace_stack(struct trace_array *tr, unsigned long flags,
extern u64 ftrace_now(int cpu); extern u64 ftrace_now(int cpu);
extern void trace_find_cmdline(int pid, char comm[]); extern void trace_find_cmdline(int pid, char comm[]);
extern int trace_find_tgid(int pid);
extern void trace_event_follow_fork(struct trace_array *tr, bool enable); extern void trace_event_follow_fork(struct trace_array *tr, bool enable);
#ifdef CONFIG_DYNAMIC_FTRACE #ifdef CONFIG_DYNAMIC_FTRACE
...@@ -761,10 +768,24 @@ enum print_line_t print_trace_line(struct trace_iterator *iter); ...@@ -761,10 +768,24 @@ enum print_line_t print_trace_line(struct trace_iterator *iter);
extern char trace_find_mark(unsigned long long duration); extern char trace_find_mark(unsigned long long duration);
struct ftrace_hash;
struct ftrace_mod_load {
struct list_head list;
char *func;
char *module;
int enable;
};
enum {
FTRACE_HASH_FL_MOD = (1 << 0),
};
struct ftrace_hash { struct ftrace_hash {
unsigned long size_bits; unsigned long size_bits;
struct hlist_head *buckets; struct hlist_head *buckets;
unsigned long count; unsigned long count;
unsigned long flags;
struct rcu_head rcu; struct rcu_head rcu;
}; };
...@@ -773,7 +794,7 @@ ftrace_lookup_ip(struct ftrace_hash *hash, unsigned long ip); ...@@ -773,7 +794,7 @@ ftrace_lookup_ip(struct ftrace_hash *hash, unsigned long ip);
static __always_inline bool ftrace_hash_empty(struct ftrace_hash *hash) static __always_inline bool ftrace_hash_empty(struct ftrace_hash *hash)
{ {
return !hash || !hash->count; return !hash || !(hash->count || (hash->flags & FTRACE_HASH_FL_MOD));
} }
/* Standard output formatting function used for function return traces */ /* Standard output formatting function used for function return traces */
...@@ -1107,6 +1128,7 @@ extern int trace_get_user(struct trace_parser *parser, const char __user *ubuf, ...@@ -1107,6 +1128,7 @@ extern int trace_get_user(struct trace_parser *parser, const char __user *ubuf,
C(CONTEXT_INFO, "context-info"), /* Print pid/cpu/time */ \ C(CONTEXT_INFO, "context-info"), /* Print pid/cpu/time */ \
C(LATENCY_FMT, "latency-format"), \ C(LATENCY_FMT, "latency-format"), \
C(RECORD_CMD, "record-cmd"), \ C(RECORD_CMD, "record-cmd"), \
C(RECORD_TGID, "record-tgid"), \
C(OVERWRITE, "overwrite"), \ C(OVERWRITE, "overwrite"), \
C(STOP_ON_FREE, "disable_on_free"), \ C(STOP_ON_FREE, "disable_on_free"), \
C(IRQ_INFO, "irq-info"), \ C(IRQ_INFO, "irq-info"), \
...@@ -1423,6 +1445,8 @@ struct ftrace_event_field * ...@@ -1423,6 +1445,8 @@ struct ftrace_event_field *
trace_find_event_field(struct trace_event_call *call, char *name); trace_find_event_field(struct trace_event_call *call, char *name);
extern void trace_event_enable_cmd_record(bool enable); extern void trace_event_enable_cmd_record(bool enable);
extern void trace_event_enable_tgid_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);
...@@ -1773,10 +1797,10 @@ static inline const char *get_syscall_name(int syscall) ...@@ -1773,10 +1797,10 @@ static inline const char *get_syscall_name(int syscall)
#ifdef CONFIG_EVENT_TRACING #ifdef CONFIG_EVENT_TRACING
void trace_event_init(void); void trace_event_init(void);
void trace_event_enum_update(struct trace_enum_map **map, int len); void trace_event_eval_update(struct trace_eval_map **map, int len);
#else #else
static inline void __init trace_event_init(void) { } static inline void __init trace_event_init(void) { }
static inline void trace_event_enum_update(struct trace_enum_map **map, int len) { } static inline void trace_event_eval_update(struct trace_eval_map **map, int len) { }
#endif #endif
extern struct trace_iterator *tracepoint_print_iter; extern struct trace_iterator *tracepoint_print_iter;
......
...@@ -343,6 +343,28 @@ void trace_event_enable_cmd_record(bool enable) ...@@ -343,6 +343,28 @@ void trace_event_enable_cmd_record(bool enable)
mutex_unlock(&event_mutex); mutex_unlock(&event_mutex);
} }
void trace_event_enable_tgid_record(bool enable)
{
struct trace_event_file *file;
struct trace_array *tr;
mutex_lock(&event_mutex);
do_for_each_event_file(tr, file) {
if (!(file->flags & EVENT_FILE_FL_ENABLED))
continue;
if (enable) {
tracing_start_tgid_record();
set_bit(EVENT_FILE_FL_RECORDED_TGID_BIT, &file->flags);
} else {
tracing_stop_tgid_record();
clear_bit(EVENT_FILE_FL_RECORDED_TGID_BIT,
&file->flags);
}
} while_for_each_event_file();
mutex_unlock(&event_mutex);
}
static int __ftrace_event_enable_disable(struct trace_event_file *file, static int __ftrace_event_enable_disable(struct trace_event_file *file,
int enable, int soft_disable) int enable, int soft_disable)
{ {
...@@ -381,6 +403,12 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file, ...@@ -381,6 +403,12 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file,
tracing_stop_cmdline_record(); tracing_stop_cmdline_record();
clear_bit(EVENT_FILE_FL_RECORDED_CMD_BIT, &file->flags); clear_bit(EVENT_FILE_FL_RECORDED_CMD_BIT, &file->flags);
} }
if (file->flags & EVENT_FILE_FL_RECORDED_TGID) {
tracing_stop_tgid_record();
clear_bit(EVENT_FILE_FL_RECORDED_CMD_BIT, &file->flags);
}
call->class->reg(call, TRACE_REG_UNREGISTER, file); call->class->reg(call, TRACE_REG_UNREGISTER, file);
} }
/* If in SOFT_MODE, just set the SOFT_DISABLE_BIT, else clear it */ /* If in SOFT_MODE, just set the SOFT_DISABLE_BIT, else clear it */
...@@ -407,18 +435,30 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file, ...@@ -407,18 +435,30 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file,
} }
if (!(file->flags & EVENT_FILE_FL_ENABLED)) { if (!(file->flags & EVENT_FILE_FL_ENABLED)) {
bool cmd = false, tgid = false;
/* Keep the event disabled, when going to SOFT_MODE. */ /* Keep the event disabled, when going to SOFT_MODE. */
if (soft_disable) if (soft_disable)
set_bit(EVENT_FILE_FL_SOFT_DISABLED_BIT, &file->flags); set_bit(EVENT_FILE_FL_SOFT_DISABLED_BIT, &file->flags);
if (tr->trace_flags & TRACE_ITER_RECORD_CMD) { if (tr->trace_flags & TRACE_ITER_RECORD_CMD) {
cmd = true;
tracing_start_cmdline_record(); tracing_start_cmdline_record();
set_bit(EVENT_FILE_FL_RECORDED_CMD_BIT, &file->flags); set_bit(EVENT_FILE_FL_RECORDED_CMD_BIT, &file->flags);
} }
if (tr->trace_flags & TRACE_ITER_RECORD_TGID) {
tgid = true;
tracing_start_tgid_record();
set_bit(EVENT_FILE_FL_RECORDED_TGID_BIT, &file->flags);
}
ret = call->class->reg(call, TRACE_REG_REGISTER, file); ret = call->class->reg(call, TRACE_REG_REGISTER, file);
if (ret) { if (ret) {
tracing_stop_cmdline_record(); if (cmd)
tracing_stop_cmdline_record();
if (tgid)
tracing_stop_tgid_record();
pr_info("event trace: Could not enable event " pr_info("event trace: Could not enable event "
"%s\n", trace_event_name(call)); "%s\n", trace_event_name(call));
break; break;
...@@ -2067,18 +2107,18 @@ __register_event(struct trace_event_call *call, struct module *mod) ...@@ -2067,18 +2107,18 @@ __register_event(struct trace_event_call *call, struct module *mod)
return 0; return 0;
} }
static char *enum_replace(char *ptr, struct trace_enum_map *map, int len) static char *eval_replace(char *ptr, struct trace_eval_map *map, int len)
{ {
int rlen; int rlen;
int elen; int elen;
/* Find the length of the enum value as a string */ /* Find the length of the eval value as a string */
elen = snprintf(ptr, 0, "%ld", map->enum_value); elen = snprintf(ptr, 0, "%ld", map->eval_value);
/* Make sure there's enough room to replace the string with the value */ /* Make sure there's enough room to replace the string with the value */
if (len < elen) if (len < elen)
return NULL; return NULL;
snprintf(ptr, elen + 1, "%ld", map->enum_value); snprintf(ptr, elen + 1, "%ld", map->eval_value);
/* Get the rest of the string of ptr */ /* Get the rest of the string of ptr */
rlen = strlen(ptr + len); rlen = strlen(ptr + len);
...@@ -2090,11 +2130,11 @@ static char *enum_replace(char *ptr, struct trace_enum_map *map, int len) ...@@ -2090,11 +2130,11 @@ static char *enum_replace(char *ptr, struct trace_enum_map *map, int len)
} }
static void update_event_printk(struct trace_event_call *call, static void update_event_printk(struct trace_event_call *call,
struct trace_enum_map *map) struct trace_eval_map *map)
{ {
char *ptr; char *ptr;
int quote = 0; int quote = 0;
int len = strlen(map->enum_string); int len = strlen(map->eval_string);
for (ptr = call->print_fmt; *ptr; ptr++) { for (ptr = call->print_fmt; *ptr; ptr++) {
if (*ptr == '\\') { if (*ptr == '\\') {
...@@ -2125,16 +2165,16 @@ static void update_event_printk(struct trace_event_call *call, ...@@ -2125,16 +2165,16 @@ static void update_event_printk(struct trace_event_call *call,
continue; continue;
} }
if (isalpha(*ptr) || *ptr == '_') { if (isalpha(*ptr) || *ptr == '_') {
if (strncmp(map->enum_string, ptr, len) == 0 && if (strncmp(map->eval_string, ptr, len) == 0 &&
!isalnum(ptr[len]) && ptr[len] != '_') { !isalnum(ptr[len]) && ptr[len] != '_') {
ptr = enum_replace(ptr, map, len); ptr = eval_replace(ptr, map, len);
/* Hmm, enum string smaller than value */ /* enum/sizeof string smaller than value */
if (WARN_ON_ONCE(!ptr)) if (WARN_ON_ONCE(!ptr))
return; return;
/* /*
* No need to decrement here, as enum_replace() * No need to decrement here, as eval_replace()
* returns the pointer to the character passed * returns the pointer to the character passed
* the enum, and two enums can not be placed * the eval, and two evals can not be placed
* back to back without something in between. * back to back without something in between.
* We can skip that something in between. * We can skip that something in between.
*/ */
...@@ -2165,7 +2205,7 @@ static void update_event_printk(struct trace_event_call *call, ...@@ -2165,7 +2205,7 @@ static void update_event_printk(struct trace_event_call *call,
} }
} }
void trace_event_enum_update(struct trace_enum_map **map, int len) void trace_event_eval_update(struct trace_eval_map **map, int len)
{ {
struct trace_event_call *call, *p; struct trace_event_call *call, *p;
const char *last_system = NULL; const char *last_system = NULL;
......
...@@ -340,31 +340,41 @@ static inline const char *kretprobed(const char *name) ...@@ -340,31 +340,41 @@ static inline const char *kretprobed(const char *name)
static void static void
seq_print_sym_short(struct trace_seq *s, const char *fmt, unsigned long address) seq_print_sym_short(struct trace_seq *s, const char *fmt, unsigned long address)
{ {
#ifdef CONFIG_KALLSYMS
char str[KSYM_SYMBOL_LEN]; char str[KSYM_SYMBOL_LEN];
#ifdef CONFIG_KALLSYMS
const char *name; const char *name;
kallsyms_lookup(address, NULL, NULL, NULL, str); kallsyms_lookup(address, NULL, NULL, NULL, str);
name = kretprobed(str); name = kretprobed(str);
trace_seq_printf(s, fmt, name); if (name && strlen(name)) {
trace_seq_printf(s, fmt, name);
return;
}
#endif #endif
snprintf(str, KSYM_SYMBOL_LEN, "0x%08lx", address);
trace_seq_printf(s, fmt, str);
} }
static void static void
seq_print_sym_offset(struct trace_seq *s, const char *fmt, seq_print_sym_offset(struct trace_seq *s, const char *fmt,
unsigned long address) unsigned long address)
{ {
#ifdef CONFIG_KALLSYMS
char str[KSYM_SYMBOL_LEN]; char str[KSYM_SYMBOL_LEN];
#ifdef CONFIG_KALLSYMS
const char *name; const char *name;
sprint_symbol(str, address); sprint_symbol(str, address);
name = kretprobed(str); name = kretprobed(str);
trace_seq_printf(s, fmt, name); if (name && strlen(name)) {
trace_seq_printf(s, fmt, name);
return;
}
#endif #endif
snprintf(str, KSYM_SYMBOL_LEN, "0x%08lx", address);
trace_seq_printf(s, fmt, str);
} }
#ifndef CONFIG_64BIT #ifndef CONFIG_64BIT
...@@ -587,6 +597,15 @@ int trace_print_context(struct trace_iterator *iter) ...@@ -587,6 +597,15 @@ int trace_print_context(struct trace_iterator *iter)
trace_seq_printf(s, "%16s-%-5d [%03d] ", trace_seq_printf(s, "%16s-%-5d [%03d] ",
comm, entry->pid, iter->cpu); comm, entry->pid, iter->cpu);
if (tr->trace_flags & TRACE_ITER_RECORD_TGID) {
unsigned int tgid = trace_find_tgid(entry->pid);
if (!tgid)
trace_seq_printf(s, "(-----) ");
else
trace_seq_printf(s, "(%5d) ", tgid);
}
if (tr->trace_flags & TRACE_ITER_IRQ_INFO) if (tr->trace_flags & TRACE_ITER_IRQ_INFO)
trace_print_lat_fmt(s, entry); trace_print_lat_fmt(s, entry);
......
...@@ -12,27 +12,38 @@ ...@@ -12,27 +12,38 @@
#include "trace.h" #include "trace.h"
static int sched_ref; #define RECORD_CMDLINE 1
#define RECORD_TGID 2
static int sched_cmdline_ref;
static int sched_tgid_ref;
static DEFINE_MUTEX(sched_register_mutex); static DEFINE_MUTEX(sched_register_mutex);
static void static void
probe_sched_switch(void *ignore, bool preempt, probe_sched_switch(void *ignore, bool preempt,
struct task_struct *prev, struct task_struct *next) struct task_struct *prev, struct task_struct *next)
{ {
if (unlikely(!sched_ref)) int flags;
return;
flags = (RECORD_TGID * !!sched_tgid_ref) +
(RECORD_CMDLINE * !!sched_cmdline_ref);
tracing_record_cmdline(prev); if (!flags)
tracing_record_cmdline(next); return;
tracing_record_taskinfo_sched_switch(prev, next, flags);
} }
static void static void
probe_sched_wakeup(void *ignore, struct task_struct *wakee) probe_sched_wakeup(void *ignore, struct task_struct *wakee)
{ {
if (unlikely(!sched_ref)) int flags;
return;
flags = (RECORD_TGID * !!sched_tgid_ref) +
(RECORD_CMDLINE * !!sched_cmdline_ref);
tracing_record_cmdline(current); if (!flags)
return;
tracing_record_taskinfo(current, flags);
} }
static int tracing_sched_register(void) static int tracing_sched_register(void)
...@@ -75,28 +86,61 @@ static void tracing_sched_unregister(void) ...@@ -75,28 +86,61 @@ static void tracing_sched_unregister(void)
unregister_trace_sched_wakeup(probe_sched_wakeup, NULL); unregister_trace_sched_wakeup(probe_sched_wakeup, NULL);
} }
static void tracing_start_sched_switch(void) static void tracing_start_sched_switch(int ops)
{ {
bool sched_register = (!sched_cmdline_ref && !sched_tgid_ref);
mutex_lock(&sched_register_mutex); mutex_lock(&sched_register_mutex);
if (!(sched_ref++))
switch (ops) {
case RECORD_CMDLINE:
sched_cmdline_ref++;
break;
case RECORD_TGID:
sched_tgid_ref++;
break;
}
if (sched_register && (sched_cmdline_ref || sched_tgid_ref))
tracing_sched_register(); tracing_sched_register();
mutex_unlock(&sched_register_mutex); mutex_unlock(&sched_register_mutex);
} }
static void tracing_stop_sched_switch(void) static void tracing_stop_sched_switch(int ops)
{ {
mutex_lock(&sched_register_mutex); mutex_lock(&sched_register_mutex);
if (!(--sched_ref))
switch (ops) {
case RECORD_CMDLINE:
sched_cmdline_ref--;
break;
case RECORD_TGID:
sched_tgid_ref--;
break;
}
if (!sched_cmdline_ref && !sched_tgid_ref)
tracing_sched_unregister(); tracing_sched_unregister();
mutex_unlock(&sched_register_mutex); mutex_unlock(&sched_register_mutex);
} }
void tracing_start_cmdline_record(void) void tracing_start_cmdline_record(void)
{ {
tracing_start_sched_switch(); tracing_start_sched_switch(RECORD_CMDLINE);
} }
void tracing_stop_cmdline_record(void) void tracing_stop_cmdline_record(void)
{ {
tracing_stop_sched_switch(); tracing_stop_sched_switch(RECORD_CMDLINE);
}
void tracing_start_tgid_record(void)
{
tracing_start_sched_switch(RECORD_TGID);
}
void tracing_stop_tgid_record(void)
{
tracing_stop_sched_switch(RECORD_TGID);
} }
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