selftests: bpf: test BPF_PROG_QUERY for progs attached to sockmap
Quoted 89 lines · zhudi (E)
Quoted 11 lines
Quoted 11 lines · Di Zhu
Quoted 9 lines
Add test for querying progs attached to sockmap. we use an existing libbpf query interface to query prog cnt before and after progs attaching to sockmap and check whether the queried prog id is right.
Signed-off-by Di Zhu <[email protected]>Acked-by Yonghong Song <[email protected]>--- .../selftests/bpf/prog_tests/sockmap_basic.c | 70+++++++++++++++++++
Quoted 17 lines
Quoted 17 lines
Quoted 3 lines
.../bpf/progs/test_sockmap_progs_query.c | 24 +++++++ 2 files changed, 94 insertions(+) create mode 100644
tools/testing/selftests/bpf/progs/test_sockmap_progs_query.cReview
Quoted 2 lines
(quoted diff) +0
-0
b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.cQuoted 10 lines
index
85db0f4cdd95..06923ea44bad100644tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +1
-0@@ -8,6 +8,7 @@#include "test_sockmap_update.skel.h" #include "test_sockmap_invalid_update.skel.h" #include "test_sockmap_skb_verdict_attach.skel.h" +#include "test_sockmap_progs_query.skel.h" #include "bpf_iter_sockmap.skel.h" Quoted 3 lines
Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c line 14
Quoted 1 line
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +0
-0#define TCP_REPAIR 19/* TCP sock is under repair right now */
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c static void
Quoted 1 line
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +0
-0@@ -315,6 +316,69 @@ static voidtest_sockmap_skb_verdict_attach(enum
Quoted 4 lines
Quoted 4 lines
bpf_attach_typefirst,Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +0
-0test_sockmap_skb_verdict_attach__destroy (skel); }Quoted 9 lines
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c static void · line 327
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +9
-0+static __u32 query_prog_id(int prog_fd) +{ + struct bpf_prog_info info = {}; + __u32 info_len = sizeof(info); + int err; + + err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len); + if (!ASSERT_OK(err, "bpf_obj_get_info_by_fd") || + !ASSERT_EQ(info_len, sizeof(info),"
bpf_obj_get_info_by_fd"))Quoted 6 lines
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c static void · line 333
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +6
-0+return 0 ; + +return info.id; +} + +static void test_sockmap_progs_query(enum bpf_attach_type
attach_type)Quoted 20 lines
Quoted 20 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c static void · line 342
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +9
-0+{ + struct test_sockmap_progs_query *skel; + int err, map_fd, verdict_fd, duration = 0; + __u32 attach_flags = 0; + __u32 prog_ids[3] = {}; + __u32 prog_cnt = 3; + + skel = test_sockmap_progs_query__open_and_load(); + if (!ASSERT_OK_PTR(skel,"
test_sockmap_progs_query__open_and_load"))tools/testing/selftests/bpf/prog_tests/sockmap_basic.c static void · line 348
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +6
-0+return ; + + map_fd =bpf_map__fd (skel->maps.sock_map); + +if (attach_type ==BPF_SK_MSG_VERDICT ) + verdict_fd =
bpf_program__fd(skel->progs.prog_skmsg_verdict);tools/testing/selftests/bpf/prog_tests/sockmap_basic.c static void · line 350
Quoted 2 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +2
-0+else + verdict_fd =
bpf_program__fd(skel->progs.prog_skb_verdict);Quoted 11 lines
Quoted 11 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c static void · line 361
Quoted 11 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +11
-0+ + err =bpf_prog_query (map_fd, attach_type,0 /* query flags */ , + &attach_flags, prog_ids, &prog_cnt); +if (!ASSERT_OK (err,"bpf_prog_query failed" )) + goto out; + +if (!ASSERT_EQ (attach_flags,0 ,"wrong attach_flags on query" )) + goto out; + +if (!ASSERT_EQ (prog_cnt,0 ,"wrong program count on query" )) + goto out;I mean here that you can do just
Quoted 5 lines
ASSERT_OK(err, ...);ASSERT_EQ(attach_flags, ...);ASSERT_EQ(prog_cnt, ...);No if + goto necessary.
I see what you mean. I'll modify the code, thanks
Quoted 53 lines
Quoted 19 lines
Quoted 10 lines
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +9
-0+ + err =bpf_prog_attach (verdict_fd, map_fd, attach_type,0 ); +if (!ASSERT_OK (err,"bpf_prog_attach failed" )) + goto out; + + prog_cnt =1 ; + err =bpf_prog_query (map_fd, attach_type,0 /* query flags */ , + &attach_flags, prog_ids, &prog_cnt); +Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c static void · line 375
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +5
-0+ASSERT_OK (err,"bpf_prog_query failed" ); +ASSERT_EQ (attach_flags,0 ,"wrong attach_flags on query" ); +ASSERT_EQ (prog_cnt,1 ,"wrong program count on query" ); +ASSERT_EQ (prog_ids[0 ],query_prog_id (verdict_fd), +"wrong prog_ids on query" );See how much easier it is to follow these tests, why didn't you do the same with err,
attach_flagsand prog above?Quoted 1 line
It is recommended by Yonghong Song to increase the test coverage.
see above
Quoted 30 lines
Quoted 29 lines
Quoted 13 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +6
-0+ +bpf_prog_detach2 (verdict_fd, map_fd, attach_type); +out: +test_sockmap_progs_query__destroy (skel); +} +void test_sockmap_basic (void ) {if (test__start_subtest ("sockmap create_update_free" ))tools/testing/selftests/bpf/prog_tests/sockmap_basic.c void test_sockmap_basic(void) · line 405
Quoted 1 line
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +0
-0@@ -341,4 +405,10 @@ void test_sockmap_basic(void)test_sockmap_skb_verdict_attach(BPF_SK_SKB_STREAM_VERDICT,
Quoted 1 line
BPF_SK_SKB_VERDICT);tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
Quoted 4 lines
}tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +3
-0+if (test__start_subtest ("sockmap progs query" )) { +test_sockmap_progs_query (BPF_SK_MSG_VERDICT ); +
test_sockmap_progs_query(BPF_SK_SKB_STREAM_PARSER);Quoted 1 line
+
test_sockmap_progs_query(BPF_SK_SKB_STREAM_VERDICT);Quoted 1 line
+
test_sockmap_progs_query(BPF_SK_SKB_VERDICT);Why are these not separate subtests? What's the benefit of bundling them into one subtest?
Quoted 5 lines
Quoted 1 line
These are essentially doing the same thing, just for different program attach
types.
Right, so they are independent subtests, no? Not separate tests, but not one subtest either.
Ok, I'll split it into several subsets.
Quoted 37 lines
Quoted 37 lines
Quoted 37 lines
Review
Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +1
-0+ } }(quoted diff) +0
-0
b/tools/testing/selftests/bpf/progs/test_sockmap_progs_query.cQuoted 32 lines
new file mode 100644
index 000000000000..9d58d61c0deetools/testing/selftests/bpf/progs/test_sockmap_progs_query.c new file +24
-1@@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "vmlinux.h" +#include <bpf/bpf_helpers.h> + +struct { + __uint(type, BPF_MAP_TYPE_SOCKMAP); + __uint(max_entries, 1); + __type(key, __u32); + __type(value, __u64); +} sock_map SEC(".maps"); + +SEC("sk_skb") +int prog_skb_verdict (struct __sk_buff *skb) +{ +return SK_PASS ; +} + +SEC("sk_msg") +int prog_skmsg_verdict (struct sk_msg_md *msg) +{ +return SK_PASS ; +} + +char _license[] SEC("license") = "GPL"; --2.27.0