* [PATCH v2] trace/kprobe: remove duplicated calls of ring_buffer_event_data
@ 2022-10-19 2:11 Song Chen
2022-10-19 13:30 ` Steven Rostedt
0 siblings, 1 reply; 3+ messages in thread
From: Song Chen @ 2022-10-19 2:11 UTC (permalink / raw)
To: rostedt, mingo, mhiramat; +Cc: linux-kernel, xiehuan09, Song Chen
Function __kprobe_trace_func calls ring_buffer_event_data to
get a ring buffer, however, it has been done in above call
trace_event_buffer_reserve. So does __kretprobe_trace_func.
This patch removes those duplicated calls.
Signed-off-by: Song Chen <chensong_2000@189.cn>
---
kernel/trace/trace_kprobe.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 23f7f0ec4f4c..f905829b856b 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1394,7 +1394,6 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs,
return;
fbuffer.regs = regs;
- entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event);
entry->ip = (unsigned long)tk->rp.kp.addr;
store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize);
@@ -1435,7 +1434,6 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
return;
fbuffer.regs = regs;
- entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event);
entry->func = (unsigned long)tk->rp.kp.addr;
entry->ret_ip = get_kretprobe_retaddr(ri);
store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize);
--
2.25.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] trace/kprobe: remove duplicated calls of ring_buffer_event_data
2022-10-19 2:11 [PATCH v2] trace/kprobe: remove duplicated calls of ring_buffer_event_data Song Chen
@ 2022-10-19 13:30 ` Steven Rostedt
2022-10-19 14:46 ` Masami Hiramatsu
0 siblings, 1 reply; 3+ messages in thread
From: Steven Rostedt @ 2022-10-19 13:30 UTC (permalink / raw)
To: Song Chen; +Cc: mingo, mhiramat, linux-kernel, xiehuan09
On Wed, 19 Oct 2022 10:11:18 +0800
Song Chen <chensong_2000@189.cn> wrote:
> Function __kprobe_trace_func calls ring_buffer_event_data to
> get a ring buffer, however, it has been done in above call
> trace_event_buffer_reserve. So does __kretprobe_trace_func.
>
> This patch removes those duplicated calls.
>
> Signed-off-by: Song Chen <chensong_2000@189.cn>
Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Masami, want to take this one?
-- Steve
> ---
> kernel/trace/trace_kprobe.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
> index 23f7f0ec4f4c..f905829b856b 100644
> --- a/kernel/trace/trace_kprobe.c
> +++ b/kernel/trace/trace_kprobe.c
> @@ -1394,7 +1394,6 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs,
> return;
>
> fbuffer.regs = regs;
> - entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event);
> entry->ip = (unsigned long)tk->rp.kp.addr;
> store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize);
>
> @@ -1435,7 +1434,6 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
> return;
>
> fbuffer.regs = regs;
> - entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event);
> entry->func = (unsigned long)tk->rp.kp.addr;
> entry->ret_ip = get_kretprobe_retaddr(ri);
> store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] trace/kprobe: remove duplicated calls of ring_buffer_event_data
2022-10-19 13:30 ` Steven Rostedt
@ 2022-10-19 14:46 ` Masami Hiramatsu
0 siblings, 0 replies; 3+ messages in thread
From: Masami Hiramatsu @ 2022-10-19 14:46 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Song Chen, mingo, mhiramat, linux-kernel, xiehuan09
On Wed, 19 Oct 2022 09:30:22 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:
> On Wed, 19 Oct 2022 10:11:18 +0800
> Song Chen <chensong_2000@189.cn> wrote:
>
> > Function __kprobe_trace_func calls ring_buffer_event_data to
> > get a ring buffer, however, it has been done in above call
> > trace_event_buffer_reserve. So does __kretprobe_trace_func.
> >
> > This patch removes those duplicated calls.
> >
> > Signed-off-by: Song Chen <chensong_2000@189.cn>
>
> Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>
>
> Masami, want to take this one?
yes, this looks good to me.
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Thank you,
>
> -- Steve
>
> > ---
> > kernel/trace/trace_kprobe.c | 2 --
> > 1 file changed, 2 deletions(-)
> >
> > diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
> > index 23f7f0ec4f4c..f905829b856b 100644
> > --- a/kernel/trace/trace_kprobe.c
> > +++ b/kernel/trace/trace_kprobe.c
> > @@ -1394,7 +1394,6 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs,
> > return;
> >
> > fbuffer.regs = regs;
> > - entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event);
> > entry->ip = (unsigned long)tk->rp.kp.addr;
> > store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize);
> >
> > @@ -1435,7 +1434,6 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
> > return;
> >
> > fbuffer.regs = regs;
> > - entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event);
> > entry->func = (unsigned long)tk->rp.kp.addr;
> > entry->ret_ip = get_kretprobe_retaddr(ri);
> > store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize);
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-19 14:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-19 2:11 [PATCH v2] trace/kprobe: remove duplicated calls of ring_buffer_event_data Song Chen
2022-10-19 13:30 ` Steven Rostedt
2022-10-19 14:46 ` Masami Hiramatsu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®