selftests/bpf: Fix arena_spin_lock selftest failure
Subsystems (3)
PATCH v3 1/1 selftests/bpf: Fix arena_spin_lock selftest failure
For systems having CONFIG_NR_CPUS set to > 1024 in kernel config the selftest fails as arena_spin_lock_irqsave() returns EOPNOTSUPP. (eg - incase of powerpc default value for CONFIG_NR_CPUS is 8192)
The selftest is skipped incase bpf program returns EOPNOTSUPP, with a descriptive message logged.
---
Changes since v2:
* Separated arena_spin_lock selftest fix patch from the arena patchset as it has to go via bpf-next tree.
* For EOPNOTSUPP set test_skip to 3, to differentiate it from scenarios when run conditions are not met as suggested by Hari.
* Tweaked message displayed on SKIP to remove display of online cpus.
v2:https://lore.kernel.org/all/[email protected]/
Changes since v1:
Addressed comments from Alexei:
* Removed skel->rodata->nr_cpus = get_nprocs() and its usage to get currently online cpus(as it needs to be updated from userspace).
v1:https://lore.kernel.org/all/[email protected]/
--- .../selftests/bpf/prog_tests/arena_spin_lock.c | 13 +++++++++++++ tools/testing/selftests/bpf/progs/arena_spin_lock.c | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/arena_spin_lock.c +13 -0
@@ -40,8 +40,13 @@ static void *spin_lock_thread(void *arg) err =bpf_prog_test_run_opts (prog_fd, &topts);ASSERT_OK (err,"test_run err" ); + +if (topts.retval == -EOPNOTSUPP ) + goto end; +ASSERT_EQ ((int )topts.retval,0 ,"test_run retval" ); +end:pthread_exit (arg); }
@@ -63,6 +68,7 @@ static void test_arena_spin_lock_size(int size) skel =arena_spin_lock__open_and_load ();if (!ASSERT_OK_PTR (skel,"arena_spin_lock__open_and_load" ))return ; +if (skel->data->test_skip ==2 ) {test__skip (); goto end;
@@ -86,6 +92,13 @@ static void test_arena_spin_lock_size(int size) goto end_barrier; } +if (skel->data->test_skip ==3 ) { +printf ("%s:SKIP: CONFIG_NR_CPUS exceed the maximum supported by arena spinlock\n" , + __func__); +test__skip (); + goto end_barrier; + } +ASSERT_EQ (skel->bss->counter, repeat * nthreads,"check counter value" ); end_barrier:
tools/testing/selftests/bpf/progs/arena_spin_lock.c +4 -1
@@ -37,8 +37,11 @@ int prog(void *ctx)#if defined(ENABLE_ATOMICS_TESTS ) && defined(__BPF_FEATURE_ADDR_SPACE_CAST)unsigned long flags; -if ((ret =arena_spin_lock_irqsave (&lock, flags))) +if ((ret =arena_spin_lock_irqsave (&lock, flags))) { +if (ret == -EOPNOTSUPP ) + test_skip =3 ;return ret; + }if (counter != limit) counter++;bpf_repeat (cs_count);
Signature · 1 line
2.43.5
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 8 lines · On Sat, 13 Sep 2025 14:43:37 +0530 you wrote:
For systems having
CONFIG_NR_CPUSset to > 1024 in kernel config the selftest fails asarena_spin_lock_irqsave()returns EOPNOTSUPP. (eg - incase of powerpc default value forCONFIG_NR_CPUSis 8192)The selftest is skipped incase bpf program returns EOPNOTSUPP, with a descriptive message logged.
[...]
Here is the summary with links:
- [v3,bpf-next] selftests/bpf: Fix arena_spin_lock selftest failure
https://git.kernel.org/bpf/bpf-next/c/a9d4e9f0e871
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html