[PATCH bpf-next] uprobe: gate bpf call behind BPF_EVENTS

[PATCH bpf-next] uprobe: gate bpf call behind BPF_EVENTS

[Delyan Kratunov]

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>
---
 kernel/trace/trace_uprobe.c | 2 ++
 1 file changed, 2 insertions(+)

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));

--
2.36.1

Re: [PATCH bpf-next] uprobe: gate bpf call behind BPF_EVENTS

[Randy Dunlap]

On 6/20/22 14:47, Delyan Kratunov wrote:
> 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>

Thanks.

> ---
>  kernel/trace/trace_uprobe.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> 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));
> 
> --
> 2.36.1

-- 
~Randy

Re: [PATCH bpf-next] uprobe: gate bpf call behind BPF_EVENTS

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Alexei Starovoitov <ast@kernel.org>:

On Mon, 20 Jun 2022 21:47:55 +0000 you wrote:
> 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/
> 
> [...]

Here is the summary with links:
  - [bpf-next] uprobe: gate bpf call behind BPF_EVENTS
    https://git.kernel.org/bpf/bpf-next/c/aca80dd95e20

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html