[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20201214201118.148126-6-xiyou.wangcong@gmail.com>
Date: Mon, 14 Dec 2020 12:11:18 -0800
From: Cong Wang <xiyou.wangcong@...il.com>
To: netdev@...r.kernel.org
Cc: bpf@...r.kernel.org, Cong Wang <cong.wang@...edance.com>,
Andrey Ignatov <rdna@...com>,
Alexei Starovoitov <ast@...nel.org>,
Daniel Borkmann <daniel@...earbox.net>,
Dongdong Wang <wangdongdong.6@...edance.com>
Subject: [Patch bpf-next v2 5/5] selftests/bpf: add timeout map check in map_ptr tests
From: Cong Wang <cong.wang@...edance.com>
Similar to regular hashmap test.
Cc: Andrey Ignatov <rdna@...com>
Cc: Alexei Starovoitov <ast@...nel.org>
Cc: Daniel Borkmann <daniel@...earbox.net>
Cc: Dongdong Wang <wangdongdong.6@...edance.com>
Signed-off-by: Cong Wang <cong.wang@...edance.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 34f9880a1903..f158b4f7e6c8 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 == 72);
+
+ 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
Powered by blists - more mailing lists