From: Hou Tao <houtao1@xxxxxxxxxx>
First showing the lookup on qp-trie map is different with on hash-tab,
because qp-trie map only uses the specified length in key buffer instead
of the full key size, then checking update and deletion operations on
qp-trie map work as expected by using bpf_dynptr. Also checking the
zero-sized bpf_dynptr is rejected by map operations.
Signed-off-by: Hou Tao <houtao1@xxxxxxxxxx>
---
tools/testing/selftests/bpf/DENYLIST.s390x | 1 +
.../selftests/bpf/prog_tests/qp_trie_test.c | 91 +++++++++++++++
.../selftests/bpf/progs/qp_trie_test.c | 110 ++++++++++++++++++
3 files changed, 202 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 --git a/tools/testing/selftests/bpf/DENYLIST.s390x b/tools/testing/selftests/bpf/DENYLIST.s390x
index 168c5b287b5c..e18d6f5ffeef 100644
--- a/tools/testing/selftests/bpf/DENYLIST.s390x
+++ b/tools/testing/selftests/bpf/DENYLIST.s390x
@@ -71,3 +71,4 @@ cb_refs # expected error message unexpected err
cgroup_hierarchical_stats # JIT does not support calling kernel function (kfunc)
htab_update # failed to attach: ERROR: strerror_r(-524)=22 (trampoline)
tracing_struct # failed to auto-attach: -524 (trampoline)
+qp_trie_test # failed to attach: ERROR: strerror_r(-524)=22 (trampoline)
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..24d5719f4f7f
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/qp_trie_test.c
@@ -0,0 +1,91 @@
+// 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"
+
+static int setup_maps(struct qp_trie_test *skel, char *name, unsigned int value)
+{
+#define FILE_PATH_SIZE 64
+ struct bpf_dynptr_user dynptr;
+ char raw[FILE_PATH_SIZE];
+ char zero;
+ int fd, err;
+
+ memset(raw, 0, sizeof(raw));
+ strncpy(raw, name, sizeof(raw) - 1);
+
+ fd = bpf_map__fd(skel->maps.trie);
+ /* Full path returned from d_path includes the trailing terminator */
+ bpf_dynptr_user_init(name, strlen(name) + 1, &dynptr);
+ err = bpf_map_update_elem(fd, &dynptr, &value, BPF_NOEXIST);
+ if (!ASSERT_OK(err, "trie add name"))
+ return -EINVAL;
+
+ zero = 0;
+ bpf_dynptr_user_init(&zero, 1, &dynptr);
+ err = bpf_map_update_elem(fd, &dynptr, &value, BPF_NOEXIST);
+ if (!ASSERT_OK(err, "trie add zero"))
+ return -EINVAL;
+
+ fd = bpf_map__fd(skel->maps.htab);
+ err = bpf_map_update_elem(fd, raw, &value, BPF_NOEXIST);
+ if (!ASSERT_OK(err, "htab add"))
+ return -EINVAL;
+
+ return 0;
+}
+
+void test_qp_trie_test(void)
+{
+ char name[] = "/tmp/qp_trie_test";
+ unsigned int value, new_value;
+ struct bpf_dynptr_user dynptr;
+ struct qp_trie_test *skel;
+ int err, fd;
+ char zero;
+
+ skel = qp_trie_test__open();
+ if (!ASSERT_OK_PTR(skel, "qp_trie_test__open()"))
+ return;
+
+ err = qp_trie_test__load(skel);
+ if (!ASSERT_OK(err, "qp_trie_test__load()"))
+ goto out;
+
+ value = time(NULL);
+ if (setup_maps(skel, name, value))
+ goto out;
+
+ skel->bss->pid = getpid();
+ err = qp_trie_test__attach(skel);
+ if (!ASSERT_OK(err, "attach"))
+ goto out;
+
+ fd = open(name, O_RDONLY | O_CREAT, 0644);
+ if (!ASSERT_GE(fd, 0, "open tmp file"))
+ goto out;
+ close(fd);
+ unlink(name);
+
+ ASSERT_EQ(skel->bss->trie_value, value, "trie lookup str");
+ ASSERT_EQ(skel->bss->htab_value, -1, "htab lookup bytes");
+ ASSERT_FALSE(skel->bss->zero_sized_key_bad, "zero-sized key");
+
+ bpf_dynptr_user_init(name, strlen(name) + 1, &dynptr);
+ new_value = 0;
+ err = bpf_map_lookup_elem(bpf_map__fd(skel->maps.trie), &dynptr, &new_value);
+ ASSERT_OK(err, "lookup elem");
+ ASSERT_EQ(new_value, value + 1, "check new value");
+
+ zero = 0;
+ bpf_dynptr_user_init(&zero, 1, &dynptr);
+ err = bpf_map_lookup_elem(bpf_map__fd(skel->maps.trie), &dynptr, &new_value);
+ ASSERT_EQ(err, -ENOENT, "lookup deleted elem");
+
+out:
+ qp_trie_test__destroy(skel);
+}
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..c7cf3dfae971
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/qp_trie_test.c
@@ -0,0 +1,110 @@
+// 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 | BPF_F_DYNPTR_KEY);
+ __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 trie_value = 0;
+unsigned int htab_value = 0;
+bool zero_sized_key_bad = false;
+
+SEC("fentry/filp_close")
+int BPF_PROG(filp_close, struct file *filp)
+{
+ struct bpf_dynptr str_ptr, zero_ptr, zero_sized_ptr;
+ unsigned int new_value, *value;
+ int idx, len, err;
+ struct path *p;
+ 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 < 0 || len > FILE_PATH_SIZE)
+ return 0;
+
+ bpf_dynptr_from_mem(raw, len, 0, &str_ptr);
+ value = bpf_map_lookup_elem(&trie, &str_ptr);
+ if (value)
+ trie_value = *value;
+ else
+ trie_value = -1;
+
+ value = bpf_map_lookup_elem(&htab, raw);
+ if (value)
+ htab_value = *value;
+ else
+ htab_value = -1;
+
+ /* Update qp_trie map */
+ new_value = trie_value + 1;
+ bpf_map_update_elem(&trie, &str_ptr, &new_value, BPF_ANY);
+
+ idx = 1;
+ raw = bpf_map_lookup_elem(&array, &idx);
+ if (!raw)
+ return 0;
+ bpf_dynptr_from_mem(raw, 1, 0, &zero_ptr);
+ bpf_map_delete_elem(&trie, &zero_ptr);
+
+ /* Use zero-sized bpf_dynptr */
+ bpf_dynptr_from_mem(raw, 0, 0, &zero_sized_ptr);
+
+ value = bpf_map_lookup_elem(&trie, &zero_sized_ptr);
+ if (value)
+ zero_sized_key_bad = true;
+ err = bpf_map_update_elem(&trie, &zero_sized_ptr, &new_value, BPF_ANY);
+ if (err != -EINVAL)
+ zero_sized_key_bad = true;
+ err = bpf_map_delete_elem(&trie, &zero_sized_ptr);
+ if (err != -EINVAL)
+ zero_sized_key_bad = true;
+
+ return 0;
+}
--
2.29.2
