leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uprobes/tracing: Make register_uprobe_event() paths uretprobe-friendly

Browse Source 
Change uprobe_event_define_fields(), and __set_print_fmt() to check
is_ret_probe() and use the appropriate format/fields.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Tested-by: Anton Arapov <anton@redhat.com>
This commit is contained in:
Oleg Nesterov 2013-03-30 19:23:15 +01:00
parent 393a736c28
commit 4d1298e212
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/trace/trace_uprobe.c
View File

@ -628,8 +628,14 @@ static int uprobe_event_define_fields(struct ftrace_event_call *event_call)
struct uprobe_trace_entry_head field; struct uprobe_trace_entry_head field;
struct trace_uprobe *tu = event_call->data; struct trace_uprobe *tu = event_call->data;
DEFINE_FIELD(unsigned long, vaddr[0], FIELD_STRING_IP, 0); if (is_ret_probe(tu)) {
size = SIZEOF_TRACE_ENTRY(false); DEFINE_FIELD(unsigned long, vaddr[0], FIELD_STRING_FUNC, 0);
DEFINE_FIELD(unsigned long, vaddr[1], FIELD_STRING_RETIP, 0);
size = SIZEOF_TRACE_ENTRY(true);
} else {
DEFINE_FIELD(unsigned long, vaddr[0], FIELD_STRING_IP, 0);
size = SIZEOF_TRACE_ENTRY(false);
}
/* Set argument names as fields */ /* Set argument names as fields */
for (i = 0; i < tu->nr_args; i++) { for (i = 0; i < tu->nr_args; i++) {
ret = trace_define_field(event_call, tu->args[i].type->fmttype, ret = trace_define_field(event_call, tu->args[i].type->fmttype,
@ -652,8 +658,13 @@ static int __set_print_fmt(struct trace_uprobe *tu, char *buf, int len)
int i; int i;
int pos = 0; int pos = 0;
fmt = "(%lx)"; if (is_ret_probe(tu)) {
arg = "REC->" FIELD_STRING_IP; fmt = "(%lx <- %lx)";
arg = "REC->" FIELD_STRING_FUNC ", REC->" FIELD_STRING_RETIP;
} else {
fmt = "(%lx)";
arg = "REC->" FIELD_STRING_IP;
}
/* When len=0, we just calculate the needed length */ /* When len=0, we just calculate the needed length */