diff options
| author |   Delyan Kratunov <delyank@fb.com> | 2022-06-20 21:47:55 +0000 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2022-06-20 17:04:03 -0700 |
| commit | aca80dd95e20f1fa0daa212afc83c9fa0ad239e5 (patch) | |
| tree | 4b6f09b78a1728f5d77a52226c6ff1f352c7ffba | |
| parent | selftests/bpf: Enable config options needed for xdp_synproxy test (diff) | |
| download | linux-dev-aca80dd95e20f1fa0daa212afc83c9fa0ad239e5.tar.xz linux-dev-aca80dd95e20f1fa0daa212afc83c9fa0ad239e5.zip | |
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: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Delyan Kratunov <delyank@fb.com>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Link: https://lore.kernel.org/r/cb8bfbbcde87ed5d811227a393ef4925f2aadb7b.camel@fb.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
| -rw-r--r-- | kernel/trace/trace_uprobe.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 0282c119b1b2..326235fd2346 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -1344,6 +1344,7 @@ static void __uprobe_perf_func(struct trace_uprobe *tu, int size, esize; int rctx; +#ifdef CONFIG_BPF_EVENTS if (bpf_prog_array_valid(call)) { u32 ret; @@ -1351,6 +1352,7 @@ static void __uprobe_perf_func(struct trace_uprobe *tu, if (!ret) return; } +#endif /* CONFIG_BPF_EVENTS */ esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu)); |