lkml.org 
[lkml]   [2013]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 5/6] uprobes/tracing: Make seq_printf() code uretprobe-friendly
* Oleg Nesterov <oleg@redhat.com> [2013-04-01 18:08:57]:

> Change probes_seq_show() and print_uprobe_event() to check
> is_ret_probe() and print the correct data.
>
> Signed-off-by: Oleg Nesterov <oleg@redhat.com>

Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>

> ---
> kernel/trace/trace_uprobe.c | 17 +++++++++++++----
> 1 files changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
> index f75e52d..1b3622a 100644
> --- a/kernel/trace/trace_uprobe.c
> +++ b/kernel/trace/trace_uprobe.c
> @@ -434,9 +434,10 @@ static void probes_seq_stop(struct seq_file *m, void *v)
> static int probes_seq_show(struct seq_file *m, void *v)
> {
> struct trace_uprobe *tu = v;
> + char c = is_ret_probe(tu) ? 'r' : 'p';
> int i;
>
> - seq_printf(m, "p:%s/%s", tu->call.class->system, tu->call.name);
> + seq_printf(m, "%c:%s/%s", c, tu->call.class->system, tu->call.name);
> seq_printf(m, " %s:0x%p", tu->filename, (void *)tu->offset);
>
> for (i = 0; i < tu->nr_args; i++)
> @@ -569,10 +570,18 @@ print_uprobe_event(struct trace_iterator *iter, int flags, struct trace_event *e
> entry = (struct uprobe_trace_entry_head *)iter->ent;
> tu = container_of(event, struct trace_uprobe, call.event);
>
> - if (!trace_seq_printf(s, "%s: (0x%lx)", tu->call.name, entry->vaddr[0]))
> - goto partial;
> + if (is_ret_probe(tu)) {
> + if (!trace_seq_printf(s, "%s: (0x%lx <- 0x%lx)", tu->call.name,
> + entry->vaddr[1], entry->vaddr[0]))
> + goto partial;
> + data = DATAOF_TRACE_ENTRY(entry, 2);
> + } else {
> + if (!trace_seq_printf(s, "%s: (0x%lx)", tu->call.name,
> + entry->vaddr[0]))
> + goto partial;
> + data = DATAOF_TRACE_ENTRY(entry, 1);
> + }
>
> - data = DATAOF_TRACE_ENTRY(entry, 1);
> for (i = 0; i < tu->nr_args; i++) {
> if (!tu->args[i].type->print(s, tu->args[i].name,
> data + tu->args[i].offset, entry))
> --
> 1.5.5.1
>

--
Thanks and Regards
Srikar Dronamraju



\
 
 \ /
  Last update: 2013-04-07 17:01    [W:0.916 / U:0.040 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site