* [PATCH 1/2] tracing/trace_stack: cleanup for trace_lookup_stack() @ 2009-07-16 6:17 Xiao Guangrong 2009-07-16 6:21 ` [PATCH 2/2] tracing/function: cleanup for function tracer Xiao Guangrong 0 siblings, 1 reply; 3+ messages in thread From: Xiao Guangrong @ 2009-07-16 6:17 UTC (permalink / raw) To: Ingo Molnar; +Cc: Steven Rostedt, Frederic Weisbecker, LKML We can use %pF input format instead of sprint_symbol() and %s input format Thanks for Li Zefan's offline review. Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> Reviewed-by: Li Zefan <lizf@cn.fujitsu.com> --- kernel/trace/trace_stack.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index e644af9..a4dc8d9 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -234,15 +234,8 @@ static void t_stop(struct seq_file *m, void *p) static int trace_lookup_stack(struct seq_file *m, long i) { unsigned long addr = stack_dump_trace[i]; -#ifdef CONFIG_KALLSYMS - char str[KSYM_SYMBOL_LEN]; - sprint_symbol(str, addr); - - return seq_printf(m, "%s\n", str); -#else - return seq_printf(m, "%p\n", (void*)addr); -#endif + return seq_printf(m, "%pF\n", (void *)addr); } static void print_disabled(struct seq_file *m) -- 1.6.1.2 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] tracing/function: cleanup for function tracer 2009-07-16 6:17 [PATCH 1/2] tracing/trace_stack: cleanup for trace_lookup_stack() Xiao Guangrong @ 2009-07-16 6:21 ` Xiao Guangrong 2009-07-17 5:38 ` Frederic Weisbecker 0 siblings, 1 reply; 3+ messages in thread From: Xiao Guangrong @ 2009-07-16 6:21 UTC (permalink / raw) To: Ingo Molnar; +Cc: Steven Rostedt, Frederic Weisbecker, LKML We can use %pf input format instead of kallsyms_lookup() and %s input format Thanks for Li Zefan's offline review. Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> Reviewed-by: Li Zefan <lizf@cn.fujitsu.com> --- kernel/trace/ftrace.c | 17 +++-------------- kernel/trace/trace_functions.c | 4 +--- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 4521c77..8f7d28e 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -1438,18 +1438,13 @@ static int t_hash_show(struct seq_file *m, void *v) { struct ftrace_func_probe *rec; struct hlist_node *hnd = v; - char str[KSYM_SYMBOL_LEN]; rec = hlist_entry(hnd, struct ftrace_func_probe, node); if (rec->ops->print) return rec->ops->print(m, rec->ip, rec->ops, rec->data); - kallsyms_lookup(rec->ip, NULL, NULL, NULL, str); - seq_printf(m, "%s:", str); - - kallsyms_lookup((unsigned long)rec->ops->func, NULL, NULL, NULL, str); - seq_printf(m, "%s", str); + seq_printf(m, "%pf:%pf", (void *)rec->ip, (void *)rec->ops->func); if (rec->data) seq_printf(m, ":%p", rec->data); @@ -1547,7 +1542,6 @@ static int t_show(struct seq_file *m, void *v) { struct ftrace_iterator *iter = m->private; struct dyn_ftrace *rec = v; - char str[KSYM_SYMBOL_LEN]; if (iter->flags & FTRACE_ITER_HASH) return t_hash_show(m, v); @@ -1560,9 +1554,7 @@ static int t_show(struct seq_file *m, void *v) if (!rec) return 0; - kallsyms_lookup(rec->ip, NULL, NULL, NULL, str); - - seq_printf(m, "%s\n", str); + seq_printf(m, "%pf\n", (void *)rec->ip); return 0; } @@ -2543,7 +2535,6 @@ static void g_stop(struct seq_file *m, void *p) static int g_show(struct seq_file *m, void *v) { unsigned long *ptr = v; - char str[KSYM_SYMBOL_LEN]; if (!ptr) return 0; @@ -2553,9 +2544,7 @@ static int g_show(struct seq_file *m, void *v) return 0; } - kallsyms_lookup(*ptr, NULL, NULL, NULL, str); - - seq_printf(m, "%s\n", str); + seq_printf(m, "%pf\n", v); return 0; } diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index 7402144..b53dc99 100644 --- a/kernel/trace/trace_functions.c +++ b/kernel/trace/trace_functions.c @@ -288,11 +288,9 @@ static int ftrace_trace_onoff_print(struct seq_file *m, unsigned long ip, struct ftrace_probe_ops *ops, void *data) { - char str[KSYM_SYMBOL_LEN]; long count = (long)data; - kallsyms_lookup(ip, NULL, NULL, NULL, str); - seq_printf(m, "%s:", str); + seq_printf(m, "%pf:", (void *)ip); if (ops == &traceon_probe_ops) seq_printf(m, "traceon"); -- 1.6.1.2 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] tracing/function: cleanup for function tracer 2009-07-16 6:21 ` [PATCH 2/2] tracing/function: cleanup for function tracer Xiao Guangrong @ 2009-07-17 5:38 ` Frederic Weisbecker 0 siblings, 0 replies; 3+ messages in thread From: Frederic Weisbecker @ 2009-07-17 5:38 UTC (permalink / raw) To: Xiao Guangrong; +Cc: Ingo Molnar, Steven Rostedt, LKML On Thu, Jul 16, 2009 at 02:21:08PM +0800, Xiao Guangrong wrote: > We can use %pf input format instead of kallsyms_lookup() > and %s input format > > Thanks for Li Zefan's offline review. > > Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> > Reviewed-by: Li Zefan <lizf@cn.fujitsu.com> Queuing these two patches for .32 Thanks! Frederic. > --- > kernel/trace/ftrace.c | 17 +++-------------- > kernel/trace/trace_functions.c | 4 +--- > 2 files changed, 4 insertions(+), 17 deletions(-) > > diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c > index 4521c77..8f7d28e 100644 > --- a/kernel/trace/ftrace.c > +++ b/kernel/trace/ftrace.c > @@ -1438,18 +1438,13 @@ static int t_hash_show(struct seq_file *m, void *v) > { > struct ftrace_func_probe *rec; > struct hlist_node *hnd = v; > - char str[KSYM_SYMBOL_LEN]; > > rec = hlist_entry(hnd, struct ftrace_func_probe, node); > > if (rec->ops->print) > return rec->ops->print(m, rec->ip, rec->ops, rec->data); > > - kallsyms_lookup(rec->ip, NULL, NULL, NULL, str); > - seq_printf(m, "%s:", str); > - > - kallsyms_lookup((unsigned long)rec->ops->func, NULL, NULL, NULL, str); > - seq_printf(m, "%s", str); > + seq_printf(m, "%pf:%pf", (void *)rec->ip, (void *)rec->ops->func); > > if (rec->data) > seq_printf(m, ":%p", rec->data); > @@ -1547,7 +1542,6 @@ static int t_show(struct seq_file *m, void *v) > { > struct ftrace_iterator *iter = m->private; > struct dyn_ftrace *rec = v; > - char str[KSYM_SYMBOL_LEN]; > > if (iter->flags & FTRACE_ITER_HASH) > return t_hash_show(m, v); > @@ -1560,9 +1554,7 @@ static int t_show(struct seq_file *m, void *v) > if (!rec) > return 0; > > - kallsyms_lookup(rec->ip, NULL, NULL, NULL, str); > - > - seq_printf(m, "%s\n", str); > + seq_printf(m, "%pf\n", (void *)rec->ip); > > return 0; > } > @@ -2543,7 +2535,6 @@ static void g_stop(struct seq_file *m, void *p) > static int g_show(struct seq_file *m, void *v) > { > unsigned long *ptr = v; > - char str[KSYM_SYMBOL_LEN]; > > if (!ptr) > return 0; > @@ -2553,9 +2544,7 @@ static int g_show(struct seq_file *m, void *v) > return 0; > } > > - kallsyms_lookup(*ptr, NULL, NULL, NULL, str); > - > - seq_printf(m, "%s\n", str); > + seq_printf(m, "%pf\n", v); > > return 0; > } > diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c > index 7402144..b53dc99 100644 > --- a/kernel/trace/trace_functions.c > +++ b/kernel/trace/trace_functions.c > @@ -288,11 +288,9 @@ static int > ftrace_trace_onoff_print(struct seq_file *m, unsigned long ip, > struct ftrace_probe_ops *ops, void *data) > { > - char str[KSYM_SYMBOL_LEN]; > long count = (long)data; > > - kallsyms_lookup(ip, NULL, NULL, NULL, str); > - seq_printf(m, "%s:", str); > + seq_printf(m, "%pf:", (void *)ip); > > if (ops == &traceon_probe_ops) > seq_printf(m, "traceon"); > -- > 1.6.1.2 > ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-07-17 5:38 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-07-16 6:17 [PATCH 1/2] tracing/trace_stack: cleanup for trace_lookup_stack() Xiao Guangrong 2009-07-16 6:21 ` [PATCH 2/2] tracing/function: cleanup for function tracer Xiao Guangrong 2009-07-17 5:38 ` Frederic Weisbecker
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox