selftests/bpf: Improve percpu_alloc test robustness

Make these non-serial tests filter BPF programs by intended PID of
a test runner process. This makes it isolated from other parallel tests
that might interfere accidentally.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Acked-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/bpf/20231011223728.3188086-2-andrii@kernel.org

diff --git a/tools/testing/selftests/bpf/prog_tests/percpu_alloc.c b/tools/testing/selftests/bpf/prog_tests/percpu_alloc.c
index 9541e9b3a0346e0a5fae29b15eebc8c6764bd471..343da65864d6d1987cb3f887445e43e883a9f459 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/percpu_alloc.c
+++ b/tools/testing/selftests/bpf/prog_tests/percpu_alloc.c
@@ -19,6 +19,7 @@ static void test_array(void)
        bpf_program__set_autoload(skel->progs.test_array_map_3, true);
        bpf_program__set_autoload(skel->progs.test_array_map_4, true);
 
+       skel->bss->my_pid = getpid();
        skel->rodata->nr_cpus = libbpf_num_possible_cpus();
 
        err = percpu_alloc_array__load(skel);
@@ -51,6 +52,7 @@ static void test_array_sleepable(void)
 
        bpf_program__set_autoload(skel->progs.test_array_map_10, true);
 
+       skel->bss->my_pid = getpid();
        skel->rodata->nr_cpus = libbpf_num_possible_cpus();
 
        err = percpu_alloc_array__load(skel);
@@ -85,6 +87,7 @@ static void test_cgrp_local_storage(void)
        if (!ASSERT_OK_PTR(skel, "percpu_alloc_cgrp_local_storage__open"))
                goto close_fd;
 
+       skel->bss->my_pid = getpid();
        skel->rodata->nr_cpus = libbpf_num_possible_cpus();
 
        err = percpu_alloc_cgrp_local_storage__load(skel);

diff --git a/tools/testing/selftests/bpf/progs/percpu_alloc_array.c b/tools/testing/selftests/bpf/progs/percpu_alloc_array.c
index bbc45346e00666540e4ade2a1ed59064b3487dc6..37c2d2608ec0b72eb1ea456e2b1dc594c873ccfe 100644 (file)
--- a/tools/testing/selftests/bpf/progs/percpu_alloc_array.c
+++ b/tools/testing/selftests/bpf/progs/percpu_alloc_array.c
@@ -71,6 +71,7 @@ int BPF_PROG(test_array_map_2)
 }
 
 int cpu0_field_d, sum_field_c;
+int my_pid;
 
 /* Summarize percpu data */
 SEC("?fentry/bpf_fentry_test3")
@@ -81,6 +82,9 @@ int BPF_PROG(test_array_map_3)
        struct val_t *v;
        struct elem *e;
 
+       if ((bpf_get_current_pid_tgid() >> 32) != my_pid)
+               return 0;
+
        e = bpf_map_lookup_elem(&array, &index);
        if (!e)
                return 0;
@@ -130,6 +134,9 @@ int BPF_PROG(test_array_map_10)
        struct val_t *v;
        struct elem *e;
 
+       if ((bpf_get_current_pid_tgid() >> 32) != my_pid)
+               return 0;
+
        e = bpf_map_lookup_elem(&array, &index);
        if (!e)
                return 0;

diff --git a/tools/testing/selftests/bpf/progs/percpu_alloc_cgrp_local_storage.c b/tools/testing/selftests/bpf/progs/percpu_alloc_cgrp_local_storage.c
index 1c36a241852cd2a096c7a10aa5213e98b6db71ee..a2acf9aa6c249fc67d9842e9159b30d3671602d7 100644 (file)
--- a/tools/testing/selftests/bpf/progs/percpu_alloc_cgrp_local_storage.c
+++ b/tools/testing/selftests/bpf/progs/percpu_alloc_cgrp_local_storage.c
@@ -70,6 +70,7 @@ int BPF_PROG(test_cgrp_local_storage_2)
 }
 
 int cpu0_field_d, sum_field_c;
+int my_pid;
 
 /* Summarize percpu data collection */
 SEC("fentry/bpf_fentry_test3")
@@ -81,6 +82,9 @@ int BPF_PROG(test_cgrp_local_storage_3)
        struct elem *e;
        int i;
 
+       if ((bpf_get_current_pid_tgid() >> 32) != my_pid)
+               return 0;
+
        task = bpf_get_current_task_btf();
        e = bpf_cgrp_storage_get(&cgrp, task->cgroups->dfl_cgrp, 0, 0);
        if (!e)