]> git.ipfire.org Git - people/ms/linux.git/commitdiff
selftests/bpf: Add exponential backoff to map_delete_retriable in test_maps
authorYucong Sun <fallentree@fb.com>
Tue, 17 Aug 2021 04:57:13 +0000 (21:57 -0700)
committerAndrii Nakryiko <andrii@kernel.org>
Tue, 17 Aug 2021 15:17:40 +0000 (08:17 -0700)
Using a fixed delay of 1 microsecond has proven flaky in slow CPU environment,
e.g. Github Actions CI system. This patch adds exponential backoff with a cap
of 50ms to reduce the flakiness of the test. Initial delay is chosen at random
in the range [0ms, 5ms).

Signed-off-by: Yucong Sun <fallentree@fb.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20210817045713.3307985-1-fallentree@fb.com
tools/testing/selftests/bpf/test_maps.c

index 2caf58b40d4026b5b1fd035968925dcf13b60b04..340695d5d65272c6345e6f2f1cb0144b1095900c 100644 (file)
@@ -1420,11 +1420,16 @@ static int map_update_retriable(int map_fd, const void *key, const void *value,
 
 static int map_delete_retriable(int map_fd, const void *key, int attempts)
 {
+       int delay = rand() % MIN_DELAY_RANGE_US;
+
        while (bpf_map_delete_elem(map_fd, key)) {
                if (!attempts || (errno != EAGAIN && errno != EBUSY))
                        return -errno;
 
-               usleep(1);
+               if (delay <= MAX_DELAY_US / 2)
+                       delay *= 2;
+
+               usleep(delay);
                attempts--;
        }