From: Yonghong Song <yhs@fb.com>
To: <bpf@vger.kernel.org>, <netdev@vger.kernel.org>
Cc: Alexei Starovoitov <ast@fb.com>,
Brian Vazquez <brianvv@google.com>,
Daniel Borkmann <daniel@iogearbox.net>, <kernel-team@fb.com>,
Yonghong Song <yhs@fb.com>
Subject: [PATCH bpf-next 08/13] tools/bpf: add test for bpf_map_update_batch()
Date: Wed, 28 Aug 2019 23:45:11 -0700 [thread overview]
Message-ID: <20190829064511.2751174-1-yhs@fb.com> (raw)
In-Reply-To: <20190829064502.2750303-1-yhs@fb.com>
Add tests for bpf_map_update_batch().
$ ./test_maps
...
test_map_update_batch:PASS
...
---
.../bpf/map_tests/map_update_batch.c | 115 ++++++++++++++++++
1 file changed, 115 insertions(+)
create mode 100644 tools/testing/selftests/bpf/map_tests/map_update_batch.c
diff --git a/tools/testing/selftests/bpf/map_tests/map_update_batch.c b/tools/testing/selftests/bpf/map_tests/map_update_batch.c
new file mode 100644
index 000000000000..67c1e11fc911
--- /dev/null
+++ b/tools/testing/selftests/bpf/map_tests/map_update_batch.c
@@ -0,0 +1,115 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2019 Facebook */
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+
+#include <bpf/bpf.h>
+#include <bpf/libbpf.h>
+
+#include <test_maps.h>
+
+void test_map_update_batch(void)
+{
+ struct bpf_create_map_attr xattr = {
+ .name = "hash_map",
+ .map_type = BPF_MAP_TYPE_HASH,
+ .key_size = sizeof(int),
+ .value_size = sizeof(int),
+ };
+ int map_fd, *keys, *values, key, value;
+ const int max_entries = 10;
+ __u32 count, max_count;
+ int err, i;
+
+ xattr.max_entries = max_entries;
+ map_fd = bpf_create_map_xattr(&xattr);
+ CHECK(map_fd == -1,
+ "bpf_create_map_xattr()", "error:%s\n", strerror(errno));
+
+ keys = malloc(max_entries * sizeof(int));
+ values = malloc(max_entries * sizeof(int));
+ CHECK(!keys || !values, "malloc()", "error:%s\n", strerror(errno));
+
+ /* do not fill in the whole hash table, so we could test
+ * update with new elements.
+ */
+ max_count = max_entries - 2;
+
+ for (i = 0; i < max_count; i++) {
+ keys[i] = i + 1;
+ values[i] = i + 2;
+ }
+
+ /* test 1: count == 0, expect success. */
+ count = 0;
+ err = bpf_map_update_batch(map_fd, keys, values, &count, 0, 0);
+ CHECK(err, "count = 0", "error:%s\n", strerror(errno));
+
+ /* test 2: update initial map with BPF_NOEXIST, expect success. */
+ count = max_count;
+ err = bpf_map_update_batch(map_fd, keys, values,
+ &count, BPF_NOEXIST, 0);
+ CHECK(err, "elem_flags = BPF_NOEXIST",
+ "error:%s\n", strerror(errno));
+
+ /* use bpf_map_get_next_key to ensure all keys/values are indeed
+ * covered.
+ */
+ err = bpf_map_get_next_key(map_fd, NULL, &key);
+ CHECK(err, "bpf_map_get_next_key()", "error: %s\n", strerror(errno));
+ err = bpf_map_lookup_elem(map_fd, &key, &value);
+ CHECK(err, "bpf_map_lookup_elem()", "error: %s\n", strerror(errno));
+ CHECK(key + 1 != value, "key/value checking",
+ "error: key %d value %d\n", key, value);
+ i = 1;
+ while (!bpf_map_get_next_key(map_fd, &key, &key)) {
+ err = bpf_map_lookup_elem(map_fd, &key, &value);
+ CHECK(err, "bpf_map_lookup_elem()", "error: %s\n",
+ strerror(errno));
+ CHECK(key + 1 != value,
+ "key/value checking", "error: key %d value %d\n",
+ key, value);
+ i++;
+ }
+ CHECK(i != max_count, "checking number of entries",
+ "err: i %u max_count %u\n", i, max_count);
+
+ /* test 3: elem_flags = BPF_NOEXIST, already exists, expect failure */
+ err = bpf_map_update_batch(map_fd, keys, values,
+ &count, BPF_NOEXIST, 0);
+ /* failure to due to flag BPF_NOEXIST, count is set to 0 */
+ CHECK(!err || count, "elem_flags = BPF_NOEXIST again",
+ "unexpected success\n");
+
+ /* test 4: elem_flags = 0, expect success */
+ count = max_count;
+ err = bpf_map_update_batch(map_fd, keys, values,
+ &count, 0, 0);
+ CHECK(err, "elem_flags = 0", "error %s\n", strerror(errno));
+
+ /* test 5: keys = NULL, expect failure */
+ count = max_count;
+ err = bpf_map_update_batch(map_fd, NULL, values,
+ &count, 0, 0);
+ CHECK(!err, "keys = NULL", "unexpected success\n");
+
+ /* test 6: values = NULL, expect failure */
+ count = max_count;
+ err = bpf_map_update_batch(map_fd, keys, NULL, &count, 0, 0);
+ CHECK(!err, "values = NULL", "unexpected success\n");
+
+ /* test 7: modify the first key to be max_count + 10,
+ * elem_flags = BPF_NOEXIST,
+ * expect failure, the return count = 1.
+ */
+ count = max_count;
+ keys[0] = max_count + 10;
+ err = bpf_map_update_batch(map_fd, keys, values,
+ &count, BPF_NOEXIST, 0);
+ CHECK(!err, "keys[0] = max_count + 10", "unexpected success\n");
+ CHECK(count != 1, "keys[0] = max_count + 10",
+ "error: %s, incorrect count %u\n", strerror(errno), count);
+
+ printf("%s:PASS\n", __func__);
+}
--
2.17.1
next prev parent reply other threads:[~2019-08-29 6:45 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-29 6:45 [PATCH bpf-next 00/13] bpf: adding map batch processing support Yonghong Song
2019-08-29 6:45 ` [PATCH bpf-next 01/13] bpf: add bpf_map_value_size and bp_map_copy_value helper functions Yonghong Song
2019-08-29 22:04 ` Song Liu
2019-08-30 6:40 ` Yonghong Song
2019-08-29 6:45 ` [PATCH bpf-next 02/13] bpf: refactor map_update_elem() Yonghong Song
2019-08-29 23:37 ` Song Liu
2019-08-29 6:45 ` [PATCH bpf-next 03/13] bpf: refactor map_delete_elem() Yonghong Song
2019-08-29 23:39 ` Song Liu
2019-08-29 6:45 ` [PATCH bpf-next 04/13] bpf: refactor map_get_next_key() Yonghong Song
2019-08-29 23:39 ` Song Liu
2019-08-29 6:45 ` [PATCH bpf-next 05/13] bpf: adding map batch processing support Yonghong Song
2019-08-29 23:01 ` Brian Vazquez
2019-08-30 6:39 ` Yonghong Song
2019-08-30 6:58 ` Alexei Starovoitov
2019-08-29 6:45 ` [PATCH bpf-next 06/13] tools/bpf: sync uapi header bpf.h Yonghong Song
2019-08-29 6:45 ` [PATCH bpf-next 07/13] tools/bpf: implement libbpf API functions for map batch operations Yonghong Song
2019-08-29 6:45 ` Yonghong Song [this message]
2019-08-29 6:45 ` [PATCH bpf-next 09/13] tools/bpf: add test for bpf_map_lookup_batch() Yonghong Song
2019-08-29 6:45 ` [PATCH bpf-next 10/13] tools/bpf: add test for bpf_map_lookup_and_delete_batch() Yonghong Song
2019-08-29 6:45 ` [PATCH bpf-next 11/13] tools/bpf: add test for bpf_map_delete_batch() Yonghong Song
2019-08-29 6:45 ` [PATCH bpf-next 12/13] tools/bpf: add a multithreaded test for map batch operations Yonghong Song
2019-08-29 6:45 ` [PATCH bpf-next 13/13] tools/bpf: measure map batching perf Yonghong Song
2019-08-29 18:39 ` [PATCH bpf-next 00/13] bpf: adding map batch processing support Jakub Kicinski
2019-08-29 23:13 ` Brian Vazquez
2019-08-30 0:15 ` Jakub Kicinski
2019-08-30 20:15 ` Stanislav Fomichev
2019-08-30 20:55 ` Yonghong Song
2019-08-30 21:10 ` Jakub Kicinski
2019-08-30 22:24 ` Yonghong Song
2019-08-30 21:18 ` Stanislav Fomichev
2019-09-03 21:01 ` Alexei Starovoitov
2019-09-03 22:30 ` Stanislav Fomichev
2019-09-03 23:07 ` Brian Vazquez
2019-09-04 1:35 ` Alexei Starovoitov
2019-09-03 23:07 ` Yonghong Song
2019-08-30 7:25 ` Yonghong Song
2019-08-30 21:35 ` Jakub Kicinski
2019-08-30 22:38 ` Yonghong Song
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=20190829064511.2751174-1-yhs@fb.com \
--to=yhs@fb.com \
--cc=ast@fb.com \
--cc=bpf@vger.kernel.org \
--cc=brianvv@google.com \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=netdev@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).