selftests: Make sure all 'skel' variables are declared static
Subsystems (5)
PATCH 1/1 selftests: Make sure all 'skel' variables are declared static
If programs in prog_tests using skeletons declare the 'skel' variable as global but not static, that will lead to linker errors on the final link of the prog_tests binary due to duplicate symbols. Fix a few instances of this.
--- tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c | 2 +- tools/testing/selftests/bpf/prog_tests/sock_fields.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c +1 -1
@@ -16,7 +16,7 @@#include "test_progs.h" #include "test_btf_skc_cls_ingress.skel.h" -struct test_btf_skc_cls_ingress *skel; +static struct test_btf_skc_cls_ingress *skel;struct sockaddr_in6 srv_sa6;static __u32 duration;
tools/testing/selftests/bpf/prog_tests/sock_fields.c +1 -1
@@ -36,7 +36,7 @@ struct bpf_spinlock_cnt {static struct sockaddr_in6 srv_sa6, cli_sa6;static int sk_pkt_out_cnt10_fd; -struct test_sock_fields *skel; +static struct test_sock_fields *skel;static int sk_pkt_out_cnt_fd;static __u64 parent_cg_id;static __u64 child_cg_id;
Signature · 1 line
2.28.0
Quoted 8 lines · Toke Høiland-Jørgensen
If programs in
prog_testsusing skeletons declare the 'skel' variable as global but not static, that will lead to linker errors on the final link of theprog_testsbinary due to duplicate symbols. Fix a few instances of this.Fixes b18c1f0aa477 ("bpf: selftest: Adapt sock_fields test to use skel and global variables")Fixes 9a856cae2217 ("bpf: selftest: Add test_btf_skc_cls_ingress")Signed-off-by Toke Høiland-Jørgensen <[email protected]>
Thanks for the fix. Applied.
I wonder why we don't see it with different gcc and clang versions. What linker do you use?
And what kind of error do you see?
Quoted 11 lines · Alexei Starovoitov
Quoted 8 lines · Toke Høiland-Jørgensen
If programs in
prog_testsusing skeletons declare the 'skel' variable as global but not static, that will lead to linker errors on the final link of theprog_testsbinary due to duplicate symbols. Fix a few instances of this.Fixes b18c1f0aa477 ("bpf: selftest: Adapt sock_fields test to use skel and global variables")Fixes 9a856cae2217 ("bpf: selftest: Add test_btf_skc_cls_ingress")Signed-off-by Toke Høiland-Jørgensen <[email protected]>Thanks for the fix. Applied.
You're welcome! And thanks :)
Quoted 1 line
I wonder why we don't see it with different gcc and clang versions.
Yeah, I was wondering about that as well, actually...
Quoted 2 lines
What linker do you use?
And what kind of error do you see?
BINARY test_progs/usr/bin/ld: /home/build/linux/tools/testing/selftests/bpf/sock_fields.test.o:/home/build/linux/tools/testing/selftests/bpf/prog_tests/sock_fields.c:39: multiple definition of `skel'; /home/build/linux/tools/testing/selftests/bpf/btf_skc_cls_ingress.test.o:/home/build/linux/tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c:19: first defined here
collect2: error: ld returned 1 exit status
make: *** [Makefile:397: /home/build/linux/tools/testing/selftests/bpf/test_progs] Error 1
$ ld --version GNU ld (GNU Binutils) 2.35
$ gcc --version gcc (GCC) 10.2.0
-Toke
This patch was applied to bpf/bpf-next.git (refs/heads/master):
Hello:
This patch was applied to bpf/bpf-next.git (refs/heads/master):
Quoted 9 lines · On Tue, 29 Sep 2020 14:30:26 +0200 you wrote:
If programs in
prog_testsusing skeletons declare the 'skel' variable as global but not static, that will lead to linker errors on the final link of theprog_testsbinary due to duplicate symbols. Fix a few instances of this.Fixes b18c1f0aa477 ("bpf: selftest: Adapt sock_fields test to use skel and global variables")Fixes 9a856cae2217 ("bpf: selftest: Add test_btf_skc_cls_ingress")Signed-off-by Toke Høiland-Jørgensen <[email protected]>[...]
Here is the summary with links:
- [bpf-next] selftests: Make sure all 'skel' variables are declared static
https://git.kernel.org/bpf/bpf-next/c/f970cbcdcdb5
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html