]> git.ipfire.org Git - thirdparty/linux.git/commit
bpf: Fix bpf_arena_handle_page_fault() redefinition without CONFIG_BPF_SYSCALL
authorTejun Heo <tj@kernel.org>
Wed, 27 May 2026 19:26:32 +0000 (09:26 -1000)
committerAlexei Starovoitov <ast@kernel.org>
Wed, 27 May 2026 20:50:35 +0000 (13:50 -0700)
commite42e53ae23b7d41df22ccd7788192bf578f24da2
tree09bf2cec8552c6a1d26623c059f259244c987700
parent8496d9020ff37a33c2a7b2fc84350fd03ffbde78
bpf: Fix bpf_arena_handle_page_fault() redefinition without CONFIG_BPF_SYSCALL

On configs with CONFIG_BPF=y but CONFIG_BPF_SYSCALL=n (e.g. arm
multi_v7_defconfig), kernel/bpf/core.c defines a __weak
bpf_arena_handle_page_fault() while bpf_defs.h already supplies a static
inline stub for it, causing a redefinition error. Build the __weak
definition only under CONFIG_BPF_SYSCALL, matching the bpf_defs.h
declaration and the CONFIG_BPF_SYSCALL-gated strong definition in arena.c.

Fixes: dc11a4dba246 ("bpf: Recover arena kernel faults with scratch page")
Reported-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20260527192632.2109419-1-tj@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/core.c