From: Cong Wang <xiyou.wangcong@gmail.com>
To: netdev@vger.kernel.org
Cc: bpf@vger.kernel.org, jhs@mojatatu.com, andrii@kernel.org,
ast@kernel.org, daniel@iogearbox.net, kafai@fb.com,
Cong Wang <cong.wang@bytedance.com>,
Dongdong Wang <wangdongdong.6@bytedance.com>
Subject: [Patch bpf-next v5 2/3] selftests/bpf: add test cases for bpf timeout map
Date: Fri, 22 Jan 2021 12:54:14 -0800 [thread overview]
Message-ID: <20210122205415.113822-3-xiyou.wangcong@gmail.com> (raw)
In-Reply-To: <20210122205415.113822-1-xiyou.wangcong@gmail.com>
From: Cong Wang <cong.wang@bytedance.com>
Add some test cases in test_maps.c for timeout map, which focus
on testing timeout. The parallel tests make sure to catch race
conditions and the large map test stresses GC.
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Dongdong Wang <wangdongdong.6@bytedance.com>
Signed-off-by: Cong Wang <cong.wang@bytedance.com>
---
tools/testing/selftests/bpf/test_maps.c | 68 +++++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c
index 51adc42b2b40..58b4712a0f98 100644
--- a/tools/testing/selftests/bpf/test_maps.c
+++ b/tools/testing/selftests/bpf/test_maps.c
@@ -639,6 +639,52 @@ static void test_stackmap(unsigned int task, void *data)
close(fd);
}
+static void test_timeout_map(unsigned int task, void *data)
+{
+ int val1 = 1, val2 = 2, val3 = 3;
+ int key1 = 1, key2 = 2, key3 = 3;
+ int fd;
+
+ fd = bpf_create_map(BPF_MAP_TYPE_TIMEOUT_HASH, sizeof(int), sizeof(int),
+ 3, map_flags);
+ if (fd < 0) {
+ printf("Failed to create timeout map '%s'!\n", strerror(errno));
+ exit(1);
+ }
+
+ /* Timeout after 1 secs */
+ assert(bpf_map_update_elem(fd, &key1, &val1, (u64)1000<<32) == 0);
+ /* Timeout after 2 secs */
+ assert(bpf_map_update_elem(fd, &key2, &val2, (u64)2000<<32) == 0);
+ /* Timeout after 10 secs */
+ assert(bpf_map_update_elem(fd, &key3, &val3, (u64)10000<<32) == 0);
+
+ sleep(1);
+ assert(bpf_map_lookup_elem(fd, &key1, &val1) != 0);
+ val2 = 0;
+ assert(bpf_map_lookup_elem(fd, &key2, &val2) == 0 && val2 == 2);
+
+ sleep(1);
+ assert(bpf_map_lookup_elem(fd, &key1, &val1) != 0);
+ assert(bpf_map_lookup_elem(fd, &key2, &val2) != 0);
+
+ /* Modify timeout to expire it earlier */
+ val3 = 0;
+ assert(bpf_map_lookup_elem(fd, &key3, &val3) == 0 && val3 == 3);
+ assert(bpf_map_update_elem(fd, &key3, &val3, (u64)1000<<32) == 0);
+ sleep(1);
+ assert(bpf_map_lookup_elem(fd, &key3, &val3) != 0);
+
+ /* Add one elem expired immediately and try to delete this expired */
+ assert(bpf_map_update_elem(fd, &key3, &val3, 0) == 0);
+ assert(bpf_map_delete_elem(fd, &key3) == -1 && errno == ENOENT);
+
+ /* Add one elem and let the map removal clean up */
+ assert(bpf_map_update_elem(fd, &key3, &val3, (u64)10000<<32) == 0);
+
+ close(fd);
+}
+
#include <sys/ioctl.h>
#include <arpa/inet.h>
#include <sys/select.h>
@@ -1305,6 +1351,7 @@ static void test_map_stress(void)
run_parallel(100, test_arraymap, NULL);
run_parallel(100, test_arraymap_percpu, NULL);
+ run_parallel(100, test_timeout_map, NULL);
}
#define TASKS 1024
@@ -1759,6 +1806,25 @@ static void test_reuseport_array(void)
close(map_fd);
}
+static void test_large_timeout_map(int nr_elems)
+{
+ int val, key;
+ int i, fd;
+
+ fd = bpf_create_map(BPF_MAP_TYPE_TIMEOUT_HASH, sizeof(int), sizeof(int),
+ nr_elems, map_flags);
+ if (fd < 0) {
+ printf("Failed to create a large timeout map '%s'!\n", strerror(errno));
+ exit(1);
+ }
+ for (i = 0; i < nr_elems; i++) {
+ key = val = i;
+ /* Timeout after 10 secs */
+ assert(bpf_map_update_elem(fd, &key, &val, (u64)10000<<32) == 0);
+ }
+ close(fd);
+}
+
static void run_all_tests(void)
{
test_hashmap(0, NULL);
@@ -1788,6 +1854,8 @@ static void run_all_tests(void)
test_stackmap(0, NULL);
test_map_in_map();
+
+ test_large_timeout_map(1000000);
}
#define DEFINE_TEST(name) extern void test_##name(void);
--
2.25.1
next prev parent reply other threads:[~2021-01-22 20:59 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 20:54 [Patch bpf-next v5 0/3] bpf: introduce timeout hash map Cong Wang
2021-01-22 20:54 ` [Patch bpf-next v5 1/3] " Cong Wang
2021-01-26 22:04 ` Daniel Borkmann
2021-01-27 6:59 ` Cong Wang
2021-01-27 18:00 ` Alexei Starovoitov
2021-01-27 22:48 ` Daniel Borkmann
2021-01-28 2:45 ` Alexei Starovoitov
2021-01-28 6:28 ` Cong Wang
2021-01-29 2:54 ` Alexei Starovoitov
2021-01-29 5:57 ` Cong Wang
2021-01-29 6:21 ` Yonghong Song
[not found] ` <f7bc5873-7722-e359-b450-4db7dc3656d6@mojatatu.com>
[not found] ` <dc5ddf32-2d65-15a9-9448-5f2d3a10d227@mojatatu.com>
2021-01-30 3:14 ` Alexei Starovoitov
2021-01-31 20:35 ` Jamal Hadi Salim
2021-01-22 20:54 ` Cong Wang [this message]
2021-01-22 20:54 ` [Patch bpf-next v5 3/3] selftests/bpf: add timeout map check in map_ptr tests Cong Wang
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=20210122205415.113822-3-xiyou.wangcong@gmail.com \
--to=xiyou.wangcong@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=cong.wang@bytedance.com \
--cc=daniel@iogearbox.net \
--cc=jhs@mojatatu.com \
--cc=kafai@fb.com \
--cc=netdev@vger.kernel.org \
--cc=wangdongdong.6@bytedance.com \
/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).