]> www.infradead.org Git - users/jedix/linux-maple.git/commit
bpf: Fix softlockup in arena_map_free on 64k page kernel
authorAlan Maguire <alan.maguire@oracle.com>
Wed, 5 Feb 2025 17:00:59 +0000 (17:00 +0000)
committerAlexei Starovoitov <ast@kernel.org>
Thu, 6 Feb 2025 11:41:08 +0000 (03:41 -0800)
commit517e8a7835e8cfb398a0aeb0133de50e31cae32b
tree9634a2dcf33cc4a4ce376d3748ad527df2c644dc
parent5da7e15fb5a12e78de974d8908f348e279922ce9
bpf: Fix softlockup in arena_map_free on 64k page kernel

On an aarch64 kernel with CONFIG_PAGE_SIZE_64KB=y,
arena_htab tests cause a segmentation fault and soft lockup.
The same failure is not observed with 4k pages on aarch64.

It turns out arena_map_free() is calling
apply_to_existing_page_range() with the address returned by
bpf_arena_get_kern_vm_start().  If this address is not page-aligned
the code ends up calling apply_to_pte_range() with that unaligned
address causing soft lockup.

Fix it by round up GUARD_SZ to PAGE_SIZE << 1 so that the
division by 2 in bpf_arena_get_kern_vm_start() returns
a page-aligned value.

Fixes: 317460317a02 ("bpf: Introduce bpf_arena.")
Reported-by: Colm Harrington <colm.harrington@oracle.com>
Suggested-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
Link: https://lore.kernel.org/r/20250205170059.427458-1-alan.maguire@oracle.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/arena.c