diff mbox series

[bpf-next,v2,11/13] selftests/bpf: Add prog tests for qp-trie map

Message ID 20220924133620.4147153-12-houtao@huaweicloud.com (mailing list archive)
State Changes Requested
Delegated to: BPF
Headers show
Series Add support for qp-trie with dynptr key | expand

Checks

Context Check Description
bpf/vmtest-bpf-next-PR fail PR summary
netdev/tree_selection success Clearly marked for bpf-next, async
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix success Link
netdev/cover_letter success Series has a cover letter
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers warning 5 maintainers not CCed: linux-kselftest@vger.kernel.org song@kernel.org shuah@kernel.org mykolal@fb.com martin.lau@linux.dev
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch warning WARNING: ENOTSUPP is not a SUSV4 error code, prefer EOPNOTSUPP WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? WARNING: line length of 85 exceeds 80 columns WARNING: line length of 94 exceeds 80 columns
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-next-VM_Test-4 success Logs for llvm-toolchain
bpf/vmtest-bpf-next-VM_Test-5 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-2 success Logs for build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-3 success Logs for build for x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-1 success Logs for build for s390x with gcc
bpf/vmtest-bpf-next-VM_Test-16 success Logs for test_verifier on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-17 success Logs for test_verifier on x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-10 success Logs for test_progs on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-11 success Logs for test_progs on x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-13 success Logs for test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-14 success Logs for test_progs_no_alu32 on x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-7 success Logs for test_maps on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-8 success Logs for test_maps on x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-12 success Logs for test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-15 success Logs for test_verifier on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-9 fail Logs for test_progs on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-6 fail Logs for test_maps on s390x with gcc

Commit Message

Hou Tao Sept. 24, 2022, 1:36 p.m. UTC
From: Hou Tao <houtao1@huawei.com>

Add three test cases for qp-trie map. Firstly checking the basic
operations of qp-trie (lookup/update/delete) from both bpf syscall and
bpf program are working properly, then ensuring dynptr with zero size or
null data is handled correclty in qp-trie, lastly using full path from
bpf_d_path() as a dynptr key to show the possible use case for qp-trie.

Signed-off-by: Hou Tao <houtao1@huawei.com>
---
 .../selftests/bpf/prog_tests/qp_trie_test.c   | 214 ++++++++++++++++++
 .../selftests/bpf/progs/qp_trie_test.c        | 200 ++++++++++++++++
 2 files changed, 414 insertions(+)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/qp_trie_test.c
 create mode 100644 tools/testing/selftests/bpf/progs/qp_trie_test.c
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/prog_tests/qp_trie_test.c b/tools/testing/selftests/bpf/prog_tests/qp_trie_test.c
new file mode 100644
index 000000000000..fbfee0916f4c
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/qp_trie_test.c
@@ -0,0 +1,214 @@ 
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (C) 2022. Huawei Technologies Co., Ltd */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <test_progs.h>
+#include "qp_trie_test.skel.h"
+
+#define FILE_PATH_SIZE 64
+
+static int setup_trie(struct bpf_map *trie, void *data, unsigned int size, unsigned int value)
+{
+	struct bpf_dynptr_user dynptr;
+	char raw[FILE_PATH_SIZE];
+	int fd, err, zero;
+
+	fd = bpf_map__fd(trie);
+	bpf_dynptr_user_init(data, size, &dynptr);
+	err = bpf_map_update_elem(fd, &dynptr, &value, BPF_NOEXIST);
+	if (!ASSERT_OK(err, "trie add data"))
+		return -EINVAL;
+
+	zero = 0;
+	memset(raw, 0, size);
+	bpf_dynptr_user_init(raw, size, &dynptr);
+	err = bpf_map_update_elem(fd, &dynptr, &zero, BPF_NOEXIST);
+	if (!ASSERT_OK(err, "trie add zero"))
+		return -EINVAL;
+
+	return 0;
+}
+
+static int setup_array(struct bpf_map *array, void *data, unsigned int size)
+{
+	char raw[FILE_PATH_SIZE];
+	int fd, idx, err;
+
+	fd = bpf_map__fd(array);
+
+	idx = 0;
+	memcpy(raw, data, size);
+	memset(raw + size, 0, sizeof(raw) - size);
+	err = bpf_map_update_elem(fd, &idx, raw, BPF_EXIST);
+	if (!ASSERT_OK(err, "array add data"))
+		return -EINVAL;
+
+	idx = 1;
+	memset(raw, 0, sizeof(raw));
+	err = bpf_map_update_elem(fd, &idx, raw, BPF_EXIST);
+	if (!ASSERT_OK(err, "array add zero"))
+		return -EINVAL;
+
+	return 0;
+}
+
+static int setup_htab(struct bpf_map *htab, void *data, unsigned int size, unsigned int value)
+{
+	char raw[FILE_PATH_SIZE];
+	int fd, err;
+
+	fd = bpf_map__fd(htab);
+
+	memcpy(raw, data, size);
+	memset(raw + size, 0, sizeof(raw) - size);
+	err = bpf_map_update_elem(fd, &raw, &value, BPF_NOEXIST);
+	if (!ASSERT_OK(err, "htab add data"))
+		return -EINVAL;
+
+	return 0;
+}
+
+static void test_qp_trie_basic_ops(void)
+{
+	const char *name = "qp_trie_basic_ops";
+	unsigned int value, new_value;
+	struct bpf_dynptr_user dynptr;
+	struct qp_trie_test *skel;
+	char raw[FILE_PATH_SIZE];
+	int err;
+
+	if (!ASSERT_LT(strlen(name), sizeof(raw), "lengthy data"))
+		return;
+
+	skel = qp_trie_test__open();
+	if (!ASSERT_OK_PTR(skel, "qp_trie_test__open()"))
+		return;
+
+	bpf_program__set_autoload(skel->progs.basic_ops, true);
+
+	err = qp_trie_test__load(skel);
+	if (!ASSERT_OK(err, "qp_trie_test__load()"))
+		goto out;
+
+	value = time(NULL);
+	if (setup_trie(skel->maps.trie, (void *)name, strlen(name), value))
+		goto out;
+
+	if (setup_array(skel->maps.array, (void *)name, strlen(name)))
+		goto out;
+
+	skel->bss->key_size = strlen(name);
+	skel->bss->pid = getpid();
+	err = qp_trie_test__attach(skel);
+	if (!ASSERT_OK(err, "attach"))
+		goto out;
+
+	usleep(1);
+
+	ASSERT_EQ(skel->bss->lookup_str_value, -1, "trie lookup str");
+	ASSERT_EQ(skel->bss->lookup_bytes_value, value, "trie lookup byte");
+	ASSERT_EQ(skel->bss->delete_again_err, -ENOENT, "trie delete again");
+
+	bpf_dynptr_user_init((void *)name, strlen(name), &dynptr);
+	new_value = 0;
+	err = bpf_map_lookup_elem(bpf_map__fd(skel->maps.trie), &dynptr, &new_value);
+	ASSERT_OK(err, "lookup trie");
+	ASSERT_EQ(new_value, value + 1, "check updated value");
+
+	memset(raw, 0, sizeof(raw));
+	bpf_dynptr_user_init(&raw, strlen(name), &dynptr);
+	err = bpf_map_lookup_elem(bpf_map__fd(skel->maps.trie), &dynptr, &new_value);
+	ASSERT_EQ(err, -ENOENT, "check deleted elem");
+out:
+	qp_trie_test__destroy(skel);
+}
+
+static void test_qp_trie_zero_size_dynptr(void)
+{
+	struct qp_trie_test *skel;
+	int err;
+
+	skel = qp_trie_test__open();
+	if (!ASSERT_OK_PTR(skel, "qp_trie_test__open()"))
+		return;
+
+	bpf_program__set_autoload(skel->progs.zero_size_dynptr, true);
+
+	err = qp_trie_test__load(skel);
+	if (!ASSERT_OK(err, "qp_trie_test__load()"))
+		goto out;
+
+	skel->bss->pid = getpid();
+	err = qp_trie_test__attach(skel);
+	if (!ASSERT_OK(err, "attach"))
+		goto out;
+
+	usleep(1);
+
+	ASSERT_OK(skel->bss->zero_size_err, "handle zero sized dynptr");
+out:
+	qp_trie_test__destroy(skel);
+}
+
+static void test_qp_trie_d_path_key(void)
+{
+	const char *name = "/tmp/qp_trie_d_path_key";
+	struct qp_trie_test *skel;
+	char raw[FILE_PATH_SIZE];
+	unsigned int value;
+	int fd, err;
+
+	if (!ASSERT_LT(strlen(name), sizeof(raw), "lengthy data"))
+		return;
+
+	skel = qp_trie_test__open();
+	if (!ASSERT_OK_PTR(skel, "qp_trie_test__open()"))
+		return;
+
+	bpf_program__set_autoload(skel->progs.d_path_key, true);
+
+	err = qp_trie_test__load(skel);
+	if (!ASSERT_OK(err, "qp_trie_test__load()"))
+		goto out;
+
+	value = time(NULL);
+	/* Include the trailing zero byte */
+	if (setup_trie(skel->maps.trie, (void *)name, strlen(name) + 1, value))
+		goto out;
+
+	if (setup_htab(skel->maps.htab, (void *)name, strlen(name) + 1, value))
+		goto out;
+
+	skel->bss->pid = getpid();
+	err = qp_trie_test__attach(skel);
+	/* No support for bpf trampoline ? */
+	if (err == -ENOTSUPP) {
+		test__skip();
+		goto out;
+	}
+	if (!ASSERT_OK(err, "attach"))
+		goto out;
+
+	fd = open(name, O_RDONLY | O_CREAT, 0644);
+	if (!ASSERT_GT(fd, 0, "open tmp file"))
+		goto out;
+	close(fd);
+	unlink(name);
+
+	ASSERT_EQ(skel->bss->trie_path_value, value, "trie lookup");
+	ASSERT_EQ(skel->bss->htab_path_value, -1, "htab lookup");
+out:
+	qp_trie_test__destroy(skel);
+}
+
+void test_qp_trie_test(void)
+{
+	if (test__start_subtest("basic_ops"))
+		test_qp_trie_basic_ops();
+	if (test__start_subtest("zero_size_dynptr"))
+		test_qp_trie_zero_size_dynptr();
+	if (test__start_subtest("d_path_key"))
+		test_qp_trie_d_path_key();
+}
diff --git a/tools/testing/selftests/bpf/progs/qp_trie_test.c b/tools/testing/selftests/bpf/progs/qp_trie_test.c
new file mode 100644
index 000000000000..3aa6c4784564
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/qp_trie_test.c
@@ -0,0 +1,200 @@ 
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (C) 2022. Huawei Technologies Co., Ltd */
+#include <stdbool.h>
+#include <errno.h>
+#include <linux/types.h>
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+#include <bpf/bpf_core_read.h>
+#include <bpf/bpf_tracing.h>
+
+char _license[] SEC("license") = "GPL";
+
+struct path {
+} __attribute__((preserve_access_index));
+
+struct file {
+	struct path f_path;
+} __attribute__((preserve_access_index));
+
+#define FILE_PATH_SIZE 64
+
+struct {
+	__uint(type, BPF_MAP_TYPE_ARRAY);
+	__uint(max_entries, 2);
+	__uint(key_size, 4);
+	__uint(value_size, FILE_PATH_SIZE);
+} array SEC(".maps");
+
+struct {
+	__uint(type, BPF_MAP_TYPE_QP_TRIE);
+	__uint(max_entries, 2);
+	__type(key, struct bpf_dynptr);
+	__type(value, unsigned int);
+	__uint(map_flags, BPF_F_NO_PREALLOC);
+	__uint(map_extra, FILE_PATH_SIZE);
+} trie SEC(".maps");
+
+struct {
+	__uint(type, BPF_MAP_TYPE_HASH);
+	__uint(max_entries, 1);
+	__uint(key_size, FILE_PATH_SIZE);
+	__uint(value_size, 4);
+} htab SEC(".maps");
+
+int pid = 0;
+
+unsigned int key_size;
+unsigned int lookup_str_value;
+unsigned int lookup_bytes_value;
+unsigned int delete_again_err;
+
+unsigned int zero_size_err;
+unsigned int null_data_err;
+
+unsigned int trie_path_value = 0;
+unsigned int htab_path_value = 0;
+
+SEC("?tp/syscalls/sys_enter_nanosleep")
+int BPF_PROG(basic_ops)
+{
+	struct bpf_dynptr str_ptr, bytes_ptr, zero_ptr;
+	unsigned int new_value, byte_size;
+	unsigned int *value;
+	char *raw;
+	int idx;
+
+	if (bpf_get_current_pid_tgid() >> 32 != pid)
+		return 0;
+
+	idx = 0;
+	raw = bpf_map_lookup_elem(&array, &idx);
+	if (!raw)
+		return 0;
+
+	byte_size = key_size;
+	if (!byte_size || byte_size >= FILE_PATH_SIZE)
+		return 0;
+
+	/* Append a zero byte to make it as a string */
+	bpf_dynptr_from_mem(raw, byte_size + 1, 0, &str_ptr);
+	value = bpf_map_lookup_elem(&trie, &str_ptr);
+	if (value)
+		lookup_str_value = *value;
+	else
+		lookup_str_value = -1;
+
+	/* Lookup map */
+	bpf_dynptr_from_mem(raw, byte_size, 0, &bytes_ptr);
+	value = bpf_map_lookup_elem(&trie, &bytes_ptr);
+	if (value)
+		lookup_bytes_value = *value;
+	else
+		lookup_bytes_value = -1;
+
+	/* Update map and check it in userspace */
+	new_value = lookup_bytes_value + 1;
+	bpf_map_update_elem(&trie, &bytes_ptr, &new_value, BPF_EXIST);
+
+	/* Delete map and check it in userspace */
+	idx = 1;
+	raw = bpf_map_lookup_elem(&array, &idx);
+	if (!raw)
+		return 0;
+	bpf_dynptr_from_mem(raw, byte_size, 0, &zero_ptr);
+	bpf_map_delete_elem(&trie, &zero_ptr);
+	delete_again_err = bpf_map_delete_elem(&trie, &zero_ptr);
+
+	return 0;
+}
+
+SEC("?tp/syscalls/sys_enter_nanosleep")
+int BPF_PROG(zero_size_dynptr)
+{
+	struct bpf_dynptr ptr, bad_ptr;
+	unsigned int new_value;
+	void *value;
+	int idx, err;
+	char *raw;
+
+	if (bpf_get_current_pid_tgid() >> 32 != pid)
+		return 0;
+
+	idx = 0;
+	raw = bpf_map_lookup_elem(&array, &idx);
+	if (!raw)
+		return 0;
+
+	/* Use zero-sized bpf_dynptr */
+	bpf_dynptr_from_mem(raw, 0, 0, &ptr);
+
+	value = bpf_map_lookup_elem(&trie, &ptr);
+	if (value)
+		zero_size_err |= 1;
+	new_value = 0;
+	err = bpf_map_update_elem(&trie, &ptr, &new_value, BPF_ANY);
+	if (err != -EINVAL)
+		zero_size_err |= 2;
+	err = bpf_map_delete_elem(&trie, &ptr);
+	if (err != -EINVAL)
+		zero_size_err |= 4;
+
+	/* A bad dynptr also is zero-sized */
+	bpf_dynptr_from_mem(raw, 1, 1U << 31, &bad_ptr);
+
+	value = bpf_map_lookup_elem(&trie, &bad_ptr);
+	if (value)
+		zero_size_err |= 8;
+	new_value = 0;
+	err = bpf_map_update_elem(&trie, &bad_ptr, &new_value, BPF_ANY);
+	if (err != -EINVAL)
+		zero_size_err |= 16;
+	err = bpf_map_delete_elem(&trie, &bad_ptr);
+	if (err != -EINVAL)
+		zero_size_err |= 32;
+	return 0;
+}
+
+SEC("?fentry/filp_close")
+int BPF_PROG(d_path_key, struct file *filp)
+{
+	struct bpf_dynptr ptr;
+	unsigned int *value;
+	struct path *p;
+	int idx, err;
+	long len;
+	char *raw;
+
+	if (bpf_get_current_pid_tgid() >> 32 != pid)
+		return 0;
+
+	idx = 0;
+	raw = bpf_map_lookup_elem(&array, &idx);
+	if (!raw)
+		return 0;
+
+	p = &filp->f_path;
+	len = bpf_d_path(p, raw, FILE_PATH_SIZE);
+	if (len < 1 || len > FILE_PATH_SIZE)
+		return 0;
+
+	/* Include the trailing zero byte */
+	bpf_dynptr_from_mem(raw, len, 0, &ptr);
+	value = bpf_map_lookup_elem(&trie, &ptr);
+	if (value)
+		trie_path_value = *value;
+	else
+		trie_path_value = -1;
+
+	/* Due to the implementation of bpf_d_path(), there will be "garbage"
+	 * characters instead of zero bytes after raw[len-1], so the lookup
+	 * will fail.
+	 */
+	value = bpf_map_lookup_elem(&htab, raw);
+	if (value)
+		htab_path_value = *value;
+	else
+		htab_path_value = -1;
+
+	return 0;
+}