| Message ID | 20240322133552.70681-1-puranjay12@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fa3550dca8f02ec312727653a94115ef3ab68445 |
| Headers | show |
| Series | [bpf] selftests/bpf: verifier_arena: fix mmap address for arm64 | expand |
Hello: This patch was applied to bpf/bpf.git (master) by Alexei Starovoitov <ast@kernel.org>: On Fri, 22 Mar 2024 13:35:52 +0000 you wrote: > The arena_list selftest uses (1ull << 32) in the mmap address > computation for arm64. Use the same in the verifier_arena selftest. > > This makes the selftest pass for arm64 on the CI[1]. > > [1] https://github.com/kernel-patches/bpf/pull/6622 > > [...] Here is the summary with links: - [bpf] selftests/bpf: verifier_arena: fix mmap address for arm64 https://git.kernel.org/bpf/bpf/c/fa3550dca8f0 You are awesome, thank you!
diff --git a/tools/testing/selftests/bpf/progs/verifier_arena.c b/tools/testing/selftests/bpf/progs/verifier_arena.c index 5540b05ff9ee..91818a84e86d 100644 --- a/tools/testing/selftests/bpf/progs/verifier_arena.c +++ b/tools/testing/selftests/bpf/progs/verifier_arena.c @@ -12,7 +12,11 @@ struct { __uint(type, BPF_MAP_TYPE_ARENA); __uint(map_flags, BPF_F_MMAPABLE); __uint(max_entries, 2); /* arena of two pages close to 32-bit boundary*/ - __ulong(map_extra, (1ull << 44) | (~0u - __PAGE_SIZE * 2 + 1)); /* start of mmap() region */ +#ifdef __TARGET_ARCH_arm64 + __ulong(map_extra, (1ull << 32) | (~0u - __PAGE_SIZE * 2 + 1)); /* start of mmap() region */ +#else + __ulong(map_extra, (1ull << 44) | (~0u - __PAGE_SIZE * 2 + 1)); /* start of mmap() region */ +#endif } arena SEC(".maps"); SEC("syscall")
The arena_list selftest uses (1ull << 32) in the mmap address computation for arm64. Use the same in the verifier_arena selftest. This makes the selftest pass for arm64 on the CI[1]. [1] https://github.com/kernel-patches/bpf/pull/6622 Signed-off-by: Puranjay Mohan <puranjay12@gmail.com> --- tools/testing/selftests/bpf/progs/verifier_arena.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)