bpf: Conditionally include dynptr copy kfuncs
PATCH 1/1 bpf: Conditionally include dynptr copy kfuncs
Since commit a498ee7576de ("bpf: Implement dynptr copy kfuncs"), if CONFIG_BPF_EVENTS is not enabled, but BPF_SYSCALL and DEBUG_INFO_BTF are, the build will break like so:
BTFIDS vmlinux.unstripped
WARN: resolve_btfids: unresolved symbol bpf_probe_read_user_str_dynptr
WARN: resolve_btfids: unresolved symbol bpf_probe_read_user_dynptr
WARN: resolve_btfids: unresolved symbol bpf_probe_read_kernel_str_dynptr
WARN: resolve_btfids: unresolved symbol bpf_probe_read_kernel_dynptr
WARN: resolve_btfids: unresolved symbol bpf_copy_from_user_task_str_dynptr
WARN: resolve_btfids: unresolved symbol bpf_copy_from_user_task_dynptr
WARN: resolve_btfids: unresolved symbol bpf_copy_from_user_str_dynptr
WARN: resolve_btfids: unresolved symbol bpf_copy_from_user_dynptr make[2]: *** [scripts/Makefile.vmlinux:72: vmlinux.unstripped] Error 255 make[2]: *** Deleting file 'vmlinux.unstripped'
make[1]: *** [/repo/malin/upstream/linux/Makefile:1242: vmlinux] Error 2
make: *** [Makefile:248: __sub-make] Error 2
Guard these symbols with #ifdef CONFIG_BPF_EVENTS to resolve the problem.
--- kernel/bpf/helpers.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/bpf/helpers.c +2 -0
@@ -4345,6 +4345,7 @@ BTF_ID_FLAGS(func, bpf_iter_kmem_cache_next, KF_ITER_NEXT | KF_RET_NULL | KF_SLE BTF_ID_FLAGS(func, bpf_iter_kmem_cache_destroy, KF_ITER_DESTROY | KF_SLEEPABLE) BTF_ID_FLAGS(func, bpf_local_irq_save) BTF_ID_FLAGS(func, bpf_local_irq_restore) +#ifdef CONFIG_BPF_EVENTS BTF_ID_FLAGS(func, bpf_probe_read_user_dynptr) BTF_ID_FLAGS(func, bpf_probe_read_kernel_dynptr)BTF_ID_FLAGS (func, bpf_probe_read_user_str_dynptr)
@@ -4353,6 +4354,7 @@ BTF_ID_FLAGS(func, bpf_copy_from_user_dynptr, KF_SLEEPABLE) BTF_ID_FLAGS(func, bpf_copy_from_user_str_dynptr, KF_SLEEPABLE) BTF_ID_FLAGS(func, bpf_copy_from_user_task_dynptr, KF_SLEEPABLE | KF_TRUSTED_ARGS) BTF_ID_FLAGS(func, bpf_copy_from_user_task_str_dynptr, KF_SLEEPABLE | KF_TRUSTED_ARGS) +#endif #ifdef CONFIG_DMA_SHARED_BUFFER BTF_ID_FLAGS(func, bpf_iter_dmabuf_new, KF_ITER_NEW | KF_SLEEPABLE)BTF_ID_FLAGS (func, bpf_iter_dmabuf_next,KF_ITER_NEXT |KF_RET_NULL |KF_SLEEPABLE )
Signature · 1 line
2.51.1
Quoted 40 lines · Malin Jonsson
Since commit
a498ee7576de("bpf: Implement dynptr copy kfuncs"), ifCONFIG_BPF_EVENTSis not enabled, butBPF_SYSCALLandDEBUG_INFO_BTFare, the build will break like so:BTFIDS vmlinux.unstripped
WARN:resolve_btfids: unresolved symbolbpf_probe_read_user_str_dynptr
WARN:resolve_btfids: unresolved symbolbpf_probe_read_user_dynptr
WARN:resolve_btfids: unresolved symbolbpf_probe_read_kernel_str_dynptr
WARN:resolve_btfids: unresolved symbolbpf_probe_read_kernel_dynptr
WARN:resolve_btfids: unresolved symbolbpf_copy_from_user_task_str_dynptr
WARN:resolve_btfids: unresolved symbolbpf_copy_from_user_task_dynptr
WARN:resolve_btfids: unresolved symbolbpf_copy_from_user_str_dynptr
WARN:resolve_btfids: unresolved symbolbpf_copy_from_user_dynptrmake[2]: *** [scripts/Makefile.vmlinux:72: vmlinux.unstripped] Error 255 make[2]: *** Deleting file 'vmlinux.unstripped'
make[1]: *** [/repo/malin/upstream/linux/Makefile:1242: vmlinux] Error 2
make: *** [Makefile:248: __sub-make] Error 2Guard these symbols with #ifdef
CONFIG_BPF_EVENTSto resolve the problem.Reported-by Yong Gu <[email protected]>Acked-by Mykyta Yatsenko <[email protected]>Signed-off-by Malin Jonsson <[email protected]>--- kernel/bpf/helpers.c | 2 ++ 1 file changed, 2 insertions(+)kernel/bpf/helpers.c +1
-0@@ -4345,6 +4345,7 @@ BTF_ID_FLAGS(func, bpf_iter_kmem_cache_next, KF_ITER_NEXT | KF_RET_NULL | KF_SLE BTF_ID_FLAGS(func, bpf_iter_kmem_cache_destroy, KF_ITER_DESTROY | KF_SLEEPABLE) BTF_ID_FLAGS(func, bpf_local_irq_save) BTF_ID_FLAGS(func, bpf_local_irq_restore) +#ifdef CONFIG_BPF_EVENTS BTF_ID_FLAGS(func, bpf_probe_read_user_dynptr) BTF_ID_FLAGS(func, bpf_probe_read_kernel_dynptr)BTF_ID_FLAGS (func, bpf_probe_read_user_str_dynptr)
kernel/bpf/helpers.c BTF_ID_FLAGS(func, bpf_copy_from_user_dynptr, KF_SLEEPABLE) · line 4360
Quoted 7 lines
kernel/bpf/helpers.c +1
-0@@ -4353,6 +4354,7 @@ BTF_ID_FLAGS(func, bpf_copy_from_user_dynptr, KF_SLEEPABLE) BTF_ID_FLAGS(func, bpf_copy_from_user_str_dynptr, KF_SLEEPABLE) BTF_ID_FLAGS(func, bpf_copy_from_user_task_dynptr, KF_SLEEPABLE | KF_TRUSTED_ARGS) BTF_ID_FLAGS(func, bpf_copy_from_user_task_str_dynptr, KF_SLEEPABLE | KF_TRUSTED_ARGS) +#endif #ifdef CONFIG_DMA_SHARED_BUFFER BTF_ID_FLAGS(func, bpf_iter_dmabuf_new, KF_ITER_NEW | KF_SLEEPABLE)BTF_ID_FLAGS (func, bpf_iter_dmabuf_next,KF_ITER_NEXT |KF_RET_NULL |KF_SLEEPABLE )
It would be great to include
in the commit message.
Some context for reviewers:
these kfuncs are defined in bpf_trace.c file which is conditionally built:
obj-$(CONFIG_BPF_EVENTS) += bpf_trace.o
We should guard kfuncs in helpers.c as well.
This patch was applied to bpf/bpf.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf.git (master)
by Alexei Starovoitov <[email protected]>:
Quoted 18 lines · On Fri, 24 Oct 2025 17:14:36 +0200 you wrote:
Since commit
a498ee7576de("bpf: Implement dynptr copy kfuncs"), ifCONFIG_BPF_EVENTSis not enabled, butBPF_SYSCALLandDEBUG_INFO_BTFare, the build will break like so:BTFIDS vmlinux.unstripped
WARN:resolve_btfids: unresolved symbolbpf_probe_read_user_str_dynptr
WARN:resolve_btfids: unresolved symbolbpf_probe_read_user_dynptr
WARN:resolve_btfids: unresolved symbolbpf_probe_read_kernel_str_dynptr
WARN:resolve_btfids: unresolved symbolbpf_probe_read_kernel_dynptr
WARN:resolve_btfids: unresolved symbolbpf_copy_from_user_task_str_dynptr
WARN:resolve_btfids: unresolved symbolbpf_copy_from_user_task_dynptr
WARN:resolve_btfids: unresolved symbolbpf_copy_from_user_str_dynptr
WARN:resolve_btfids: unresolved symbolbpf_copy_from_user_dynptrmake[2]: *** [scripts/Makefile.vmlinux:72: vmlinux.unstripped] Error 255 make[2]: *** Deleting file 'vmlinux.unstripped'
make[1]: *** [/repo/malin/upstream/linux/Makefile:1242: vmlinux] Error 2
make: *** [Makefile:248: __sub-make] Error 2
Quoted 1 line
[...]
Here is the summary with links:
- bpf: Conditionally include dynptr copy kfuncs
https://git.kernel.org/bpf/bpf/c/8ce93aabbf75
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html