tracing: Add an option to show symbols in _text+offset for function profiler
Subsystems (4)
Masami Hiramatsu (Google)
maintainerv5 cover tracing: Add an option to show symbols in _text+offset for function profiler
Hi,
This series implements an option to show symbols in _text+OFFSET format instead of symbol name in the function profiler. This is the 6th version, the previous one is here;
https://lore.kernel.org/all/176114747153.315239.6863821259073466010.stgit@devnote2/
This version is rebased on top of linux-trace/for-next branch and modify offset format to hex.
Thank you,
---
Masami Hiramatsu (Google) (2):
tracing: Allow tracer to add more than 32 options
tracing: Add an option to show symbols in _text+offset for function profiler
kernel/trace/blktrace.c | 6 + kernel/trace/ftrace.c | 26 ++++++ kernel/trace/trace.c | 154 +++++++++++++++++----------------- kernel/trace/trace.h | 40 +++++---- kernel/trace/trace_events.c | 4 - kernel/trace/trace_events_synth.c | 2 kernel/trace/trace_fprobe.c | 6 + kernel/trace/trace_functions_graph.c | 18 ++-- kernel/trace/trace_irqsoff.c | 30 +++---- kernel/trace/trace_kdb.c | 2 kernel/trace/trace_kprobe.c | 6 + kernel/trace/trace_output.c | 18 ++-- kernel/trace/trace_sched_wakeup.c | 24 +++-- kernel/trace/trace_syscalls.c | 4 - kernel/trace/trace_wprobe.c | 2 15 files changed, 187 insertions(+), 155 deletions(-)
--
Masami Hiramatsu (Google) <[email protected]>
Masami Hiramatsu (Google)
maintainerPATCH v5 1/2 tracing: Allow tracer to add more than 32 options
From: Masami Hiramatsu (Google) <[email protected]>
Since enum trace_iterator_flags is 32bit, the max number of the option flags is limited to 32 and it is fully used now. To add a new option, we need to expand it.
So replace the TRACE_ITER_##flag with TRACE_ITER(flag) macro which is 64bit bitmask.
---
Changes in v6:
- Rebased on the latest for-next.
Changes in v5:
- Use TRACE_ITER() macro.
Changes in v4:
- Use enum ... : type {} instead of const variables.
Changes in v3:
- Make TRACE_ITER_* to global.
--- kernel/trace/blktrace.c | 6 + kernel/trace/trace.c | 151 +++++++++++++++++----------------- kernel/trace/trace.h | 29 +++---- kernel/trace/trace_events.c | 4 - kernel/trace/trace_events_synth.c | 2 kernel/trace/trace_fprobe.c | 6 + kernel/trace/trace_functions_graph.c | 18 ++-- kernel/trace/trace_irqsoff.c | 30 +++---- kernel/trace/trace_kdb.c | 2 kernel/trace/trace_kprobe.c | 6 + kernel/trace/trace_output.c | 18 ++-- kernel/trace/trace_sched_wakeup.c | 24 +++-- kernel/trace/trace_syscalls.c | 4 - kernel/trace/trace_wprobe.c | 2 14 files changed, 150 insertions(+), 152 deletions(-)
kernel/trace/blktrace.c +3 -3
@@ -1452,7 +1452,7 @@ static enum print_line_t print_one_line(struct trace_iterator *iter, t =te_blk_io_trace (iter->ent); what = (t->action & ((1 <<BLK_TC_SHIFT ) -1 )) & ~__BLK_TA_CGROUP; - long_act = !!(tr->trace_flags &TRACE_ITER_VERBOSE ); + long_act = !!(tr->trace_flags &TRACE_ITER (VERBOSE )); log_action = classic ? &blk_log_action_classic : &blk_log_action; has_cg = t->action & __BLK_TA_CGROUP;
@@ -1517,9 +1517,9 @@ blk_tracer_set_flag(struct trace_array *tr, u32 old_flags, u32 bit, int set)/* don't output context-info for blk_classic output */ if (bit ==TRACE_BLK_OPT_CLASSIC ) {if (set) - tr->trace_flags &= ~TRACE_ITER_CONTEXT_INFO ; + tr->trace_flags &= ~TRACE_ITER (CONTEXT_INFO );else - tr->trace_flags |=TRACE_ITER_CONTEXT_INFO ; + tr->trace_flags |=TRACE_ITER (CONTEXT_INFO ); }return 0 ; }
kernel/trace/trace.c +76 -75
453 lines not on this page · raw message
kernel/trace/trace.h +13 -16
@@ -223,7 +223,7 @@ struct array_buffer {int cpu; }; -#define TRACE_FLAGS_MAX_SIZE 32 +#define TRACE_FLAGS_MAX_SIZE 64struct trace_options {struct tracer *tracer;
@@ -397,7 +397,7 @@ struct trace_array {int buffer_percent;unsigned int n_err_log_entries;struct tracer *current_trace; -unsigned int trace_flags; +u64 trace_flags;unsigned char trace_flags_index[TRACE_FLAGS_MAX_SIZE ];unsigned int flags;raw_spinlock_t start_lock;
@@ -639,7 +639,7 @@ struct tracer { u32 old_flags, u32 bit, int set);/* Return 0 if OK with change, else return non-zero */ int (*flag_changed)(struct trace_array *tr, -u32 mask,int set); +u64 mask,int set);struct tracer *next;struct tracer_flags *flags;int enabled;
@@ -1353,11 +1353,11 @@ extern int trace_get_user(struct trace_parser *parser, const char __user *ubuf,# define FUNCTION_FLAGS \ C(FUNCTION, "function-trace"), \ C(FUNC_FORK, "function-fork"), -# define FUNCTION_DEFAULT_FLAGS TRACE_ITER_FUNCTION +# define FUNCTION_DEFAULT_FLAGS TRACE_ITER(FUNCTION)#else # define FUNCTION_FLAGS # define FUNCTION_DEFAULT_FLAGS 0UL -# define TRACE_ITER_FUNC_FORK 0UL +# define TRACE_ITER_FUNC_FORK_BIT -1#endif #ifdef CONFIG_STACKTRACE
@@ -1399,7 +1399,7 @@ extern int trace_get_user(struct trace_parser *parser, const char __user *ubuf,C (MARKERS ,"markers" ), \C (EVENT_FORK ,"event-fork" ), \C (TRACE_PRINTK ,"trace_printk_dest" ), \ -C (COPY_MARKER ,"copy_trace_marker" ),\ +C (COPY_MARKER ,"copy_trace_marker" ), \C (PAUSE_ON_TRACE ,"pause-on-trace" ), \C (HASH_PTR ,"hash-ptr" ),/* Print hashed pointer */ \FUNCTION_FLAGS \
@@ -1421,20 +1421,17 @@ enum trace_iterator_bits { };/* -* By redefining C, we can make TRACE_FLAGS a list of masks that -* use the bits as defined above. +* And use TRACE_ITER(flag) to define the bit masks. */ -#undef C -#define C (a, b) TRACE_ITER_##a = (1 << TRACE_ITER_##a##_BIT) - -enum trace_iterator_flags {TRACE_FLAGS }; +#define TRACE_ITER (flag) \ + (TRACE_ITER_##flag##_BIT < 0 ? 0 : 1ULL << (TRACE_ITER_##flag##_BIT))/* * TRACE_ITER_SYM_MASK masks the options in trace_flags that * control the output of kernel symbols. */ #define TRACE_ITER_SYM_MASK \ - (TRACE_ITER_PRINT_PARENT|TRACE_ITER_SYM_OFFSET|TRACE_ITER_SYM_ADDR) + (TRACE_ITER(PRINT_PARENT)|TRACE_ITER(SYM_OFFSET)|TRACE_ITER(SYM_ADDR))extern struct tracer nop_trace;
@@ -1443,7 +1440,7 @@ extern int enable_branch_tracing(struct trace_array *tr);extern void disable_branch_tracing (void );static inline int trace_branch_enable (struct trace_array *tr) { -if (tr->trace_flags &TRACE_ITER_BRANCH ) +if (tr->trace_flags &TRACE_ITER (BRANCH ))return enable_branch_tracing (tr);return 0 ; }
@@ -2089,8 +2086,8 @@ extern const char *__stop___tracepoint_str[];void trace_printk_control (bool enabled);void trace_printk_start_comm (void ); -int trace_keep_overwrite (struct tracer *tracer,u32 mask,int set); -int set_tracer_flag (struct trace_array *tr,unsigned int mask,int enabled); +int trace_keep_overwrite (struct tracer *tracer,u64 mask,int set); +int set_tracer_flag (struct trace_array *tr,u64 mask,int enabled);/* Used from boot time tracer */ extern int trace_set_options (struct trace_array *tr,char *option);
kernel/trace/trace_events.c +2 -2
@@ -845,13 +845,13 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file,if (soft_disable)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 ();set_bit (EVENT_FILE_FL_RECORDED_CMD_BIT , &file->flags); } -if (tr->trace_flags &TRACE_ITER_RECORD_TGID ) { +if (tr->trace_flags &TRACE_ITER (RECORD_TGID )) { tgid = true;tracing_start_tgid_record ();set_bit (EVENT_FILE_FL_RECORDED_TGID_BIT , &file->flags);
kernel/trace/trace_events_synth.c +1 -1
@@ -359,7 +359,7 @@ static enum print_line_t print_synth_event(struct trace_iterator *iter, fmt =synth_field_fmt (se->fields[i]->type);/* parameter types */ -if (tr && tr->trace_flags &TRACE_ITER_VERBOSE ) +if (tr && tr->trace_flags &TRACE_ITER (VERBOSE ))trace_seq_printf (s,"%s " , fmt);snprintf (print_fmt,sizeof (print_fmt),"%%s=%s%%s" , fmt);
kernel/trace/trace_fprobe.c +3 -3
@@ -631,7 +631,7 @@ print_fentry_event(struct trace_iterator *iter, int flags,trace_seq_printf (s,"%s: (" ,trace_probe_name (tp)); -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 ))) goto out;trace_seq_putc (s,')' );
@@ -661,12 +661,12 @@ print_fexit_event(struct trace_iterator *iter, int flags,trace_seq_printf (s,"%s: (" ,trace_probe_name (tp)); -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 ))) goto out;trace_seq_puts (s," <- " ); -if (!seq_print_ip_sym (s, field->func, flags & ~TRACE_ITER_SYM_OFFSET )) +if (!seq_print_ip_sym (s, field->func, flags & ~TRACE_ITER (SYM_OFFSET ))) goto out;trace_seq_putc (s,')' );
kernel/trace/trace_functions_graph.c +9 -9
@@ -703,7 +703,7 @@ print_graph_irq(struct trace_iterator *iter, unsigned long addr, addr >= (unsigned long)__irqentry_text_end)return ; -if (tr->trace_flags &TRACE_ITER_CONTEXT_INFO ) { +if (tr->trace_flags &TRACE_ITER (CONTEXT_INFO )) {/* Absolute time */ if (flags &TRACE_GRAPH_PRINT_ABS_TIME )print_graph_abs_time (iter->ts, s);
@@ -723,7 +723,7 @@ print_graph_irq(struct trace_iterator *iter, unsigned long addr, }/* Latency format */ -if (tr->trace_flags &TRACE_ITER_LATENCY_FMT ) +if (tr->trace_flags &TRACE_ITER (LATENCY_FMT ))print_graph_lat_fmt (s, ent); }
@@ -777,7 +777,7 @@ print_graph_duration(struct trace_array *tr, unsigned long long duration, struct trace_seq *s, u32 flags) {if (!(flags &TRACE_GRAPH_PRINT_DURATION ) || - !(tr->trace_flags &TRACE_ITER_CONTEXT_INFO )) + !(tr->trace_flags &TRACE_ITER (CONTEXT_INFO )))return ;/* No real adata, just filling the column with spaces */
@@ -818,7 +818,7 @@ static void print_graph_retaddr(struct trace_seq *s, struct fgraph_retaddr_ent_etrace_seq_puts (s," /*" );trace_seq_puts (s," <-" ); -seq_print_ip_sym (s, entry->graph_ent.retaddr, trace_flags |TRACE_ITER_SYM_OFFSET ); +seq_print_ip_sym (s, entry->graph_ent.retaddr, trace_flags |TRACE_ITER (SYM_OFFSET ));if (comment)trace_seq_puts (s," */" );
@@ -1054,7 +1054,7 @@ print_graph_prologue(struct trace_iterator *iter, struct trace_seq *s,/* Interrupt */ print_graph_irq (iter, addr, type, cpu, ent->pid, flags); -if (!(tr->trace_flags &TRACE_ITER_CONTEXT_INFO )) +if (!(tr->trace_flags &TRACE_ITER (CONTEXT_INFO )))return ;/* Absolute time */
@@ -1076,7 +1076,7 @@ print_graph_prologue(struct trace_iterator *iter, struct trace_seq *s, }/* Latency format */ -if (tr->trace_flags &TRACE_ITER_LATENCY_FMT ) +if (tr->trace_flags &TRACE_ITER (LATENCY_FMT ))print_graph_lat_fmt (s, ent);return ;
@@ -1495,7 +1495,7 @@ static void print_lat_header(struct seq_file *s, u32 flags)static void __print_graph_headers_flags (struct trace_array *tr,struct seq_file *s,u32 flags) { -int lat = tr->trace_flags &TRACE_ITER_LATENCY_FMT ; +int lat = tr->trace_flags &TRACE_ITER (LATENCY_FMT );if (lat)print_lat_header (s, flags);
@@ -1543,10 +1543,10 @@ void print_graph_headers_flags(struct seq_file *s, u32 flags)struct trace_iterator *iter = s->private;struct trace_array *tr = iter->tr; -if (!(tr->trace_flags &TRACE_ITER_CONTEXT_INFO )) +if (!(tr->trace_flags &TRACE_ITER (CONTEXT_INFO )))return ; -if (tr->trace_flags &TRACE_ITER_LATENCY_FMT ) { +if (tr->trace_flags &TRACE_ITER (LATENCY_FMT )) {/* print nothing if the buffers are empty */ if (trace_empty (iter))return ;
kernel/trace/trace_irqsoff.c +15 -15
@@ -63,7 +63,7 @@ irq_trace(void)#ifdef CONFIG_FUNCTION_GRAPH_TRACER static int irqsoff_display_graph (struct trace_array *tr,int set); -# define is_graph (tr) ((tr)->trace_flags & TRACE_ITER_DISPLAY_GRAPH) +# define is_graph (tr) ((tr)->trace_flags & TRACE_ITER(DISPLAY_GRAPH))#else static inline int irqsoff_display_graph (struct trace_array *tr,int set) {
@@ -485,8 +485,8 @@ static int register_irqsoff_function(struct trace_array *tr, int graph, int set) {int ret; -/* 'set' is set if TRACE_ITER_FUNCTION is about to be set */ -if (function_enabled || (!set && !(tr->trace_flags &TRACE_ITER_FUNCTION ))) +/* 'set' is set if TRACE_ITER(FUNCTION) is about to be set */ +if (function_enabled || (!set && !(tr->trace_flags &TRACE_ITER (FUNCTION ))))return 0 ;if (graph)
@@ -515,7 +515,7 @@ static void unregister_irqsoff_function(struct trace_array *tr, int graph)static int irqsoff_function_set (struct trace_array *tr,u32 mask,int set) { -if (!(mask &TRACE_ITER_FUNCTION )) +if (!(mask &TRACE_ITER (FUNCTION )))return 0 ;if (set)
@@ -536,7 +536,7 @@ static inline int irqsoff_function_set(struct trace_array *tr, u32 mask, int set }#endif /* CONFIG_FUNCTION_TRACER */ -static int irqsoff_flag_changed (struct trace_array *tr,u32 mask,int set) +static int irqsoff_flag_changed (struct trace_array *tr,u64 mask,int set) {struct tracer *tracer = tr->current_trace;
@@ -544,7 +544,7 @@ static int irqsoff_flag_changed(struct trace_array *tr, u32 mask, int set)return 0 ;#ifdef CONFIG_FUNCTION_GRAPH_TRACER -if (mask &TRACE_ITER_DISPLAY_GRAPH ) +if (mask &TRACE_ITER (DISPLAY_GRAPH ))return irqsoff_display_graph (tr, set);#endif
@@ -582,10 +582,10 @@ static int __irqsoff_tracer_init(struct trace_array *tr) save_flags = tr->trace_flags;/* non overwrite screws up the latency tracers */ -set_tracer_flag (tr,TRACE_ITER_OVERWRITE ,1 ); -set_tracer_flag (tr,TRACE_ITER_LATENCY_FMT ,1 ); +set_tracer_flag (tr,TRACE_ITER (OVERWRITE ),1 ); +set_tracer_flag (tr,TRACE_ITER (LATENCY_FMT ),1 );/* without pause, we will produce garbage if another latency occurs */ -set_tracer_flag (tr,TRACE_ITER_PAUSE_ON_TRACE ,1 ); +set_tracer_flag (tr,TRACE_ITER (PAUSE_ON_TRACE ),1 ); tr->max_latency =0 ; irqsoff_trace = tr;
@@ -605,15 +605,15 @@ static int __irqsoff_tracer_init(struct trace_array *tr)static void __irqsoff_tracer_reset (struct trace_array *tr) { -int lat_flag = save_flags &TRACE_ITER_LATENCY_FMT ; -int overwrite_flag = save_flags &TRACE_ITER_OVERWRITE ; -int pause_flag = save_flags &TRACE_ITER_PAUSE_ON_TRACE ; +int lat_flag = save_flags &TRACE_ITER (LATENCY_FMT ); +int overwrite_flag = save_flags &TRACE_ITER (OVERWRITE ); +int pause_flag = save_flags &TRACE_ITER (PAUSE_ON_TRACE );stop_irqsoff_tracer (tr,is_graph (tr)); -set_tracer_flag (tr,TRACE_ITER_LATENCY_FMT , lat_flag); -set_tracer_flag (tr,TRACE_ITER_OVERWRITE , overwrite_flag); -set_tracer_flag (tr,TRACE_ITER_PAUSE_ON_TRACE , pause_flag); +set_tracer_flag (tr,TRACE_ITER (LATENCY_FMT ), lat_flag); +set_tracer_flag (tr,TRACE_ITER (OVERWRITE ), overwrite_flag); +set_tracer_flag (tr,TRACE_ITER (PAUSE_ON_TRACE ), pause_flag);ftrace_reset_array_ops (tr); irqsoff_busy = false;
kernel/trace/trace_kdb.c +1 -1
@@ -31,7 +31,7 @@ static void ftrace_dump_buf(int skip_entries, long cpu_file) old_userobj = tr->trace_flags;/* don't look at user memory in panic mode */ - tr->trace_flags &= ~TRACE_ITER_SYM_USEROBJ ; + tr->trace_flags &= ~TRACE_ITER (SYM_USEROBJ );kdb_printf ("Dumping ftrace buffer:\n" );if (skip_entries)
kernel/trace/trace_kprobe.c +3 -3
@@ -1584,7 +1584,7 @@ print_kprobe_event(struct trace_iterator *iter, int flags,trace_seq_printf (s,"%s: (" ,trace_probe_name (tp)); -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 ))) goto out;trace_seq_putc (s,')' );
@@ -1614,12 +1614,12 @@ print_kretprobe_event(struct trace_iterator *iter, int flags,trace_seq_printf (s,"%s: (" ,trace_probe_name (tp)); -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 ))) goto out;trace_seq_puts (s," <- " ); -if (!seq_print_ip_sym (s, field->func, flags & ~TRACE_ITER_SYM_OFFSET )) +if (!seq_print_ip_sym (s, field->func, flags & ~TRACE_ITER (SYM_OFFSET ))) goto out;trace_seq_putc (s,')' );
kernel/trace/trace_output.c +9 -9
@@ -420,7 +420,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, }mmap_read_unlock (mm); } -if (ret && ((sym_flags &TRACE_ITER_SYM_ADDR ) || !file)) +if (ret && ((sym_flags &TRACE_ITER (SYM_ADDR )) || !file))trace_seq_printf (s," <" IP_FMT ">" , ip);return !trace_seq_has_overflowed (s); }
@@ -433,9 +433,9 @@ seq_print_ip_sym(struct trace_seq *s, unsigned long ip, unsigned long sym_flags) goto out; } -trace_seq_print_sym (s, ip, sym_flags &TRACE_ITER_SYM_OFFSET ); +trace_seq_print_sym (s, ip, sym_flags &TRACE_ITER (SYM_OFFSET )); -if (sym_flags &TRACE_ITER_SYM_ADDR ) +if (sym_flags &TRACE_ITER (SYM_ADDR ))trace_seq_printf (s," <" IP_FMT ">" , ip); out:
@@ -569,7 +569,7 @@ static int lat_print_timestamp(struct trace_iterator *iter, u64 next_ts) {struct trace_array *tr = iter->tr; -unsigned long verbose = tr->trace_flags &TRACE_ITER_VERBOSE ; +unsigned long verbose = tr->trace_flags &TRACE_ITER (VERBOSE );unsigned long in_ns = iter->iter_flags &TRACE_FILE_TIME_IN_NS ;unsigned long long abs_ts = iter->ts - iter->array_buffer->time_start;unsigned long long rel_ts = next_ts - iter->ts;
@@ -636,7 +636,7 @@ int trace_print_context(struct trace_iterator *iter)trace_seq_printf (s,"%16s-%-7d " , comm, entry->pid); -if (tr->trace_flags &TRACE_ITER_RECORD_TGID ) { +if (tr->trace_flags &TRACE_ITER (RECORD_TGID )) {unsigned int tgid =trace_find_tgid (entry->pid);if (!tgid)
@@ -647,7 +647,7 @@ int trace_print_context(struct trace_iterator *iter)trace_seq_printf (s,"[%03d] " , iter->cpu); -if (tr->trace_flags &TRACE_ITER_IRQ_INFO ) +if (tr->trace_flags &TRACE_ITER (IRQ_INFO ))trace_print_lat_fmt (s, entry);trace_print_time (s, iter, iter->ts);
@@ -661,7 +661,7 @@ int trace_print_lat_context(struct trace_iterator *iter)struct trace_entry *entry, *next_entry;struct trace_array *tr = iter->tr;struct trace_seq *s = &iter->seq; -unsigned long verbose = (tr->trace_flags &TRACE_ITER_VERBOSE ); +unsigned long verbose = (tr->trace_flags &TRACE_ITER (VERBOSE ));u64 next_ts; next_entry =trace_find_next_entry (iter,NULL , &next_ts);
@@ -1150,7 +1150,7 @@ static void print_fn_trace(struct trace_seq *s, unsigned long ip,if (args)print_function_args (s, args, ip); -if ((flags &TRACE_ITER_PRINT_PARENT ) && parent_ip) { +if ((flags &TRACE_ITER (PRINT_PARENT )) && parent_ip) {trace_seq_puts (s," <-" );seq_print_ip_sym (s, parent_ip, flags); }
@@ -1440,7 +1440,7 @@ static enum print_line_t trace_user_stack_print(struct trace_iterator *iter,trace_seq_puts (s,"<user stack trace>\n" ); -if (tr->trace_flags &TRACE_ITER_SYM_USEROBJ ) { +if (tr->trace_flags &TRACE_ITER (SYM_USEROBJ )) {struct task_struct *task;/* * we do the lookup on the thread group leader,
kernel/trace/trace_sched_wakeup.c +12 -12
@@ -41,7 +41,7 @@ static void stop_func_tracer(struct trace_array *tr, int graph);static int save_flags;#ifdef CONFIG_FUNCTION_GRAPH_TRACER -# define is_graph (tr) ((tr)->trace_flags & TRACE_ITER_DISPLAY_GRAPH) +# define is_graph (tr) ((tr)->trace_flags & TRACE_ITER(DISPLAY_GRAPH))#else # define is_graph (tr) false#endif
@@ -247,8 +247,8 @@ static int register_wakeup_function(struct trace_array *tr, int graph, int set) {int ret; -/* 'set' is set if TRACE_ITER_FUNCTION is about to be set */ -if (function_enabled || (!set && !(tr->trace_flags &TRACE_ITER_FUNCTION ))) +/* 'set' is set if TRACE_ITER(FUNCTION) is about to be set */ +if (function_enabled || (!set && !(tr->trace_flags &TRACE_ITER (FUNCTION ))))return 0 ;if (graph)
@@ -277,7 +277,7 @@ static void unregister_wakeup_function(struct trace_array *tr, int graph)static int wakeup_function_set (struct trace_array *tr,u32 mask,int set) { -if (!(mask &TRACE_ITER_FUNCTION )) +if (!(mask &TRACE_ITER (FUNCTION )))return 0 ;if (set)
@@ -324,7 +324,7 @@ __trace_function(struct trace_array *tr,trace_function (tr, ip, parent_ip, trace_ctx,NULL ); } -static int wakeup_flag_changed (struct trace_array *tr,u32 mask,int set) +static int wakeup_flag_changed (struct trace_array *tr,u64 mask,int set) {struct tracer *tracer = tr->current_trace;
@@ -332,7 +332,7 @@ static int wakeup_flag_changed(struct trace_array *tr, u32 mask, int set)return 0 ;#ifdef CONFIG_FUNCTION_GRAPH_TRACER -if (mask &TRACE_ITER_DISPLAY_GRAPH ) +if (mask &TRACE_ITER (DISPLAY_GRAPH ))return wakeup_display_graph (tr, set);#endif
@@ -681,8 +681,8 @@ static int __wakeup_tracer_init(struct trace_array *tr) save_flags = tr->trace_flags;/* non overwrite screws up the latency tracers */ -set_tracer_flag (tr,TRACE_ITER_OVERWRITE ,1 ); -set_tracer_flag (tr,TRACE_ITER_LATENCY_FMT ,1 ); +set_tracer_flag (tr,TRACE_ITER (OVERWRITE ),1 ); +set_tracer_flag (tr,TRACE_ITER (LATENCY_FMT ),1 ); tr->max_latency =0 ; wakeup_trace = tr;
@@ -725,15 +725,15 @@ static int wakeup_dl_tracer_init(struct trace_array *tr)static void wakeup_tracer_reset (struct trace_array *tr) { -int lat_flag = save_flags &TRACE_ITER_LATENCY_FMT ; -int overwrite_flag = save_flags &TRACE_ITER_OVERWRITE ; +int lat_flag = save_flags &TRACE_ITER (LATENCY_FMT ); +int overwrite_flag = save_flags &TRACE_ITER (OVERWRITE );stop_wakeup_tracer (tr);/* make sure we put back any tasks we are tracing */ wakeup_reset (tr); -set_tracer_flag (tr,TRACE_ITER_LATENCY_FMT , lat_flag); -set_tracer_flag (tr,TRACE_ITER_OVERWRITE , overwrite_flag); +set_tracer_flag (tr,TRACE_ITER (LATENCY_FMT ), lat_flag); +set_tracer_flag (tr,TRACE_ITER (OVERWRITE ), overwrite_flag);ftrace_reset_array_ops (tr); wakeup_busy = false; }
kernel/trace/trace_syscalls.c +2 -2
@@ -264,7 +264,7 @@ print_syscall_enter(struct trace_iterator *iter, int flags,switch (entry->syscall_nr) {case __NR_openat: -if (!tr || !(tr->trace_flags &TRACE_ITER_VERBOSE )) +if (!tr || !(tr->trace_flags &TRACE_ITER (VERBOSE )))return sys_enter_openat_print (trace, entry, s, event);break ;default :
@@ -284,7 +284,7 @@ print_syscall_enter(struct trace_iterator *iter, int flags,trace_seq_puts (s,", " );/* parameter types */ -if (tr && tr->trace_flags &TRACE_ITER_VERBOSE ) +if (tr && tr->trace_flags &TRACE_ITER (VERBOSE ))trace_seq_printf (s,"%s " , entry->types[i]);/* parameter values */
kernel/trace/trace_wprobe.c +1 -1
@@ -260,7 +260,7 @@ print_wprobe_event(struct trace_iterator *iter, int flags,trace_seq_printf (s,"%s: (" ,trace_probe_name (tp)); -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 ))) goto out;trace_seq_putc (s,')' );
Masami Hiramatsu (Google)
maintainerPATCH v5 2/2 tracing: Add an option to show symbols in _text+offset for function profiler
In reply to Masami Hiramatsu (Google)From: Masami Hiramatsu (Google) <[email protected]>
Function profiler shows the hit count of each function using its symbol name. However, there are some same-name local symbols, which we can not distinguish.
To solve this issue, this introduces an option to show the symbols in "_text+OFFSET" format. This can avoid exposing the random shift of KASLR. The functions in modules are shown as "MODNAME+OFFSET" where the offset is from ".text".
E.g. for the kernel text symbols, specify vmlinux and the output to
addr2line, you can find the actual function and source info;
$ addr2line -fie vmlinux _text+3078208 __balance_callbacks kernel/sched/core.c:5064
for modules, specify the module file and .text+OFFSET;
$ addr2line -fie samples/trace_events/trace-events-sample.ko .text+8224 do_simple_thread_func samples/trace_events/trace-events-sample.c:23
---
Changes in v6:
- Show offset in hex.
- Make offset unsigned long.
Changes in v5:
- Update dummy flag according to new macros.
Changes in v2:
- Define a dummy TRACE_ITER_PROF_TEXT_OFFSET if CONFIG_FUNCTION_PROFILER=n.
--- kernel/trace/ftrace.c | 26 +++++++++++++++++++++++++- kernel/trace/trace.c | 5 +++-- kernel/trace/trace.h | 11 ++++++++++- 3 files changed, 38 insertions(+), 4 deletions(-)
kernel/trace/ftrace.c +25 -1
@@ -534,7 +534,9 @@ static int function_stat_headers(struct seq_file *m)static int function_stat_show (struct seq_file *m,void *v) { +struct trace_array *tr =trace_get_global_array ();struct ftrace_profile *rec = v; +const char *refsymbol =NULL ;char str[KSYM_SYMBOL_LEN ];#ifdef CONFIG_FUNCTION_GRAPH_TRACER static struct trace_seq s;
@@ -554,7 +556,29 @@ static int function_stat_show(struct seq_file *m, void *v)return 0 ;#endif -kallsyms_lookup (rec->ip,NULL ,NULL ,NULL , str); +if (tr->trace_flags &TRACE_ITER (PROF_TEXT_OFFSET )) { +unsigned long offset; + +if (core_kernel_text (rec->ip)) { + refsymbol ="_text" ; + offset = rec->ip - (unsigned long )_text; + }else { +struct module *mod; + +guard (rcu)(); + mod =__module_text_address (rec->ip); +if (mod) { + refsymbol = mod->name; +/* Calculate offset from module's text entry address. */ + offset = rec->ip - (unsigned long )mod->mem[MOD_TEXT ].base; + } + } +if (refsymbol) +snprintf (str,sizeof (str)," %s+%#lx" , refsymbol, offset); + } +if (!refsymbol) +kallsyms_lookup (rec->ip,NULL ,NULL ,NULL , str); +seq_printf (m," %-30.30s %10lu" , str, rec->counter);#ifdef CONFIG_FUNCTION_GRAPH_TRACER
kernel/trace/trace.c +3 -2
@@ -523,7 +523,8 @@ EXPORT_SYMBOL_GPL(unregister_ftrace_export);/* trace_options that are only supported by global_trace */ #define TOP_LEVEL_TRACE_FLAGS (TRACE_ITER(PRINTK) | \ - TRACE_ITER(PRINTK_MSGONLY) | TRACE_ITER(RECORD_CMD)) + TRACE_ITER(PRINTK_MSGONLY) | TRACE_ITER(RECORD_CMD) | \ + TRACE_ITER(PROF_TEXT_OFFSET))/* trace_flags that are default zero for instances */ #define ZEROED_TRACE_FLAGS \
@@ -11495,7 +11496,7 @@ __init static int tracer_alloc_buffers(void)#ifdef CONFIG_FUNCTION_TRACER /* Used to set module cached ftrace filtering at boot up */ -__init struct trace_array *trace_get_global_array (void ) +struct trace_array *trace_get_global_array (void ) {return &global_trace; }
kernel/trace/trace.h +10 -1
@@ -1367,6 +1367,14 @@ extern int trace_get_user(struct trace_parser *parser, const char __user *ubuf,# define STACK_FLAGS #endif +#ifdef CONFIG_FUNCTION_PROFILER +# define PROFILER_FLAGS \ + C(PROF_TEXT_OFFSET, "prof-text-offset"), +#else +# define PROFILER_FLAGS +# define TRACE_ITER_PROF_TEXT_OFFSET_BIT -1 +#endif +/* * trace_iterator_flags is an enumeration that defines bit * positions into trace_flags that controls the output.
@@ -1405,7 +1413,8 @@ extern int trace_get_user(struct trace_parser *parser, const char __user *ubuf,FUNCTION_FLAGS \ FGRAPH_FLAGS \STACK_FLAGS \ -BRANCH_FLAGS + BRANCH_FLAGS \ +PROFILER_FLAGS /* * By defining C, we can make TRACE_FLAGS a list of bit names
Masami Hiramatsu (Google)
maintainerOops, I missed to update the version in the subject. Let me update it.
Quoted 39 lines · On Thu, 30 Oct 2025 12:01:48 +0900 "Masami Hiramatsu (Google)"…
Hi,
This series implements an option to show symbols in _text+OFFSET format instead of symbol name in the function profiler. This is the 6th version, the previous one is here;
https://lore.kernel.org/all/176114747153.315239.6863821259073466010.stgit@devnote2/
This version is rebased on top of linux-trace/for-next branch and modify offset format to hex.
Thank you,
---
Masami Hiramatsu (Google) (2):
tracing: Allow tracer to add more than 32 options
tracing: Add an option to show symbols in _text+offset for function profilerkernel/trace/blktrace.c | 6 + kernel/trace/ftrace.c | 26 ++++++ kernel/trace/trace.c | 154 +++++++++++++++++----------------- kernel/trace/trace.h | 40 +++++---- kernel/trace/trace_events.c | 4 - kernel/trace/trace_events_synth.c | 2 kernel/trace/trace_fprobe.c | 6 + kernel/trace/trace_functions_graph.c | 18 ++-- kernel/trace/trace_irqsoff.c | 30 +++---- kernel/trace/trace_kdb.c | 2 kernel/trace/trace_kprobe.c | 6 + kernel/trace/trace_output.c | 18 ++-- kernel/trace/trace_sched_wakeup.c | 24 +++-- kernel/trace/trace_syscalls.c | 4 - kernel/trace/trace_wprobe.c | 2 15 files changed, 187 insertions(+), 155 deletions(-)--
Masami Hiramatsu (Google) <[email protected]>
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>