selftests: bpf: Enable UDP sockmap reuseport tests

[linux-block.git] / tools / testing / selftests / bpf / prog_tests / select_reuseport.c

diff --git a/tools/testing/selftests/bpf/prog_tests/select_reuseport.c b/tools/testing/selftests/bpf/prog_tests/select_reuseport.c
index 098bcae5f827e949610d702349d386a89a5f6ddd..821b4146b7b6c30502624fa57be76509f8f8c82f 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/select_reuseport.c
+++ b/tools/testing/selftests/bpf/prog_tests/select_reuseport.c
@@ -36,6 +36,7 @@ static int result_map, tmp_index_ovr_map, linum_map, data_check_map;
 static __u32 expected_results[NR_RESULTS];
 static int sk_fds[REUSEPORT_ARRAY_SIZE];
 static int reuseport_array = -1, outer_map = -1;
+static enum bpf_map_type inner_map_type;
 static int select_by_skb_data_prog;
 static int saved_tcp_syncookie = -1;
 static struct bpf_object *obj;
@@ -63,13 +64,15 @@ static union sa46 {
        }                                                               \
 })
 
-static int create_maps(void)
+static int create_maps(enum bpf_map_type inner_type)
 {
        struct bpf_create_map_attr attr = {};
 
+       inner_map_type = inner_type;
+
        /* Creating reuseport_array */
        attr.name = "reuseport_array";
-       attr.map_type = BPF_MAP_TYPE_REUSEPORT_SOCKARRAY;
+       attr.map_type = inner_type;
        attr.key_size = sizeof(__u32);
        attr.value_size = sizeof(__u32);
        attr.max_entries = REUSEPORT_ARRAY_SIZE;
@@ -506,9 +509,6 @@ static void test_syncookie(int type, sa_family_t family)
                .pass_on_failure = 0,
        };
 
-       if (type != SOCK_STREAM)
-               return;
-
        /*
         * +1 for TCP-SYN and
         * +1 for the TCP-ACK (ack the syncookie)
@@ -726,12 +726,36 @@ static void cleanup_per_test(bool no_inner_map)
 
 static void cleanup(void)
 {
-       if (outer_map != -1)
+       if (outer_map != -1) {
                close(outer_map);
-       if (reuseport_array != -1)
+               outer_map = -1;
+       }
+
+       if (reuseport_array != -1) {
                close(reuseport_array);
-       if (obj)
+               reuseport_array = -1;
+       }
+
+       if (obj) {
                bpf_object__close(obj);
+               obj = NULL;
+       }
+
+       memset(expected_results, 0, sizeof(expected_results));
+}
+
+static const char *maptype_str(enum bpf_map_type type)
+{
+       switch (type) {
+       case BPF_MAP_TYPE_REUSEPORT_SOCKARRAY:
+               return "reuseport_sockarray";
+       case BPF_MAP_TYPE_SOCKMAP:
+               return "sockmap";
+       case BPF_MAP_TYPE_SOCKHASH:
+               return "sockhash";
+       default:
+               return "unknown";
+       }
 }
 
 static const char *family_str(sa_family_t family)
@@ -758,7 +782,7 @@ static const char *sotype_str(int sotype)
        }
 }
 
-#define TEST_INIT(fn, ...) { fn, #fn, __VA_ARGS__ }
+#define TEST_INIT(fn_, ...) { .fn = fn_, .name = #fn_, __VA_ARGS__ }
 
 static void test_config(int sotype, sa_family_t family, bool inany)
 {
@@ -766,12 +790,15 @@ static void test_config(int sotype, sa_family_t family, bool inany)
                void (*fn)(int sotype, sa_family_t family);
                const char *name;
                bool no_inner_map;
+               int need_sotype;
        } tests[] = {
-               TEST_INIT(test_err_inner_map, true /* no_inner_map */),
+               TEST_INIT(test_err_inner_map,
+                         .no_inner_map = true),
                TEST_INIT(test_err_skb_data),
                TEST_INIT(test_err_sk_select_port),
                TEST_INIT(test_pass),
-               TEST_INIT(test_syncookie),
+               TEST_INIT(test_syncookie,
+                         .need_sotype = SOCK_STREAM),
                TEST_INIT(test_pass_on_err),
                TEST_INIT(test_detach_bpf),
        };
@@ -779,7 +806,11 @@ static void test_config(int sotype, sa_family_t family, bool inany)
        const struct test *t;
 
        for (t = tests; t < tests + ARRAY_SIZE(tests); t++) {
-               snprintf(s, sizeof(s), "%s/%s %s %s",
+               if (t->need_sotype && t->need_sotype != sotype)
+                       continue; /* test not compatible with socket type */
+
+               snprintf(s, sizeof(s), "%s %s/%s %s %s",
+                        maptype_str(inner_map_type),
                         family_str(family), sotype_str(sotype),
                         inany ? "INANY" : "LOOPBACK", t->name);
 
@@ -814,16 +845,25 @@ static void test_all(void)
                test_config(c->sotype, c->family, c->inany);
 }
 
-void test_select_reuseport(void)
+void test_map_type(enum bpf_map_type mt)
 {
-       if (create_maps())
+       if (create_maps(mt))
                goto out;
        if (prepare_bpf_obj())
                goto out;
 
+       test_all();
+out:
+       cleanup();
+}
+
+void test_select_reuseport(void)
+{
        saved_tcp_fo = read_int_sysctl(TCP_FO_SYSCTL);
+       if (saved_tcp_fo < 0)
+               goto out;
        saved_tcp_syncookie = read_int_sysctl(TCP_SYNCOOKIE_SYSCTL);
-       if (saved_tcp_syncookie < 0 || saved_tcp_syncookie < 0)
+       if (saved_tcp_syncookie < 0)
                goto out;
 
        if (enable_fastopen())
@@ -831,8 +871,9 @@ void test_select_reuseport(void)
        if (disable_syncookie())
                goto out;
 
-       test_all();
+       test_map_type(BPF_MAP_TYPE_REUSEPORT_SOCKARRAY);
+       test_map_type(BPF_MAP_TYPE_SOCKMAP);
+       test_map_type(BPF_MAP_TYPE_SOCKHASH);
 out:
-       cleanup();
        restore_sysctls();
 }