On Mon, Mar 4, 2024 at 2:52 PM Eduard Zingerman <eddyz87@xxxxxxxxx> wrote:
>
> 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@xxxxxxxxx>
> ---
> .../bpf/prog_tests/struct_ops_autocreate.c | 58 +++++++++++++++++--
> .../bpf/progs/struct_ops_autocreate.c | 10 ++++
> 2 files changed, 62 insertions(+), 6 deletions(-)
>
> 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 35910cbb9ca4..a89ba036e2e2 100644
> --- 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 @@ static void cant_load_full_object(void)
> 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();
> @@ -52,15 +66,45 @@ static void can_load_partial_object(void)
> if (ASSERT_OK(err, "struct_ops_autocreate__load"))
> goto cleanup;
>
> - 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;
> +
> + err = !ASSERT_TRUE(bpf_map__autocreate(skel->maps.testmod_1),
> + "default autocreate for testmod_1");
> + err |= !ASSERT_TRUE(bpf_map__autocreate(skel->maps.testmod_2),
> + "default autocreate for testmod_2");
> + err |= !ASSERT_FALSE(bpf_map__autocreate(skel->maps.optional_map),
> + "default autocreate for optional_map");
> + err |= !ASSERT_FALSE(bpf_map__autocreate(skel->maps.optional_map2),
> + "default autocreate for optional_map2");
> + if (err)
> goto cleanup;
The above is a bit ugly. I think we can keep it simple just by not
exiting early, just do
ASSERT_TRUE(...);
ASSERT_TRUE(...);
ASSERT_FALSE(...);
ASSERT_FALSE(...);
.. then continue to bpf_map__set_autocreate() tests, even if previous
assertions already failed.
Nothing will crash, you'll just get more errors, potentially (because
some preconditions weren't set correctly or something).
>
> - /* 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 = 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;
> +
> + 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);
> }
>
> @@ -108,4 +152,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 9a951ee6f55c..ba10c3896213 100644
> --- 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,
> +};
> --
> 2.43.0
>
