Commit c7c658ef authored Jun 08, 2020 by Jean-Philippe Brucker Committed by Greg Kroah-Hartman Jun 24, 2020

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



[ Upstream commit 22d5bd6867364b41576a712755271a7d6161abd6 ]

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: Jean-Philippe Brucker <jean-philippe@linaro.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Link: https://lore.kernel.org/bpf/20200608124531.819838-1-jean-philippe@linaro.org


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 5bed77b0

kernel/trace/trace_kprobe.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1464,7 +1464,7 @@ int bpf_get_kprobe_info(const struct perf_event event, u32 fd_type,
		if (perf_type_tracepoint)
		tk = find_trace_kprobe(pevent, group);
		else
		tk = event->tp_event->data;
		tk = trace_kprobe_primary_from_call(event->tp_event);
		if (!tk)
		return -EINVAL;

kernel/trace/trace_uprobe.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1405,7 +1405,7 @@ int bpf_get_uprobe_info(const struct perf_event event, u32 fd_type,
		if (perf_type_tracepoint)
		tu = find_probe_event(pevent, group);
		else
		tu = event->tp_event->data;
		tu = trace_uprobe_primary_from_call(event->tp_event);
		if (!tu)
		return -EINVAL;