evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uprobes/tracing: Don't pass addr=ip to perf_trace_buf_submit()

Browse source 
uprobe_perf_print() passes addr=ip to perf_trace_buf_submit() for
no reason. This sets perf_sample_data->addr for PERF_SAMPLE_ADDR,
we already have perf_sample_data->ip initialized if PERF_SAMPLE_IP.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
This commit is contained in:
Oleg Nesterov 2013-04-10 16:25:49 +02:00
parent 4ee5a52ed6
commit 32520b2c69
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kernel/trace/trace_uprobe.c
View file

@ -811,7 +811,6 @@ static void uprobe_perf_print(struct trace_uprobe *tu,
struct ftrace_event_call *call = &tu->call; struct ftrace_event_call *call = &tu->call;
struct uprobe_trace_entry_head *entry; struct uprobe_trace_entry_head *entry;
struct hlist_head *head; struct hlist_head *head;
unsigned long ip;
void *data; void *data;
int size, rctx, i; int size, rctx, i;
@ -825,13 +824,12 @@ static void uprobe_perf_print(struct trace_uprobe *tu,
if (!entry) if (!entry)
goto out; goto out;
ip = instruction_pointer(regs);
if (is_ret_probe(tu)) { if (is_ret_probe(tu)) {
entry->vaddr[0] = func; entry->vaddr[0] = func;
entry->vaddr[1] = ip; entry->vaddr[1] = instruction_pointer(regs);
data = DATAOF_TRACE_ENTRY(entry, true); data = DATAOF_TRACE_ENTRY(entry, true);
} else { } else {
entry->vaddr[0] = ip; entry->vaddr[0] = instruction_pointer(regs);
data = DATAOF_TRACE_ENTRY(entry, false); data = DATAOF_TRACE_ENTRY(entry, false);
} }
@ -839,7 +837,7 @@ static void uprobe_perf_print(struct trace_uprobe *tu,
call_fetch(&tu->args[i].fetch, regs, data + tu->args[i].offset); call_fetch(&tu->args[i].fetch, regs, data + tu->args[i].offset);
head = this_cpu_ptr(call->perf_events); head = this_cpu_ptr(call->perf_events);
perf_trace_buf_submit(entry, size, rctx, ip, 1, regs, head, NULL); perf_trace_buf_submit(entry, size, rctx, 0, 1, regs, head, NULL);
out: out:
preempt_enable(); preempt_enable();
} }