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 09/15] selftests/bpf: verify struct_ops autoload/autocreate sync
Date: Sat, 2 Mar 2024 03:19:14 +0200 [thread overview]
Message-ID: <20240302011920.15302-10-eddyz87@gmail.com> (raw)
In-Reply-To: <20240302011920.15302-1-eddyz87@gmail.com>
Check that autocreate flag set to false for struct_ops map causes
autoload flag set to false for corresponding program.
Check that struct_ops program not referenced from any map fails to load.
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
---
.../selftests/bpf/prog_tests/bad_struct_ops.c | 32 +++++++++++++++++++
.../bpf/prog_tests/struct_ops_autocreate.c | 11 ++++---
.../selftests/bpf/progs/bad_struct_ops2.c | 14 ++++++++
3 files changed, 52 insertions(+), 5 deletions(-)
create mode 100644 tools/testing/selftests/bpf/progs/bad_struct_ops2.c
diff --git a/tools/testing/selftests/bpf/prog_tests/bad_struct_ops.c b/tools/testing/selftests/bpf/prog_tests/bad_struct_ops.c
index 9f5dbefa0dd9..6a707213e46b 100644
--- a/tools/testing/selftests/bpf/prog_tests/bad_struct_ops.c
+++ b/tools/testing/selftests/bpf/prog_tests/bad_struct_ops.c
@@ -2,6 +2,7 @@
#include <test_progs.h>
#include "bad_struct_ops.skel.h"
+#include "bad_struct_ops2.skel.h"
static void invalid_prog_reuse(void)
{
@@ -28,8 +29,39 @@ static void invalid_prog_reuse(void)
bad_struct_ops__destroy(skel);
}
+static void unused_program(void)
+{
+ struct bad_struct_ops2 *skel;
+ char *log = NULL;
+ int err;
+
+ skel = bad_struct_ops2__open();
+ if (!ASSERT_OK_PTR(skel, "bad_struct_ops2__open"))
+ return;
+
+ /* struct_ops programs not referenced from any maps are open
+ * with autoload set to true.
+ */
+ ASSERT_TRUE(bpf_program__autoload(skel->progs.foo), "foo autoload == true");
+
+ if (start_libbpf_log_capture())
+ goto cleanup;
+
+ err = bad_struct_ops2__load(skel);
+ ASSERT_ERR(err, "bad_struct_ops2__load should fail");
+ log = stop_libbpf_log_capture();
+ ASSERT_HAS_SUBSTR(log, "prog 'foo': failed to load",
+ "message about 'foo' failing to load");
+
+cleanup:
+ free(log);
+ bad_struct_ops2__destroy(skel);
+}
+
void test_bad_struct_ops(void)
{
if (test__start_subtest("invalid_prog_reuse"))
invalid_prog_reuse();
+ if (test__start_subtest("unused_program"))
+ unused_program();
}
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 c67d0b32b9dc..765b0ec6383a 100644
--- a/tools/testing/selftests/bpf/prog_tests/struct_ops_autocreate.c
+++ b/tools/testing/selftests/bpf/prog_tests/struct_ops_autocreate.c
@@ -35,18 +35,19 @@ static void cant_load_full_object(void)
static void can_load_partial_object(void)
{
- 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);
+ skel = struct_ops_autocreate__open();
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;
+ /* struct_ops programs referenced from maps are open with
+ * autoload set to false.
+ */
+ ASSERT_FALSE(bpf_program__autoload(skel->progs.test_1), "test_1 autoload == false");
+ ASSERT_FALSE(bpf_program__autoload(skel->progs.test_2), "test_2 autoload == false");
err = bpf_map__set_autocreate(skel->maps.testmod_2, false);
if (!ASSERT_OK(err, "bpf_map__set_autocreate"))
diff --git a/tools/testing/selftests/bpf/progs/bad_struct_ops2.c b/tools/testing/selftests/bpf/progs/bad_struct_ops2.c
new file mode 100644
index 000000000000..64a95f6be86d
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/bad_struct_ops2.c
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+
+char _license[] SEC("license") = "GPL";
+
+/* This is an unused struct_ops program, it lacks corresponding
+ * struct_ops map, which provides attachment information.
+ * W/o additional configuration attempt to load such
+ * BPF object file would fail.
+ */
+SEC("struct_ops/foo")
+void foo(void) {}
--
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 ` Eduard Zingerman [this message]
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 ` [PATCH bpf-next v2 13/15] selftests/bpf: test case for SEC("?.struct_ops") Eduard Zingerman
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-10-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.