selftests/bpf: Do not fail build if CONFIG_NF_CONNTRACK=m/n
Subsystems (3)
Kumar Kartikeya Dwivedi
maintainerPATCH 1/1 selftests/bpf: Do not fail build if CONFIG_NF_CONNTRACK=m/n
Some users have complained that selftests fail to build when CONFIG_NF_CONNTRACK=m. It would be useful to allow building as long as it is set to module or built-in, even though in case of building as module, user would need to load it before running the selftest. Note that this also allows building selftest when CONFIG_NF_CONNTRACK is disabled.
--- tools/testing/selftests/bpf/progs/test_bpf_nf.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/progs/test_bpf_nf.c +13 -4
@@ -17,18 +17,27 @@ int test_enonet_netns_id = 0;int test_enoent_lookup =0 ;int test_eafnosupport =0 ; +struct nf_conn ; + +struct bpf_ct_opts___local { +s32 netns_id; +s32 error; +u8 l4proto; +u8 reserved[3 ]; +}; +struct nf_conn *bpf_xdp_ct_lookup (struct xdp_md *,struct bpf_sock_tuple *,u32 , -struct bpf_ct_opts *,u32 ) __ksym; +struct bpf_ct_opts___local *,u32 ) __ksym;struct nf_conn *bpf_skb_ct_lookup (struct __sk_buff *,struct bpf_sock_tuple *,u32 , -struct bpf_ct_opts *,u32 ) __ksym; +struct bpf_ct_opts___local *,u32 ) __ksym; void bpf_ct_release(struct nf_conn *) __ksym; static __always_inline voidnf_ct_test (struct nf_conn *(*func)(void *,struct bpf_sock_tuple *,u32 , -struct bpf_ct_opts *,u32 ), +struct bpf_ct_opts___local *,u32 ),void *ctx) { -struct bpf_ct_opts opts_def = { .l4proto =IPPROTO_TCP , .netns_id =-1 }; +struct bpf_ct_opts___local opts_def = { .l4proto =IPPROTO_TCP , .netns_id =-1 };struct bpf_sock_tuple bpf_tuple;struct nf_conn *ct;
--
2.34.1
Quoted 19 lines · Kumar Kartikeya Dwivedi
Some users have complained that selftests fail to build when
CONFIG_NF_CONNTRACK=m. It would be useful to allow building as long as it is set to module or built-in, even though in case of building as module, user would need to load it before running the selftest. Note that this also allows building selftest whenCONFIG_NF_CONNTRACKis disabled.Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>--- tools/testing/selftests/bpf/progs/test_bpf_nf.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)tools/testing/selftests/bpf/progs/test_bpf_nf.c +0
-0@@ -17,18 +17,27 @@ int test_enonet_netns_id = 0;int test_enoent_lookup =0 ;
tools/testing/selftests/bpf/progs/test_bpf_nf.c int test_enonet_netns_id = 0; · line 27
Quoted 10 lines
tools/testing/selftests/bpf/progs/test_bpf_nf.c +8
-0int test_eafnosupport =0 ; +struct nf_conn ; + +struct bpf_ct_opts___local { +s32 netns_id; +s32 error; +u8 l4proto; +u8 reserved[3 ]; +};
I've added __attribute__((preserve_access_index)) to make it CO-RE-relocatable, just in case. Applied to bpf-next.
Quoted 23 lines
tools/testing/selftests/bpf/progs/test_bpf_nf.c +5
-5+struct nf_conn *bpf_xdp_ct_lookup (struct xdp_md *,struct bpf_sock_tuple *,u32 , -struct bpf_ct_opts *,u32 ) __ksym; +struct bpf_ct_opts___local *,u32 ) __ksym;struct nf_conn *bpf_skb_ct_lookup (struct __sk_buff *,struct bpf_sock_tuple *,u32 , -struct bpf_ct_opts *,u32 ) __ksym; +struct bpf_ct_opts___local *,u32 ) __ksym; void bpf_ct_release(struct nf_conn *) __ksym; static __always_inline voidnf_ct_test (struct nf_conn *(*func)(void *,struct bpf_sock_tuple *,u32 , -struct bpf_ct_opts *,u32 ), +struct bpf_ct_opts___local *,u32 ),void *ctx) { -struct bpf_ct_opts opts_def = { .l4proto =IPPROTO_TCP , .netns_id =-1 }; +struct bpf_ct_opts___local opts_def = { .l4proto =IPPROTO_TCP , .netns_id =-1 };struct bpf_sock_tuple bpf_tuple;struct nf_conn *ct; --2.34.1