dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selftests/bpf: Test the update operations for htab of maps

Browse Source 
Add test cases to verify the following four update operations on htab of
maps don't trigger lockdep warning:

(1) add then delete
(2) add, overwrite, then delete
(3) add, then lookup_and_delete
(4) add two elements, then lookup_and_delete_batch

Test cases are added for pre-allocated and non-preallocated htab of maps
respectively.

Signed-off-by: Hou Tao <houtao1@huawei.com>
Link: https://lore.kernel.org/r/20241106063542.357743-4-houtao@huaweicloud.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
This commit is contained in:
Hou Tao
2024-11-11 08:18:39 -08:00
committed by Andrii Nakryiko
parent 503cfb103c
commit cb55657c7f
2 changed files with 161 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/testing/selftests/bpf/prog_tests/map_in_map.c
+131 -1
View File
@@ -5,7 +5,9 @@
#include <sys/syscall.h>
#include <test_progs.h>
#include <bpf/btf.h>
#include "access_map_in_map.skel.h"
#include "update_map_in_htab.skel.h"
struct thread_ctx {
pthread_barrier_t barrier;
@@ -127,6 +129,131 @@ out:
access_map_in_map__destroy(skel);
}
static void add_del_fd_htab(int outer_fd)
{
int inner_fd, err;
int key = 1;
inner_fd = bpf_map_create(BPF_MAP_TYPE_ARRAY, "arr1", 4, 4, 1, NULL);
if (!ASSERT_OK_FD(inner_fd, "inner1"))
return;
err = bpf_map_update_elem(outer_fd, &key, &inner_fd, BPF_NOEXIST);
close(inner_fd);
if (!ASSERT_OK(err, "add"))
return;
/* Delete */
err = bpf_map_delete_elem(outer_fd, &key);
ASSERT_OK(err, "del");
}
static void overwrite_fd_htab(int outer_fd)
{
int inner_fd, err;
int key = 1;
inner_fd = bpf_map_create(BPF_MAP_TYPE_ARRAY, "arr1", 4, 4, 1, NULL);
if (!ASSERT_OK_FD(inner_fd, "inner1"))
return;
err = bpf_map_update_elem(outer_fd, &key, &inner_fd, BPF_NOEXIST);
close(inner_fd);
if (!ASSERT_OK(err, "add"))
return;
/* Overwrite */
inner_fd = bpf_map_create(BPF_MAP_TYPE_ARRAY, "arr2", 4, 4, 1, NULL);
if (!ASSERT_OK_FD(inner_fd, "inner2"))
goto out;
err = bpf_map_update_elem(outer_fd, &key, &inner_fd, BPF_EXIST);
close(inner_fd);
if (!ASSERT_OK(err, "overwrite"))
goto out;
err = bpf_map_delete_elem(outer_fd, &key);
ASSERT_OK(err, "del");
return;
out:
bpf_map_delete_elem(outer_fd, &key);
}
static void lookup_delete_fd_htab(int outer_fd)
{
int key = 1, value;
int inner_fd, err;
inner_fd = bpf_map_create(BPF_MAP_TYPE_ARRAY, "arr1", 4, 4, 1, NULL);
if (!ASSERT_OK_FD(inner_fd, "inner1"))
return;
err = bpf_map_update_elem(outer_fd, &key, &inner_fd, BPF_NOEXIST);
close(inner_fd);
if (!ASSERT_OK(err, "add"))
return;
/* lookup_and_delete is not supported for htab of maps */
err = bpf_map_lookup_and_delete_elem(outer_fd, &key, &value);
ASSERT_EQ(err, -ENOTSUPP, "lookup_del");
err = bpf_map_delete_elem(outer_fd, &key);
ASSERT_OK(err, "del");
}
static void batched_lookup_delete_fd_htab(int outer_fd)
{
int keys[2] = {1, 2}, values[2];
unsigned int cnt, batch;
int inner_fd, err;
inner_fd = bpf_map_create(BPF_MAP_TYPE_ARRAY, "arr1", 4, 4, 1, NULL);
if (!ASSERT_OK_FD(inner_fd, "inner1"))
return;
err = bpf_map_update_elem(outer_fd, &keys[0], &inner_fd, BPF_NOEXIST);
close(inner_fd);
if (!ASSERT_OK(err, "add1"))
return;
inner_fd = bpf_map_create(BPF_MAP_TYPE_ARRAY, "arr2", 4, 4, 1, NULL);
if (!ASSERT_OK_FD(inner_fd, "inner2"))
goto out;
err = bpf_map_update_elem(outer_fd, &keys[1], &inner_fd, BPF_NOEXIST);
close(inner_fd);
if (!ASSERT_OK(err, "add2"))
goto out;
/* batched lookup_and_delete */
cnt = ARRAY_SIZE(keys);
err = bpf_map_lookup_and_delete_batch(outer_fd, NULL, &batch, keys, values, &cnt, NULL);
ASSERT_TRUE((!err || err == -ENOENT), "delete_batch ret");
ASSERT_EQ(cnt, ARRAY_SIZE(keys), "delete_batch cnt");
out:
bpf_map_delete_elem(outer_fd, &keys[0]);
}
static void test_update_map_in_htab(bool preallocate)
{
struct update_map_in_htab *skel;
int err, fd;
skel = update_map_in_htab__open();
if (!ASSERT_OK_PTR(skel, "open"))
return;
err = update_map_in_htab__load(skel);
if (!ASSERT_OK(err, "load"))
goto out;
fd = preallocate ? bpf_map__fd(skel->maps.outer_htab_map) :
bpf_map__fd(skel->maps.outer_alloc_htab_map);
add_del_fd_htab(fd);
overwrite_fd_htab(fd);
lookup_delete_fd_htab(fd);
batched_lookup_delete_fd_htab(fd);
out:
update_map_in_htab__destroy(skel);
}
void test_map_in_map(void)
{
if (test__start_subtest("acc_map_in_array"))
@@ -137,5 +264,8 @@ void test_map_in_map(void)
test_map_in_map_access("access_map_in_htab", "outer_htab_map");
if (test__start_subtest("sleepable_acc_map_in_htab"))
test_map_in_map_access("sleepable_access_map_in_htab", "outer_htab_map");
if (test__start_subtest("update_map_in_htab"))
test_update_map_in_htab(true);
if (test__start_subtest("update_map_in_alloc_htab"))
test_update_map_in_htab(false);
}
tools/testing/selftests/bpf/progs/update_map_in_htab.c
+30
View File
@@ -0,0 +1,30 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2024. Huawei Technologies Co., Ltd */
#include <linux/bpf.h>
#include <bpf/bpf_helpers.h>
struct inner_map_type {
__uint(type, BPF_MAP_TYPE_ARRAY);
__uint(key_size, 4);
__uint(value_size, 4);
__uint(max_entries, 1);
} inner_map SEC(".maps");
struct {
__uint(type, BPF_MAP_TYPE_HASH_OF_MAPS);
__type(key, int);
__type(value, int);
__uint(max_entries, 2);
__array(values, struct inner_map_type);
} outer_htab_map SEC(".maps");
struct {
__uint(type, BPF_MAP_TYPE_HASH_OF_MAPS);
__uint(map_flags, BPF_F_NO_PREALLOC);
__type(key, int);
__type(value, int);
__uint(max_entries, 2);
__array(values, struct inner_map_type);
} outer_alloc_htab_map SEC(".maps");
char _license[] SEC("license") = "GPL";