From: Kui-Feng Lee <thinker.li@gmail.com>
To: bpf@vger.kernel.org, ast@kernel.org, martin.lau@linux.dev,
song@kernel.org, kernel-team@meta.com, andrii@kernel.org
Cc: sinquersw@gmail.com, kuifeng@meta.com,
Kui-Feng Lee <thinker.li@gmail.com>
Subject: [PATCH bpf-next 2/2] selftests/bpf: open a pinned path of a struct_ops link.
Date: Tue, 16 Apr 2024 17:25:13 -0700 [thread overview]
Message-ID: <20240417002513.1534535-3-thinker.li@gmail.com> (raw)
In-Reply-To: <20240417002513.1534535-1-thinker.li@gmail.com>
Ensure that a pinned path of a struct_ops link can be opened to obtain a
file descriptor, which applications can then utilize to update the link.
Signed-off-by: Kui-Feng Lee <thinker.li@gmail.com>
---
.../selftests/bpf/bpf_testmod/bpf_testmod.c | 6 ++
.../bpf/prog_tests/test_struct_ops_module.c | 56 +++++++++++++++++++
2 files changed, 62 insertions(+)
diff --git a/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c b/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c
index 39ad96a18123..c4acd4ec630c 100644
--- a/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c
+++ b/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c
@@ -579,6 +579,11 @@ static void bpf_dummy_unreg(void *kdata)
{
}
+static int bpf_dummy_update(void *kdata, void *old_kdata)
+{
+ return bpf_dummy_reg(kdata);
+}
+
static int bpf_testmod_test_1(void)
{
return 0;
@@ -606,6 +611,7 @@ struct bpf_struct_ops bpf_bpf_testmod_ops = {
.init_member = bpf_testmod_ops_init_member,
.reg = bpf_dummy_reg,
.unreg = bpf_dummy_unreg,
+ .update = bpf_dummy_update,
.cfi_stubs = &__bpf_testmod_ops,
.name = "bpf_testmod_ops",
.owner = THIS_MODULE,
diff --git a/tools/testing/selftests/bpf/prog_tests/test_struct_ops_module.c b/tools/testing/selftests/bpf/prog_tests/test_struct_ops_module.c
index 7cf2b9ddd3e1..47b965c4c3e1 100644
--- a/tools/testing/selftests/bpf/prog_tests/test_struct_ops_module.c
+++ b/tools/testing/selftests/bpf/prog_tests/test_struct_ops_module.c
@@ -160,6 +160,60 @@ static void test_struct_ops_incompatible(void)
struct_ops_module__destroy(skel);
}
+/* Applications should be able to open a pinned path of a struct_ops link
+ * to get a file descriptor of the link and to update the link through the
+ * file descriptor.
+ */
+static void test_struct_ops_pinning_and_open(void)
+{
+ DECLARE_LIBBPF_OPTS(bpf_link_update_opts, opts);
+ struct struct_ops_module *skel;
+ int err, link_fd = -1, map_fd;
+ struct bpf_link *link;
+
+ /* Create and pin a struct_ops link */
+ skel = struct_ops_module__open_and_load();
+ if (!ASSERT_OK_PTR(skel, "open_and_load"))
+ return;
+
+ link = bpf_map__attach_struct_ops(skel->maps.testmod_1);
+ if (!ASSERT_OK_PTR(link, "attach_struct_ops"))
+ goto cleanup;
+
+ err = bpf_link__pin(link, "/sys/fs/bpf/test_struct_ops_pinning");
+ if (!ASSERT_OK(err, "bpf_link__pin"))
+ goto cleanup;
+
+ /* Open the pinned path */
+ link_fd = open("/sys/fs/bpf/test_struct_ops_pinning", O_RDONLY);
+ bpf_link__unpin(link);
+ if (!ASSERT_GE(link_fd, 0, "open_pinned"))
+ goto cleanup;
+
+ skel->bss->test_1_result = 0;
+ skel->bss->test_2_result = 0;
+
+ map_fd = bpf_map__fd(skel->maps.testmod_1);
+ if (!ASSERT_GE(map_fd, 0, "map_fd"))
+ goto cleanup;
+
+ /* Update the link. test_1 and test_2 should be called again. */
+ err = bpf_link_update(link_fd, map_fd, &opts);
+ if (!ASSERT_OK(err, "bpf_link_update"))
+ goto cleanup;
+
+ /* Check if test_1 and test_2 have been called */
+ ASSERT_EQ(skel->bss->test_1_result, 0xdeadbeef,
+ "bpf_link_update_test_1_result");
+ ASSERT_EQ(skel->bss->test_2_result, 5,
+ "bpf_link_update_test_2_result");
+
+cleanup:
+ close(link_fd);
+ bpf_link__destroy(link);
+ struct_ops_module__destroy(skel);
+}
+
void serial_test_struct_ops_module(void)
{
if (test__start_subtest("test_struct_ops_load"))
@@ -168,5 +222,7 @@ void serial_test_struct_ops_module(void)
test_struct_ops_not_zeroed();
if (test__start_subtest("test_struct_ops_incompatible"))
test_struct_ops_incompatible();
+ if (test__start_subtest("test_struct_ops_pinning_and_open"))
+ test_struct_ops_pinning_and_open();
}
--
2.34.1
prev parent reply other threads:[~2024-04-17 0:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-17 0:25 [PATCH bpf-next 0/2] Update a struct_ops link through a pinned path Kui-Feng Lee
2024-04-17 0:25 ` [PATCH bpf-next 1/2] bpf: enable the "open" operator on a pinned path of a struct_osp link Kui-Feng Lee
2024-04-17 23:19 ` kernel test robot
2024-04-18 6:13 ` kernel test robot
2024-04-20 0:05 ` Martin KaFai Lau
2024-04-22 17:12 ` Kui-Feng Lee
2024-04-22 17:30 ` Kui-Feng Lee
2024-04-22 23:43 ` Martin KaFai Lau
2024-04-23 17:16 ` Kui-Feng Lee
2024-04-24 0:29 ` Martin KaFai Lau
2024-04-25 0:17 ` Andrii Nakryiko
2024-04-25 17:11 ` Kui-Feng Lee
2024-04-17 0:25 ` Kui-Feng Lee [this message]
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=20240417002513.1534535-3-thinker.li@gmail.com \
--to=thinker.li@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=kernel-team@meta.com \
--cc=kuifeng@meta.com \
--cc=martin.lau@linux.dev \
--cc=sinquersw@gmail.com \
--cc=song@kernel.org \
/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.