bpf: fix "unresolved symbol" build error with resolve_btfids
Subsystems (4)
PATCH v3 1/1 bpf: fix "unresolved symbol" build error with resolve_btfids
Michal reported a build failure likes below:
BTFIDS vmlinux
FAILED unresolved symbol tcp_timewait_sock
make[1]: *** [/.../linux-5.9-rc7/Makefile:1176: vmlinux] Error 255
This error can be triggered when config has CONFIG_NET enabled but CONFIG_INET disabled. In this case, there is no user of structs inet_timewait_sock and tcp_timewait_sock and hence vmlinux BTF types are not generated for these two structures.
To fix the problem, let us force BTF generation for these two structures with BTF_TYPE_EMIT.
--- net/core/filter.c | 6 ++++++ 1 file changed, 6 insertions(+)
Changelog:
v2 -> v3:
. instead of avoiding generating BTF types which is more
complex, just always generating these BTF types (under CONFIG_NET).
v1 -> v2:
. For unsupported socket times, using BTF_ID_UNUSED to
keep the id as 0. (Martin)
net/core/filter.c +6 -0
@@ -9558,6 +9558,12 @@ const struct bpf_func_proto bpf_skc_to_tcp_sock_proto = { BPF_CALL_1(bpf_skc_to_tcp_timewait_sock, struct sock *, sk) { +/* BTF types for tcp_timewait_sock and inet_timewait_sock are not +* generated if CONFIG_INET=n. Trigger an explicit generation here. +*/ +BTF_TYPE_EMIT (struct inet_timewait_sock ); +BTF_TYPE_EMIT (struct tcp_timewait_sock ); +#ifdef CONFIG_INET if (sk && sk->sk_prot == &tcp_prot && sk->sk_state ==TCP_TIME_WAIT )return (unsigned long )sk;
Signature · 1 line
2.24.1
Quoted 5 lines · Yonghong Song
Michal reported a build failure likes below:
BTFIDS vmlinux
FAILED unresolved symboltcp_timewait_sock
make[1]: *** [/.../linux-5.9-rc7/Makefile:1176: vmlinux] Error 255
Quoted 7 lines
This error can be triggered when config has
CONFIG_NETenabled butCONFIG_INETdisabled. In this case, there is no user of structsinet_timewait_sockandtcp_timewait_sockand hence vmlinux BTF types are not generated for these two structures.To fix the problem, let us force BTF generation for these two structures with
BTF_TYPE_EMIT.
This patch was applied to bpf/bpf.git (refs/heads/master):
Hello:
This patch was applied to bpf/bpf.git (refs/heads/master):
Quoted 11 lines · On Wed, 30 Sep 2020 22:13:39 -0700 you wrote:
Michal reported a build failure likes below:
BTFIDS vmlinux
FAILED unresolved symboltcp_timewait_sock
make[1]: *** [/.../linux-5.9-rc7/Makefile:1176: vmlinux] Error 255This error can be triggered when config has
CONFIG_NETenabled butCONFIG_INETdisabled. In this case, there is no user of structsinet_timewait_sockandtcp_timewait_sockand hence vmlinux BTF types are not generated for these two structures.[...]
Here is the summary with links:
- [v3] bpf: fix "unresolved symbol" build error with resolve_btfids
https://git.kernel.org/bpf/bpf/c/d82a532a6115
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html