From: Eduard Zingerman <eddyz87@gmail.com>
To: bpf@vger.kernel.org, ast@kernel.org
Cc: andrii@kernel.org, daniel@iogearbox.net, martin.lau@linux.dev,
kernel-team@fb.com, yonghong.song@linux.dev, void@manifault.com,
sinquersw@gmail.com, Eduard Zingerman <eddyz87@gmail.com>
Subject: [PATCH bpf-next v2 13/15] selftests/bpf: test case for SEC("?.struct_ops")
Date: Sat, 2 Mar 2024 03:19:18 +0200 [thread overview]
Message-ID: <20240302011920.15302-14-eddyz87@gmail.com> (raw)
In-Reply-To: <20240302011920.15302-1-eddyz87@gmail.com>
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>
---
.../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 765b0ec6383a..d5295ff2e925 100644
--- a/tools/testing/selftests/bpf/prog_tests/struct_ops_autocreate.c
+++ b/tools/testing/selftests/bpf/prog_tests/struct_ops_autocreate.c
@@ -33,10 +33,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();
@@ -57,15 +71,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;
- /* 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);
}
@@ -75,4 +119,6 @@ void test_struct_ops_autocreate(void)
cant_load_full_object();
if (test__start_subtest("can_load_partial_object"))
can_load_partial_object();
+ 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 294d48bb8e3c..703ad8a2914f 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
next prev parent reply other threads:[~2024-03-02 1:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-02 1:19 [PATCH bpf-next v2 00/15] libbpf: type suffixes and autocreate flag for struct_ops maps Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 01/15] libbpf: allow version suffixes (___smth) for struct_ops types Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 02/15] libbpf: tie struct_ops programs to kernel BTF ids, not to local ids Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 03/15] libbpf: honor autocreate flag for struct_ops maps Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 04/15] selftests/bpf: test struct_ops map definition with type suffix Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 05/15] selftests/bpf: utility functions to capture libbpf log in test_progs Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 06/15] selftests/bpf: bad_struct_ops test Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 07/15] selftests/bpf: test autocreate behavior for struct_ops maps Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 08/15] libbpf: sync progs autoload with maps autocreate " Eduard Zingerman
2024-03-04 19:13 ` Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 09/15] selftests/bpf: verify struct_ops autoload/autocreate sync Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 10/15] libbpf: replace elf_state->st_ops_* fields with SEC_ST_OPS sec_type Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 11/15] libbpf: struct_ops in SEC("?.struct_ops") and SEC("?.struct_ops.link") Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 12/15] libbpf: rewrite btf datasec names starting from '?' Eduard Zingerman
2024-03-02 1:19 ` Eduard Zingerman [this message]
2024-03-02 1:19 ` [PATCH bpf-next v2 14/15] bpf: allow '?' at the beginning of DATASEC names Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 15/15] selftests/bpf: test cases for '?' in BTF names Eduard Zingerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240302011920.15302-14-eddyz87@gmail.com \
--to=eddyz87@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=martin.lau@linux.dev \
--cc=sinquersw@gmail.com \
--cc=void@manifault.com \
--cc=yonghong.song@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.