Commit 22d5bd68 authored by Jean-Philippe Brucker's avatar Jean-Philippe Brucker Committed by Alexei Starovoitov

tracing/probe: Fix bpf_task_fd_query() for kprobes and uprobes

Commit 60d53e2c ("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: 60d53e2c ("tracing/probe: Split trace_event related data from trace_probe")
Signed-off-by: default avatarJean-Philippe Brucker <jean-philippe@linaro.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Acked-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Link: https://lore.kernel.org/bpf/20200608124531.819838-1-jean-philippe@linaro.org
parent 21a85bd6
...@@ -1629,7 +1629,7 @@ int bpf_get_kprobe_info(const struct perf_event *event, u32 *fd_type, ...@@ -1629,7 +1629,7 @@ int bpf_get_kprobe_info(const struct perf_event *event, u32 *fd_type,
if (perf_type_tracepoint) if (perf_type_tracepoint)
tk = find_trace_kprobe(pevent, group); tk = find_trace_kprobe(pevent, group);
else else
tk = event->tp_event->data; tk = trace_kprobe_primary_from_call(event->tp_event);
if (!tk) if (!tk)
return -EINVAL; return -EINVAL;
......
...@@ -1412,7 +1412,7 @@ int bpf_get_uprobe_info(const struct perf_event *event, u32 *fd_type, ...@@ -1412,7 +1412,7 @@ int bpf_get_uprobe_info(const struct perf_event *event, u32 *fd_type,
if (perf_type_tracepoint) if (perf_type_tracepoint)
tu = find_probe_event(pevent, group); tu = find_probe_event(pevent, group);
else else
tu = event->tp_event->data; tu = trace_uprobe_primary_from_call(event->tp_event);
if (!tu) if (!tu)
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment