mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-23 10:57:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

selftests/bpf: Rename libarena malloc/free methods

Browse Source 
The s390 architecture uses the token "free" for an enum, conflicting
with the malloc/free definitions. Rename the calls to arena_malloc and
arena_free instead to prevent collisions.

Reported-by: Ihor Solodrai <ihor.solodrai@linux.dev>
Signed-off-by: Emil Tsalapatis <etsal@meta.com>
Fixes: 86426a28c5 ("selftests/bpf: Add buddy allocator for libarena")
Acked-by: Ihor Solodrai <ihor.solodrai@linux.dev>
Link: https://lore.kernel.org/r/20260428134252.2783519-1-etsal@meta.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Emil Tsalapatis
2026-04-28 06:42:52 -07:00
committed by Alexei Starovoitov
parent cfeddb4244
commit 9f5b3ffc3f
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/testing/selftests/bpf/libarena/Makefile
View File

@@ -51,8 +51,6 @@ ASAN_FLAGS += -mllvm -asan-destructor-kind=none
override BPF_CFLAGS += -DENABLE_ATOMICS_TESTS
override BPF_CFLAGS += -O2 -g
override BPF_CFLAGS += -Wno-incompatible-pointer-types-discards-qualifiers
# Required to define our own arena-based free()
override BPF_CFLAGS += -Wno-incompatible-library-redeclaration
# Required for suppressing harmless vmlinux.h-related warnings.
override BPF_CFLAGS += -Wno-missing-declarations
override BPF_CFLAGS += $(INCLUDES)

6
tools/testing/selftests/bpf/libarena/include/libarena/common.h
View File

@@ -48,9 +48,9 @@ extern volatile u64 asan_violated;
int arena_fls(__u64 word);
u64 malloc_internal(size_t size);
#define malloc(size) ((void __arena *)malloc_internal((size)))
void free(void __arena *ptr);
u64 arena_malloc_internal(size_t size);
#define arena_malloc(size) ((void __arena *)arena_malloc_internal((size)))
void arena_free(void __arena *ptr);
/*
* The verifier associates arenas with programs by checking LD.IMM

4
tools/testing/selftests/bpf/libarena/src/common.bpf.c
View File

@@ -38,12 +38,12 @@ __weak int arena_buddy_reset(void)
return buddy_init(&buddy);
}
__weak u64 malloc_internal(size_t size)
__weak u64 arena_malloc_internal(size_t size)
{
return buddy_alloc_internal(&buddy, size);
}
__weak void free(void __arg_arena __arena *ptr)
__weak void arena_free(void __arg_arena __arena *ptr)
{
buddy_free_internal(&buddy, (u64)ptr);
}