Skip to content

Commit 22d5bd6

Browse files
jpbruckerAlexei Starovoitov
authored andcommitted
tracing/probe: Fix bpf_task_fd_query() for kprobes and uprobes
Commit 60d53e2 ("tracing/probe: Split trace_event related data from trace_probe") removed the trace_[ku]probe structure from the trace_event_call->data pointer. As bpf_get_[ku]probe_info() were forgotten in that change, fix them now. These functions are currently only used by the bpf_task_fd_query() syscall handler to collect information about a perf event. Fixes: 60d53e2 ("tracing/probe: Split trace_event related data from trace_probe") Signed-off-by: Jean-Philippe Brucker <[email protected]> Signed-off-by: Alexei Starovoitov <[email protected]> Acked-by: Yonghong Song <[email protected]> Acked-by: Masami Hiramatsu <[email protected]> Link: https://lore.kernel.org/bpf/[email protected]
1 parent 21a85bd commit 22d5bd6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

kernel/trace/trace_kprobe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1629,7 +1629,7 @@ int bpf_get_kprobe_info(const struct perf_event *event, u32 *fd_type,
16291629
if (perf_type_tracepoint)
16301630
tk = find_trace_kprobe(pevent, group);
16311631
else
1632-
tk = event->tp_event->data;
1632+
tk = trace_kprobe_primary_from_call(event->tp_event);
16331633
if (!tk)
16341634
return -EINVAL;
16351635

kernel/trace/trace_uprobe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1412,7 +1412,7 @@ int bpf_get_uprobe_info(const struct perf_event *event, u32 *fd_type,
14121412
if (perf_type_tracepoint)
14131413
tu = find_probe_event(pevent, group);
14141414
else
1415-
tu = event->tp_event->data;
1415+
tu = trace_uprobe_primary_from_call(event->tp_event);
14161416
if (!tu)
14171417
return -EINVAL;
14181418

0 commit comments

Comments
 (0)