Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf6735a4 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Steven Rostedt
Browse files

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

kprobe_perf_func() and kretprobe_perf_func() pass 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.

Link: http://lkml.kernel.org/r/20130620173811.GA13161@redhat.com



Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 10246fa3

kernel/trace/trace_kprobe.c

+2 −4
Original line number Diff line number Diff line
@@ -1098,8 +1098,7 @@ kprobe_perf_func(struct trace_probe *tp, struct pt_regs *regs) 
	entry->ip = (unsigned long)tp->rp.kp.addr;

	memset(&entry[1], 0, dsize);

	store_trace_args(sizeof(*entry), tp, regs, (u8 *)&entry[1], dsize);

	perf_trace_buf_submit(entry, size, rctx,

					entry->ip, 1, regs, head, NULL);

	perf_trace_buf_submit(entry, size, rctx, 0, 1, regs, head, NULL);

}



/* Kretprobe profile handler */
@@ -1132,8 +1131,7 @@ kretprobe_perf_func(struct trace_probe *tp, struct kretprobe_instance *ri, 
	entry->func = (unsigned long)tp->rp.kp.addr;

	entry->ret_ip = (unsigned long)ri->ret_addr;

	store_trace_args(sizeof(*entry), tp, regs, (u8 *)&entry[1], dsize);

	perf_trace_buf_submit(entry, size, rctx,

					entry->ret_ip, 1, regs, head, NULL);

	perf_trace_buf_submit(entry, size, rctx, 0, 1, regs, head, NULL);

}

#endif	/* CONFIG_PERF_EVENTS */