The flow_dissector test integrated in test_progs actually runs a wide
matrix of tests over different packets types and bpf programs modes, but
exposes only 3 main tests, preventing tests users from running specific
subtests with a specific input only.
Expose all subtests executed by flow_dissector by using
test__start_subtest().
Signed-off-by: Alexis Lothoré (eBPF Foundation) <alexis.lothore@xxxxxxxxxxx>
---
This change resulsts in the exposure of 42 subtests with the current
content from flow_dissector:
# ./test_progs -a flow_dissector
#102/1 flow_dissector/ipv4-skb:OK
#102/2 flow_dissector/ipv6-skb:OK
#102/3 flow_dissector/802.1q-ipv4-skb:OK
#102/4 flow_dissector/802.1ad-ipv6-skb:OK
#102/5 flow_dissector/ipv4-frag-skb:OK
#102/6 flow_dissector/ipv4-no-frag-skb:OK
#102/7 flow_dissector/ipv6-frag-skb:OK
#102/8 flow_dissector/ipv6-no-frag-skb:OK
#102/9 flow_dissector/ipv6-flow-label-skb:OK
#102/10 flow_dissector/ipv6-no-flow-label-skb:OK
#102/11 flow_dissector/ipv6-empty-flow-label-skb:OK
#102/12 flow_dissector/ipip-encap-skb:OK
#102/13 flow_dissector/ipip-no-encap-skb:OK
#102/14 flow_dissector/ipip-encap-dissector-continue-skb:OK
#102/15 flow_dissector/ipv4-non-skb-indirect-attach:OK
#102/16 flow_dissector/ipv6-non-skb-indirect-attach:OK
#102/17 flow_dissector/802.1q-ipv4-non-skb-indirect-attach:OK
#102/18 flow_dissector/802.1ad-ipv6-non-skb-indirect-attach:OK
#102/19 flow_dissector/ipv4-frag-non-skb-indirect-attach:OK
#102/20 flow_dissector/ipv4-no-frag-non-skb-indirect-attach:OK
#102/21 flow_dissector/ipv6-frag-non-skb-indirect-attach:OK
#102/22 flow_dissector/ipv6-no-frag-non-skb-indirect-attach:OK
#102/23 flow_dissector/ipv6-flow-label-non-skb-indirect-attach:OK
#102/24 flow_dissector/ipv6-no-flow-label-non-skb-indirect-attach:OK
#102/25 flow_dissector/ipv6-empty-flow-label-non-skb-indirect-attach:OK
#102/26 flow_dissector/ipip-encap-non-skb-indirect-attach:OK
#102/27 flow_dissector/ipip-no-encap-non-skb-indirect-attach:OK
#102/28 flow_dissector/ipip-encap-dissector-continue-non-skb-indirect-attach:OK
#102/29 flow_dissector/ipv4-non-skb-direct-attach:OK
#102/30 flow_dissector/ipv6-non-skb-direct-attach:OK
#102/31 flow_dissector/802.1q-ipv4-non-skb-direct-attach:OK
#102/32 flow_dissector/802.1ad-ipv6-non-skb-direct-attach:OK
#102/33 flow_dissector/ipv4-frag-non-skb-direct-attach:OK
#102/34 flow_dissector/ipv4-no-frag-non-skb-direct-attach:OK
#102/35 flow_dissector/ipv6-frag-non-skb-direct-attach:OK
#102/36 flow_dissector/ipv6-no-frag-non-skb-direct-attach:OK
#102/37 flow_dissector/ipv6-flow-label-non-skb-direct-attach:OK
#102/38 flow_dissector/ipv6-no-flow-label-non-skb-direct-attach:OK
#102/39 flow_dissector/ipv6-empty-flow-label-non-skb-direct-attach:OK
#102/40 flow_dissector/ipip-encap-non-skb-direct-attach:OK
#102/41 flow_dissector/ipip-no-encap-non-skb-direct-attach:OK
#102/42 flow_dissector/ipip-encap-dissector-continue-non-skb-direct-attach:OK
#102 flow_dissector:OK
Summary: 1/42 PASSED, 0 SKIPPED, 0 FAILED
---
.../selftests/bpf/prog_tests/flow_dissector.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
index c5dfff333fe31dd55ac152fe9b107828227c8177..8ab3268ef4c92fc33ac40e8f8f963a4d8b6551a8 100644
--- a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
+++ b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
@@ -8,6 +8,7 @@
#include "bpf_flow.skel.h"
#define FLOW_CONTINUE_SADDR 0x7f00007f /* 127.0.0.127 */
+#define TEST_NAME_MAX_LEN 64
#ifndef IP_MF
#define IP_MF 0x2000
@@ -505,8 +506,10 @@ static int init_prog_array(struct bpf_object *obj, struct bpf_map *prog_array)
return 0;
}
-static void run_tests_skb_less(int tap_fd, struct bpf_map *keys)
+static void run_tests_skb_less(int tap_fd, struct bpf_map *keys,
+ char *test_suffix)
{
+ char test_name[TEST_NAME_MAX_LEN];
int i, err, keys_fd;
keys_fd = bpf_map__fd(keys);
@@ -520,6 +523,10 @@ static void run_tests_skb_less(int tap_fd, struct bpf_map *keys)
struct bpf_flow_keys flow_keys = {};
__u32 key = (__u32)(tests[i].keys.sport) << 16 |
tests[i].keys.dport;
+ snprintf(test_name, TEST_NAME_MAX_LEN, "%s-%s", tests[i].name,
+ test_suffix);
+ if (!test__start_subtest(test_name))
+ continue;
/* For skb-less case we can't pass input flags; run
* only the tests that have a matching set of flags.
@@ -577,7 +584,8 @@ void serial_test_flow_dissector_skb_less_direct_attach(void)
if (!ASSERT_OK(err, "ifup"))
goto out_close_tap;
- run_tests_skb_less(tap_fd, skel->maps.last_dissection);
+ run_tests_skb_less(tap_fd, skel->maps.last_dissection,
+ "non-skb-direct-attach");
err = bpf_prog_detach2(prog_fd, 0, BPF_FLOW_DISSECTOR);
ASSERT_OK(err, "bpf_prog_detach2");
@@ -617,7 +625,8 @@ void serial_test_flow_dissector_skb_less_indirect_attach(void)
if (!ASSERT_OK_PTR(link, "attach_netns"))
goto out_clean_ns;
- run_tests_skb_less(tap_fd, skel->maps.last_dissection);
+ run_tests_skb_less(tap_fd, skel->maps.last_dissection,
+ "non-skb-indirect-attach");
err = bpf_link__destroy(link);
ASSERT_OK(err, "bpf_link__destroy");
@@ -630,6 +639,7 @@ void serial_test_flow_dissector_skb_less_indirect_attach(void)
void serial_test_flow_dissector_skb(void)
{
+ char test_name[TEST_NAME_MAX_LEN];
struct bpf_flow *skel;
int i, err, prog_fd;
@@ -654,6 +664,10 @@ void serial_test_flow_dissector_skb(void)
);
static struct bpf_flow_keys ctx = {};
+ snprintf(test_name, TEST_NAME_MAX_LEN, "%s-skb", tests[i].name);
+ if (!test__start_subtest(test_name))
+ continue;
+
if (tests[i].flags) {
topts.ctx_in = &ctx;
topts.ctx_size_in = sizeof(ctx);
--
2.47.0
