(2013/06/20 5:34), Oleg Nesterov wrote: > On 06/19, Oleg Nesterov wrote: >> >> So. I'll resend this series, will you ack the v2 below? > > Also. Could you please review the new patch I am going to include > into this series?
It looks OK for me. BTW, IIRC, I had reviewed same one previously... > > This is copy-and-paste of 32520b2c6 which you reviewed and acked. > > And please note that kprobes is the last user of > perf_trace_buf_submit(addr != 0), we can make some cleanups on top. Agreed, > > ------------------------------------------------------------------------------- > Subject: [PATCH] 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. > Acked-by: Masami Hiramatsu <[email protected]> Thank you! > Signed-off-by: Oleg Nesterov <[email protected]> > --- > kernel/trace/trace_kprobe.c | 6 ++---- > 1 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c > index 3432652..141c682 100644 > --- a/kernel/trace/trace_kprobe.c > +++ b/kernel/trace/trace_kprobe.c > @@ -1163,8 +1163,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 */ > @@ -1197,8 +1196,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 */ > > -- Masami HIRAMATSU IT Management Research Dept. Linux Technology Center Hitachi, Ltd., Yokohama Research Laboratory E-mail: [email protected] -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
