From: Cong Wang <xiyou.wangcong@gmail.com>
To: netdev@vger.kernel.org
Cc: bpf@vger.kernel.org, Cong Wang <cong.wang@bytedance.com>,
Andrey Ignatov <rdna@fb.com>, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Dongdong Wang <wangdongdong.6@bytedance.com>
Subject: [Patch bpf-next v4 3/3] selftests/bpf: add timeout map check in map_ptr tests
Date: Sat, 16 Jan 2021 20:22:24 -0800 [thread overview]
Message-ID: <20210117042224.17839-4-xiyou.wangcong@gmail.com> (raw)
In-Reply-To: <20210117042224.17839-1-xiyou.wangcong@gmail.com>
From: Cong Wang <cong.wang@bytedance.com>
Similar to regular hashmap test.
Acked-by: Andrey Ignatov <rdna@fb.com>
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>
---
.../selftests/bpf/progs/map_ptr_kern.c | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/tools/testing/selftests/bpf/progs/map_ptr_kern.c b/tools/testing/selftests/bpf/progs/map_ptr_kern.c
index d8850bc6a9f1..424a9e76c93f 100644
--- a/tools/testing/selftests/bpf/progs/map_ptr_kern.c
+++ b/tools/testing/selftests/bpf/progs/map_ptr_kern.c
@@ -648,6 +648,25 @@ static inline int check_ringbuf(void)
return 1;
}
+struct {
+ __uint(type, BPF_MAP_TYPE_TIMEOUT_HASH);
+ __uint(max_entries, MAX_ENTRIES);
+ __type(key, __u32);
+ __type(value, __u32);
+} m_timeout SEC(".maps");
+
+static inline int check_timeout_hash(void)
+{
+ struct bpf_htab *timeout_hash = (struct bpf_htab *)&m_timeout;
+ struct bpf_map *map = (struct bpf_map *)&m_timeout;
+
+ VERIFY(check_default(&timeout_hash->map, map));
+ VERIFY(timeout_hash->n_buckets == MAX_ENTRIES);
+ VERIFY(timeout_hash->elem_size == 64);
+
+ return 1;
+}
+
SEC("cgroup_skb/egress")
int cg_skb(void *ctx)
{
@@ -679,6 +698,7 @@ int cg_skb(void *ctx)
VERIFY_TYPE(BPF_MAP_TYPE_SK_STORAGE, check_sk_storage);
VERIFY_TYPE(BPF_MAP_TYPE_DEVMAP_HASH, check_devmap_hash);
VERIFY_TYPE(BPF_MAP_TYPE_RINGBUF, check_ringbuf);
+ VERIFY_TYPE(BPF_MAP_TYPE_TIMEOUT_HASH, check_timeout_hash);
return 1;
}
--
2.25.1
prev parent reply other threads:[~2021-01-17 4:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-17 4:22 [Patch bpf-next v4 0/3] bpf: introduce timeout hash map Cong Wang
2021-01-17 4:22 ` [Patch bpf-next v4 1/3] " Cong Wang
2021-01-18 19:10 ` Cong Wang
2021-01-17 4:22 ` [Patch bpf-next v4 2/3] selftests/bpf: add test cases for bpf timeout map Cong Wang
2021-01-17 4:22 ` Cong Wang [this message]
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=20210117042224.17839-4-xiyou.wangcong@gmail.com \
--to=xiyou.wangcong@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=cong.wang@bytedance.com \
--cc=daniel@iogearbox.net \
--cc=netdev@vger.kernel.org \
--cc=rdna@fb.com \
--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).