Commit f970cbcd authored by Toke Høiland-Jørgensen's avatar Toke Høiland-Jørgensen Committed by Alexei Starovoitov

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.

Fixes: b18c1f0a ("bpf: selftest: Adapt sock_fields test to use skel and global variables")
Fixes: 9a856cae ("bpf: selftest: Add test_btf_skc_cls_ingress")
Signed-off-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200929123026.46751-1-toke@redhat.com
parent f1fc8ece
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "test_progs.h" #include "test_progs.h"
#include "test_btf_skc_cls_ingress.skel.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; struct sockaddr_in6 srv_sa6;
static __u32 duration; static __u32 duration;
......
...@@ -36,7 +36,7 @@ struct bpf_spinlock_cnt { ...@@ -36,7 +36,7 @@ struct bpf_spinlock_cnt {
static struct sockaddr_in6 srv_sa6, cli_sa6; static struct sockaddr_in6 srv_sa6, cli_sa6;
static int sk_pkt_out_cnt10_fd; 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 int sk_pkt_out_cnt_fd;
static __u64 parent_cg_id; static __u64 parent_cg_id;
static __u64 child_cg_id; static __u64 child_cg_id;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment