Commit fff1787a authored by Song Chen's avatar Song Chen Committed by Steven Rostedt (Google)
Browse files

trace/kprobe: remove duplicated calls of ring_buffer_event_data 

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.

Link: https://lore.kernel.org/all/1666145478-4706-1-git-send-email-chensong_2000@189.cn/



Reviewed-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
Acked-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: default avatarSong Chen <chensong_2000@189.cn>
Signed-off-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
parent 8c2b9979

kernel/trace/trace_kprobe.c

+0 −2
Original line number Diff line number Diff line
@@ -1344,7 +1344,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);
@@ -1385,7 +1384,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);