Commit aca80dd9 authored by Delyan Kratunov's avatar Delyan Kratunov Committed by Alexei Starovoitov

uprobe: gate bpf call behind BPF_EVENTS

The call into bpf from uprobes needs to be gated now that it doesn't use
the trace_events.h helpers.

Randy found this as a randconfig build failure on linux-next [1].

  [1]: https://lore.kernel.org/linux-next/2de99180-7d55-2fdf-134d-33198c27cc58@infradead.org/Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarDelyan Kratunov <delyank@fb.com>
Tested-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Acked-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Link: https://lore.kernel.org/r/cb8bfbbcde87ed5d811227a393ef4925f2aadb7b.camel@fb.comSigned-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent e068c077
...@@ -1344,6 +1344,7 @@ static void __uprobe_perf_func(struct trace_uprobe *tu, ...@@ -1344,6 +1344,7 @@ static void __uprobe_perf_func(struct trace_uprobe *tu,
int size, esize; int size, esize;
int rctx; int rctx;
#ifdef CONFIG_BPF_EVENTS
if (bpf_prog_array_valid(call)) { if (bpf_prog_array_valid(call)) {
u32 ret; u32 ret;
...@@ -1351,6 +1352,7 @@ static void __uprobe_perf_func(struct trace_uprobe *tu, ...@@ -1351,6 +1352,7 @@ static void __uprobe_perf_func(struct trace_uprobe *tu,
if (!ret) if (!ret)
return; return;
} }
#endif /* CONFIG_BPF_EVENTS */
esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu)); esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));
......
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