]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
selftests/bpf: Harden cpu flags test for lru_percpu_hash map
authorLeon Hwang <leon.hwang@linux.dev>
Mon, 19 Jan 2026 13:34:17 +0000 (21:34 +0800)
committerMartin KaFai Lau <martin.lau@kernel.org>
Mon, 26 Jan 2026 18:59:07 +0000 (10:59 -0800)
CI occasionally reports failures in the
percpu_alloc/cpu_flag_lru_percpu_hash selftest, for example:

 First test_progs failure (test_progs_no_alu32-x86_64-llvm-21):
 #264/15 percpu_alloc/cpu_flag_lru_percpu_hash
 ...
 test_percpu_map_op_cpu_flag:FAIL:bpf_map_lookup_batch value on specified cpu unexpected bpf_map_lookup_batch value on specified cpu: actual 0 != expected 3735929054

The unexpected value indicates that an element was removed from the map.
However, the test never calls delete_elem(), so the only possible cause
is LRU eviction.

This can happen when the current task migrates to another CPU: an
update_elem() triggers eviction because there is no available LRU node
on local freelist and global freelist.

Harden the test against this behavior by provisioning sufficient spare
elements. Set max_entries to 'nr_cpus * 2' and restrict the test to using
the first nr_cpus entries, ensuring that updates do not spuriously trigger
LRU eviction.

Signed-off-by: Leon Hwang <leon.hwang@linux.dev>
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Link: https://patch.msgid.link/20260119133417.19739-1-leon.hwang@linux.dev
tools/testing/selftests/bpf/prog_tests/percpu_alloc.c

index c1d0949f093f5fd05cd30ffe28ac0d1643fc2020..a72ae0b29f6e961c1fb802aff94717ca9edd26ec 100644 (file)
@@ -236,6 +236,8 @@ static void test_percpu_map_op_cpu_flag(struct bpf_map *map, void *keys, size_t
                err = bpf_map_update_batch(map_fd, keys, values, &count, &batch_opts);
                if (!ASSERT_OK(err, "bpf_map_update_batch all_cpus"))
                        goto out;
+               if (!ASSERT_EQ(count, entries, "bpf_map_update_batch count"))
+                       goto out;
 
                /* update values on specified CPU */
                for (i = 0; i < entries; i++)
@@ -246,6 +248,8 @@ static void test_percpu_map_op_cpu_flag(struct bpf_map *map, void *keys, size_t
                err = bpf_map_update_batch(map_fd, keys, values, &count, &batch_opts);
                if (!ASSERT_OK(err, "bpf_map_update_batch specified cpu"))
                        goto out;
+               if (!ASSERT_EQ(count, entries, "bpf_map_update_batch count"))
+                       goto out;
 
                /* lookup values on specified CPU */
                batch = 0;
@@ -254,6 +258,8 @@ static void test_percpu_map_op_cpu_flag(struct bpf_map *map, void *keys, size_t
                err = bpf_map_lookup_batch(map_fd, NULL, &batch, keys, values, &count, &batch_opts);
                if (!ASSERT_TRUE(!err || err == -ENOENT, "bpf_map_lookup_batch specified cpu"))
                        goto out;
+               if (!ASSERT_EQ(count, entries, "bpf_map_lookup_batch count"))
+                       goto out;
 
                for (i = 0; i < entries; i++)
                        if (!ASSERT_EQ(values[i], value,
@@ -269,6 +275,8 @@ static void test_percpu_map_op_cpu_flag(struct bpf_map *map, void *keys, size_t
                                           &batch_opts);
                if (!ASSERT_TRUE(!err || err == -ENOENT, "bpf_map_lookup_batch all_cpus"))
                        goto out;
+               if (!ASSERT_EQ(count, entries, "bpf_map_lookup_batch count"))
+                       goto out;
 
                for (i = 0; i < entries; i++) {
                        values_row = (void *) values_percpu +
@@ -287,7 +295,6 @@ out:
        free(values);
 }
 
-
 static void test_percpu_map_cpu_flag(enum bpf_map_type map_type)
 {
        struct percpu_alloc_array *skel;
@@ -300,7 +307,7 @@ static void test_percpu_map_cpu_flag(enum bpf_map_type map_type)
        if (!ASSERT_GT(nr_cpus, 0, "libbpf_num_possible_cpus"))
                return;
 
-       max_entries = nr_cpus + 1;
+       max_entries = nr_cpus * 2;
        keys = calloc(max_entries, key_sz);
        if (!ASSERT_OK_PTR(keys, "calloc keys"))
                return;
@@ -322,7 +329,7 @@ static void test_percpu_map_cpu_flag(enum bpf_map_type map_type)
        if (!ASSERT_OK(err, "test_percpu_alloc__load"))
                goto out;
 
-       test_percpu_map_op_cpu_flag(map, keys, key_sz, max_entries - 1, nr_cpus, true);
+       test_percpu_map_op_cpu_flag(map, keys, key_sz, nr_cpus, nr_cpus, true);
 out:
        percpu_alloc_array__destroy(skel);
        free(keys);