Skip to contentSkip to conversation

selftests/bpf: Add a test for mmap-able map in map

PATCH Applied Song Liu 4 participants 4 messages Jul 23, 2024

Subsystems (3)
lore
Share & tools
lore

Song Liu

author reviewer
#0 lore raw

PATCH 1/1 selftests/bpf: Add a test for mmap-able map in map

Regular BPF hash map is not mmap-able from user space. However, map-in-map with outer map of type BPF_MAP_TYPE_HASH_OF_MAPS and mmap-able array as inner map can perform similar operations as a mmap-able hash map. This can be used by applications that benefit from fast accesses to some local data.

Add a selftest to show this use case.

---
 .../bpf/prog_tests/test_mmap_inner_array.c    | 57 ++++++++++++++++++
 .../selftests/bpf/progs/mmap_inner_array.c    | 59 +++++++++++++++++++
 2 files changed, 116 insertions(+)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/test_mmap_inner_array.c
 create mode 100644 tools/testing/selftests/bpf/progs/mmap_inner_array.c
tools/testing/selftests/bpf/prog_tests/test_mmap_inner_array.c new file +57 -0
new file mode 100644
index 000000000000..ce745776ed18
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2024 Meta Platforms, Inc. and affiliates. */
+#include <test_progs.h>
+#include <sys/mman.h>
+#include "mmap_inner_array.skel.h"
+
+void test_mmap_inner_array(void)
+{
+	const long page_size = sysconf(_SC_PAGE_SIZE);
+	struct mmap_inner_array *skel;
+	int inner_array_fd, err;
+	void *tmp;
+	__u64 *val;
+
+	skel = mmap_inner_array__open_and_load();
+
+	if (!ASSERT_OK_PTR(skel, "open_and_load"))
+		return;
+
+	inner_array_fd = bpf_map__fd(skel->maps.inner_array);
+	tmp = mmap(NULL, page_size, PROT_READ | PROT_WRITE, MAP_SHARED, inner_array_fd, 0);
+	if (!ASSERT_OK_PTR(tmp, "inner array mmap"))
+		goto out;
+	val = (void *)tmp;
+
+	err = mmap_inner_array__attach(skel);
+	if (!ASSERT_OK(err, "attach"))
+		goto out_unmap;
+
+	skel->bss->pid = getpid();
+	usleep(1);
+
+	/* pid is set, pid_match == true and outer_map_match == false */
+	ASSERT_TRUE(skel->bss->pid_match, "pid match 1");
+	ASSERT_FALSE(skel->bss->outer_map_match, "outer map match 1");
+	ASSERT_FALSE(skel->bss->done, "done 1");
+	ASSERT_EQ(*val, 0, "value match 1");
+
+	err = bpf_map__update_elem(skel->maps.outer_map,
+				   &skel->bss->pid, sizeof(skel->bss->pid),
+				   &inner_array_fd, sizeof(inner_array_fd),
+				   BPF_ANY);
+	if (!ASSERT_OK(err, "update elem"))
+		goto out_unmap;
+	usleep(1);
+
+	/* outer map key is set, outer_map_match == true */
+	ASSERT_TRUE(skel->bss->pid_match, "pid match 2");
+	ASSERT_TRUE(skel->bss->outer_map_match, "outer map match 2");
+	ASSERT_TRUE(skel->bss->done, "done 2");
+	ASSERT_EQ(*val, skel->data->match_value, "value match 2");
+
+out_unmap:
+	munmap(tmp, page_size);
+out:
+	mmap_inner_array__destroy(skel);
+}
tools/testing/selftests/bpf/progs/mmap_inner_array.c new file +59 -0

59 lines not on this page · raw message

Signature · 1 line
2.43.0
#1 lore raw
CI has tested the following submission:

Dear patch submitter,

CI has tested the following submission:

Status:     SUCCESS
Name:       [bpf-next] selftests/bpf: Add a test for mmap-able map in map
Patchwork:  https://patchwork.kernel.org/project/netdevbpf/list/?series=873122&state=*
Matrix:     https://github.com/kernel-patches/bpf/actions/runs/10053209093

No further action is necessary on your part.

Please note: this email is coming from an unmonitored mailbox. If you have questions or feedback, please reach out to the Meta Kernel CI team at [email protected].

#2 lore raw
In reply to Song Liu

tools/testing/selftests/bpf/progs/mmap_inner_array.c line 6

Quoted 12 lines · Song Liu
tools/testing/selftests/bpf/progs/mmap_inner_array.c new file +6 -0
new file mode 100644
index 000000000000..db8ca2aa4347
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2024 Meta Platforms, Inc. and affiliates. */
+
+#include "vmlinux.h"
+#include <bpf/bpf_helpers.h>
+#include <bpf/bpf_tracing.h>

nit. bpf_tracing.h is not needed.

tools/testing/selftests/bpf/progs/mmap_inner_array.c line 9

Quoted 3 lines
tools/testing/selftests/bpf/progs/mmap_inner_array.c new file +3 -0
+
+#include "bpf_misc.h"
+#include "bpf_experimental.h"

Same for bpf_experimental.h. Removed before applying. Thanks.

#3 lore raw
In reply to Song Liu
This patch was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:

Quoted 9 lines · On Mon, 22 Jul 2024 22:14:55 -0700 you wrote:

Regular BPF hash map is not mmap-able from user space. However, map-in-map with outer map of type BPF_MAP_TYPE_HASH_OF_MAPS and mmap-able array as inner map can perform similar operations as a mmap-able hash map. This can be used by applications that benefit from fast accesses to some local data.

Add a selftest to show this use case.

[...]

Here is the summary with links:
- [bpf-next] selftests/bpf: Add a test for mmap-able map in map

    https://git.kernel.org/bpf/bpf-next/c/541b135010ce

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html