selftests/bpf: Test case for SEC("?.struct_ops")

Check that "?.struct_ops" and "?.struct_ops.link" section names define
struct_ops maps with autocreate == false after open.

Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20240306104529.6453-14-eddyz87@gmail.com

diff --git a/tools/testing/selftests/bpf/prog_tests/struct_ops_autocreate.c b/tools/testing/selftests/bpf/prog_tests/struct_ops_autocreate.c
index 78948dc6445ce24125a66cde6ed1d3bf74e450a2..a5cc593c1e1d4ed5df876f132eb5e3cf83af45aa 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/struct_ops_autocreate.c
+++ b/tools/testing/selftests/bpf/prog_tests/struct_ops_autocreate.c
@@ -34,10 +34,24 @@ cleanup:
        struct_ops_autocreate__destroy(skel);
 }
 
+static int check_test_1_link(struct struct_ops_autocreate *skel, struct bpf_map *map)
+{
+       struct bpf_link *link;
+       int err;
+
+       link = bpf_map__attach_struct_ops(skel->maps.testmod_1);
+       if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops"))
+               return -1;
+
+       /* test_1() would be called from bpf_dummy_reg2() in bpf_testmod.c */
+       err = ASSERT_EQ(skel->bss->test_1_result, 42, "test_1_result");
+       bpf_link__destroy(link);
+       return err;
+}
+
 static void can_load_partial_object(void)
 {
        struct struct_ops_autocreate *skel;
-       struct bpf_link *link = NULL;
        int err;
 
        skel = struct_ops_autocreate__open();
@@ -58,15 +72,39 @@ static void can_load_partial_object(void)
        ASSERT_TRUE(bpf_program__autoload(skel->progs.test_1), "test_1 actual autoload");
        ASSERT_FALSE(bpf_program__autoload(skel->progs.test_2), "test_2 actual autoload");
 
-       link = bpf_map__attach_struct_ops(skel->maps.testmod_1);
-       if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops"))
+       check_test_1_link(skel, skel->maps.testmod_1);
+
+cleanup:
+       struct_ops_autocreate__destroy(skel);
+}
+
+static void optional_maps(void)
+{
+       struct struct_ops_autocreate *skel;
+       int err;
+
+       skel = struct_ops_autocreate__open();
+       if (!ASSERT_OK_PTR(skel, "struct_ops_autocreate__open"))
+               return;
+
+       ASSERT_TRUE(bpf_map__autocreate(skel->maps.testmod_1), "testmod_1 autocreate");
+       ASSERT_TRUE(bpf_map__autocreate(skel->maps.testmod_2), "testmod_2 autocreate");
+       ASSERT_FALSE(bpf_map__autocreate(skel->maps.optional_map), "optional_map autocreate");
+       ASSERT_FALSE(bpf_map__autocreate(skel->maps.optional_map2), "optional_map2 autocreate");
+
+       err  = bpf_map__set_autocreate(skel->maps.testmod_1, false);
+       err |= bpf_map__set_autocreate(skel->maps.testmod_2, false);
+       err |= bpf_map__set_autocreate(skel->maps.optional_map2, true);
+       if (!ASSERT_OK(err, "bpf_map__set_autocreate"))
                goto cleanup;
 
-       /* test_1() would be called from bpf_dummy_reg2() in bpf_testmod.c */
-       ASSERT_EQ(skel->bss->test_1_result, 42, "test_1_result");
+       err = struct_ops_autocreate__load(skel);
+       if (ASSERT_OK(err, "struct_ops_autocreate__load"))
+               goto cleanup;
+
+       check_test_1_link(skel, skel->maps.optional_map2);
 
 cleanup:
-       bpf_link__destroy(link);
        struct_ops_autocreate__destroy(skel);
 }
 
@@ -116,4 +154,6 @@ void test_struct_ops_autocreate(void)
                can_load_partial_object();
        if (test__start_subtest("autoload_and_shadow_vars"))
                autoload_and_shadow_vars();
+       if (test__start_subtest("optional_maps"))
+               optional_maps();
 }

diff --git a/tools/testing/selftests/bpf/progs/struct_ops_autocreate.c b/tools/testing/selftests/bpf/progs/struct_ops_autocreate.c
index 9a951ee6f55c145c50c88f87d2c149f699453c1a..ba10c3896213aa3db55331a5846e5c6b32a37e90 100644 (file)
--- a/tools/testing/selftests/bpf/progs/struct_ops_autocreate.c
+++ b/tools/testing/selftests/bpf/progs/struct_ops_autocreate.c
@@ -40,3 +40,13 @@ struct bpf_testmod_ops___v2 testmod_2 = {
        .test_1 = (void *)test_1,
        .does_not_exist = (void *)test_2
 };
+
+SEC("?.struct_ops")
+struct bpf_testmod_ops___v1 optional_map = {
+       .test_1 = (void *)test_1,
+};
+
+SEC("?.struct_ops.link")
+struct bpf_testmod_ops___v1 optional_map2 = {
+       .test_1 = (void *)test_1,
+};