Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

selftests/bpf: speedup test_maps

Browse Source 
test_hashmap_walk takes very long time on debug kernel with kasan on.
Reduce the number of iterations in this test without sacrificing
test coverage.
Also add printfs as progress indicator.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Alexei Starovoitov 2018-01-22 17:46:57 -08:00 committed by Daniel Borkmann
parent 35136920e1
commit 1a97cf1fe5
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/testing/selftests/bpf/test_maps.c
View File

@ -242,7 +242,7 @@ static void test_hashmap_percpu(int task, void *data)
static void test_hashmap_walk(int task, void *data) static void test_hashmap_walk(int task, void *data)
{ {
int fd, i, max_entries = 100000; int fd, i, max_entries = 1000;
long long key, value, next_key; long long key, value, next_key;
bool next_key_valid = true; bool next_key_valid = true;
@ -931,8 +931,12 @@ static void test_map_large(void)
close(fd); close(fd);
} }
static void run_parallel(int tasks, void (*fn)(int task, void *data), #define run_parallel(N, FN, DATA) \
void *data) printf("Fork %d tasks to '" #FN "'\n", N); \
__run_parallel(N, FN, DATA)
static void __run_parallel(int tasks, void (*fn)(int task, void *data),
void *data)
{ {
pid_t pid[tasks]; pid_t pid[tasks];
int i; int i;
@ -972,7 +976,7 @@ static void test_map_stress(void)
#define DO_UPDATE 1 #define DO_UPDATE 1
#define DO_DELETE 0 #define DO_DELETE 0
static void do_work(int fn, void *data) static void test_update_delete(int fn, void *data)
{ {
int do_update = ((int *)data)[1]; int do_update = ((int *)data)[1];
int fd = ((int *)data)[0]; int fd = ((int *)data)[0];
@ -1012,7 +1016,7 @@ static void test_map_parallel(void)
*/ */
data[0] = fd; data[0] = fd;
data[1] = DO_UPDATE; data[1] = DO_UPDATE;
run_parallel(TASKS, do_work, data); run_parallel(TASKS, test_update_delete, data);
/* Check that key=0 is already there. */ /* Check that key=0 is already there. */
assert(bpf_map_update_elem(fd, &key, &value, BPF_NOEXIST) == -1 && assert(bpf_map_update_elem(fd, &key, &value, BPF_NOEXIST) == -1 &&
@ -1035,7 +1039,7 @@ static void test_map_parallel(void)
/* Now let's delete all elemenets in parallel. */ /* Now let's delete all elemenets in parallel. */
data[1] = DO_DELETE; data[1] = DO_DELETE;
run_parallel(TASKS, do_work, data); run_parallel(TASKS, test_update_delete, data);
/* Nothing should be left. */ /* Nothing should be left. */
key = -1; key = -1;