Skip to content

Commit 5e6cd84

Browse files
committed
tracing/kprobes: Do not open code event reserve logic
As kprobe events use trace_event_buffer_commit() to commit the event to the ftrace ring buffer, for consistency, it should use trace_event_buffer_reserve() to allocate it, as the two functions are related. Link: https://lkml.kernel.org/r/[email protected] Acked-by: Masami Hiramatsu <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]>
1 parent 3e8b1a2 commit 5e6cd84

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed

kernel/trace/trace_kprobe.c

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,17 +1383,11 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs,
13831383
if (trace_trigger_soft_disabled(trace_file))
13841384
return;
13851385

1386-
fbuffer.trace_ctx = tracing_gen_ctx();
1387-
fbuffer.trace_file = trace_file;
1388-
13891386
dsize = __get_data_size(&tk->tp, regs);
13901387

1391-
fbuffer.event =
1392-
trace_event_buffer_lock_reserve(&fbuffer.buffer, trace_file,
1393-
call->event.type,
1394-
sizeof(*entry) + tk->tp.size + dsize,
1395-
fbuffer.trace_ctx);
1396-
if (!fbuffer.event)
1388+
entry = trace_event_buffer_reserve(&fbuffer, trace_file,
1389+
sizeof(*entry) + tk->tp.size + dsize);
1390+
if (!entry)
13971391
return;
13981392

13991393
fbuffer.regs = regs;
@@ -1430,16 +1424,11 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
14301424
if (trace_trigger_soft_disabled(trace_file))
14311425
return;
14321426

1433-
fbuffer.trace_ctx = tracing_gen_ctx();
1434-
fbuffer.trace_file = trace_file;
1435-
14361427
dsize = __get_data_size(&tk->tp, regs);
1437-
fbuffer.event =
1438-
trace_event_buffer_lock_reserve(&fbuffer.buffer, trace_file,
1439-
call->event.type,
1440-
sizeof(*entry) + tk->tp.size + dsize,
1441-
fbuffer.trace_ctx);
1442-
if (!fbuffer.event)
1428+
1429+
entry = trace_event_buffer_reserve(&fbuffer, trace_file,
1430+
sizeof(*entry) + tk->tp.size + dsize);
1431+
if (!entry)
14431432
return;
14441433

14451434
fbuffer.regs = regs;

0 commit comments

Comments
 (0)