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,
Eduard Zingerman <eddyz87@gmail.com>
Subject: [PATCH bpf-next v1 6/8] selftests/bpf: test autocreate behavior for struct_ops maps
Date: Tue, 27 Feb 2024 22:45:54 +0200 [thread overview]
Message-ID: <20240227204556.17524-7-eddyz87@gmail.com> (raw)
In-Reply-To: <20240227204556.17524-1-eddyz87@gmail.com>
Check that bpf_map__set_autocreate() can be used to disable automatic
creation for struct_ops maps.
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
---
.../bpf/prog_tests/struct_ops_autocreate.c | 79 +++++++++++++++++++
.../bpf/progs/struct_ops_autocreate.c | 42 ++++++++++
2 files changed, 121 insertions(+)
create mode 100644 tools/testing/selftests/bpf/prog_tests/struct_ops_autocreate.c
create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_autocreate.c
diff --git a/tools/testing/selftests/bpf/prog_tests/struct_ops_autocreate.c b/tools/testing/selftests/bpf/prog_tests/struct_ops_autocreate.c
new file mode 100644
index 000000000000..b21b10f94fc2
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/struct_ops_autocreate.c
@@ -0,0 +1,79 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <test_progs.h>
+#include "struct_ops_autocreate.skel.h"
+
+#define EXPECTED_MSG "libbpf: struct_ops init_kern"
+
+static libbpf_print_fn_t old_print_cb;
+static bool msg_found;
+
+static int print_cb(enum libbpf_print_level level, const char *fmt, va_list args)
+{
+ old_print_cb(level, fmt, args);
+ if (level == LIBBPF_WARN && strncmp(fmt, EXPECTED_MSG, strlen(EXPECTED_MSG)) == 0)
+ msg_found = true;
+
+ return 0;
+}
+
+static void cant_load_full_object(void)
+{
+ struct struct_ops_autocreate *skel;
+ int err;
+
+ old_print_cb = libbpf_set_print(print_cb);
+ skel = struct_ops_autocreate__open_and_load();
+ err = errno;
+ libbpf_set_print(old_print_cb);
+ if (!ASSERT_NULL(skel, "struct_ops_autocreate__open_and_load"))
+ return;
+
+ ASSERT_EQ(err, ENOTSUP, "errno should be ENOTSUP");
+ ASSERT_TRUE(msg_found, "expected message");
+
+ struct_ops_autocreate__destroy(skel);
+}
+
+static void can_load_partial_object(void)
+{
+ DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts);
+ struct struct_ops_autocreate *skel;
+ struct bpf_link *link = NULL;
+ int err;
+
+ skel = struct_ops_autocreate__open_opts(&opts);
+ if (!ASSERT_OK_PTR(skel, "struct_ops_autocreate__open_opts"))
+ return;
+
+ err = bpf_program__set_autoload(skel->progs.test_2, false);
+ if (!ASSERT_OK(err, "bpf_program__set_autoload"))
+ goto cleanup;
+
+ err = bpf_map__set_autocreate(skel->maps.testmod_2, false);
+ 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;
+
+ link = bpf_map__attach_struct_ops(skel->maps.testmod_1);
+ if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops"))
+ 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");
+
+cleanup:
+ bpf_link__destroy(link);
+ struct_ops_autocreate__destroy(skel);
+}
+
+void serial_test_struct_ops_autocreate(void)
+{
+ if (test__start_subtest("cant_load_full_object"))
+ cant_load_full_object();
+ if (test__start_subtest("can_load_partial_object"))
+ can_load_partial_object();
+}
diff --git a/tools/testing/selftests/bpf/progs/struct_ops_autocreate.c b/tools/testing/selftests/bpf/progs/struct_ops_autocreate.c
new file mode 100644
index 000000000000..294d48bb8e3c
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/struct_ops_autocreate.c
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <vmlinux.h>
+#include <bpf/bpf_helpers.h>
+#include <bpf/bpf_tracing.h>
+
+char _license[] SEC("license") = "GPL";
+
+int test_1_result = 0;
+
+SEC("struct_ops/test_1")
+int BPF_PROG(test_1)
+{
+ test_1_result = 42;
+ return 0;
+}
+
+SEC("struct_ops/test_1")
+int BPF_PROG(test_2)
+{
+ return 0;
+}
+
+struct bpf_testmod_ops___v1 {
+ int (*test_1)(void);
+};
+
+struct bpf_testmod_ops___v2 {
+ int (*test_1)(void);
+ int (*does_not_exist)(void);
+};
+
+SEC(".struct_ops.link")
+struct bpf_testmod_ops___v1 testmod_1 = {
+ .test_1 = (void *)test_1
+};
+
+SEC(".struct_ops.link")
+struct bpf_testmod_ops___v2 testmod_2 = {
+ .test_1 = (void *)test_1,
+ .does_not_exist = (void *)test_2
+};
--
2.43.0
next prev parent reply other threads:[~2024-02-27 20:46 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 20:45 [PATCH bpf-next v1 0/8] libbpf: type suffixes and autocreate flag for struct_ops maps Eduard Zingerman
2024-02-27 20:45 ` [PATCH bpf-next v1 1/8] libbpf: allow version suffixes (___smth) for struct_ops types Eduard Zingerman
2024-02-27 21:47 ` Kui-Feng Lee
2024-02-27 21:49 ` Eduard Zingerman
2024-02-28 16:29 ` David Vernet
2024-02-28 17:28 ` Eduard Zingerman
2024-02-28 17:30 ` David Vernet
2024-02-28 23:21 ` Andrii Nakryiko
2024-02-28 23:37 ` Eduard Zingerman
2024-02-27 20:45 ` [PATCH bpf-next v1 2/8] libbpf: tie struct_ops programs to kernel BTF ids, not to local ids Eduard Zingerman
2024-02-28 7:41 ` Martin KaFai Lau
2024-02-28 17:23 ` David Vernet
2024-02-28 17:40 ` Eduard Zingerman
2024-02-28 17:50 ` David Vernet
2024-02-28 23:28 ` Andrii Nakryiko
2024-02-28 23:31 ` Eduard Zingerman
2024-02-28 23:34 ` Andrii Nakryiko
2024-02-27 20:45 ` [PATCH bpf-next v1 3/8] libbpf: honor autocreate flag for struct_ops maps Eduard Zingerman
2024-02-28 17:44 ` David Vernet
2024-02-27 20:45 ` [PATCH bpf-next v1 4/8] selftests/bpf: test struct_ops map definition with type suffix Eduard Zingerman
2024-02-28 18:03 ` David Vernet
2024-02-27 20:45 ` [PATCH bpf-next v1 5/8] selftests/bpf: bad_struct_ops test Eduard Zingerman
2024-02-28 18:15 ` David Vernet
2024-02-28 20:06 ` Eduard Zingerman
2024-02-28 20:11 ` David Vernet
2024-02-28 23:40 ` Andrii Nakryiko
2024-02-28 23:44 ` Eduard Zingerman
2024-02-28 23:56 ` Andrii Nakryiko
2024-02-29 0:06 ` Eduard Zingerman
2024-02-27 20:45 ` Eduard Zingerman [this message]
2024-02-28 18:29 ` [PATCH bpf-next v1 6/8] selftests/bpf: test autocreate behavior for struct_ops maps David Vernet
2024-02-28 18:34 ` David Vernet
2024-02-28 19:31 ` Eduard Zingerman
2024-02-28 23:43 ` Andrii Nakryiko
2024-02-28 23:55 ` Eduard Zingerman
2024-02-29 0:02 ` Andrii Nakryiko
2024-02-29 0:56 ` Martin KaFai Lau
2024-03-01 1:28 ` Eduard Zingerman
2024-03-01 18:03 ` Andrii Nakryiko
2024-03-01 18:07 ` Eduard Zingerman
2024-02-27 20:45 ` [PATCH bpf-next v1 7/8] libbpf: sync progs autoload with maps autocreate " Eduard Zingerman
2024-02-27 22:55 ` Kui-Feng Lee
2024-02-27 23:09 ` Eduard Zingerman
2024-02-27 23:16 ` Kui-Feng Lee
2024-02-27 23:30 ` Eduard Zingerman
2024-02-27 23:40 ` Kui-Feng Lee
2024-02-27 23:43 ` Eduard Zingerman
2024-02-28 0:12 ` Kui-Feng Lee
2024-02-28 0:50 ` Eduard Zingerman
2024-02-28 2:10 ` Martin KaFai Lau
2024-02-28 12:36 ` Eduard Zingerman
2024-02-28 23:55 ` Andrii Nakryiko
2024-02-29 0:04 ` Eduard Zingerman
2024-02-29 0:14 ` Andrii Nakryiko
2024-02-29 0:25 ` Martin KaFai Lau
2024-02-29 0:30 ` Andrii Nakryiko
2024-02-29 0:37 ` Martin KaFai Lau
2024-02-29 0:40 ` Eduard Zingerman
2024-02-27 20:45 ` [PATCH bpf-next v1 8/8] selftests/bpf: tests for struct_ops autoload/autocreate toggling Eduard Zingerman
2024-02-28 18:36 ` David Vernet
2024-02-28 20:10 ` 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=20240227204556.17524-7-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=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.