From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f179.google.com (mail-dy1-f179.google.com [74.125.82.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5C033DC4D6 for ; Fri, 10 Apr 2026 16:31:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775838667; cv=none; b=LrBHiSO+U/ITbOjDfo9+v4SIFE1hLldcqwhVAxf46yI8u1VZ0JCyb9BxML4O6byIlFCZvSXeRr4H09UA/8ftFyywpqX+NV1oVanYzaw6gbYEX9PVp9p2pgiOqAs2yP2/x8ei8cRJxeT4MCDMa5/FvCyOLEUGN/Yip0/Sky0rGPs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775838667; c=relaxed/simple; bh=fgejiT7JJzRSoIL8p0LnzScsdkZy5NN2Nl5G7QUSmYA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K4gYfx9ExhOGztwO5WACxUjeyxwSpRfXM2QcC2z1F/DBB/sibbOx03FdTVoXnLUED8Pn6gcGMAYL/WsWHK4NBRq34FaqjBUDBcmlON6PEVQjoo8NrB0Fu6lD5VlvJtTh4zriW+W5aB+yySrxMGqSQXg8B/u6RJxcRijkd/7e7zs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=etsalapatis.com; spf=pass smtp.mailfrom=etsalapatis.com; dkim=pass (2048-bit key) header.d=etsalapatis-com.20251104.gappssmtp.com header.i=@etsalapatis-com.20251104.gappssmtp.com header.b=pZD3tujU; arc=none smtp.client-ip=74.125.82.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=etsalapatis.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=etsalapatis.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=etsalapatis-com.20251104.gappssmtp.com header.i=@etsalapatis-com.20251104.gappssmtp.com header.b="pZD3tujU" Received: by mail-dy1-f179.google.com with SMTP id 5a478bee46e88-2c156c4a9efso3223658eec.1 for ; Fri, 10 Apr 2026 09:31:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=etsalapatis-com.20251104.gappssmtp.com; s=20251104; t=1775838665; x=1776443465; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UbMj9btLNpOJbFrPNUkqKKYH24UETKRLqur+9/WwGcU=; b=pZD3tujU5uoM1hwTLQ11Vy4qZMKnRslmy2agbGCjiGao9M6zeBmLxWHm97OsN3W1Y9 lggxtIBVRyJYYcW/aCK5DMd3leQ6wn9x02sHdMHdm8647/0c4i9vKmUu/gCxQDUEnlNG ahJfOcpsLN60+dBLFUr5NOeVoQGvvCOeyvOpvxlhqhPbrIuW948RYByk5btKxk0LRAJz qYaWdXAjoKwmOwhO6g22BEE+deBJiCYA75B1gfjtp24fEmL6bo8Fcw2PpHppurobk5fC M9GcUFd+4kfz3DPDXe0uZQ+cRLM3TsYcDNVQQ/yrqk5TJVZQ7+UKPee8zEyJJrMs+xhA zqyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775838665; x=1776443465; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UbMj9btLNpOJbFrPNUkqKKYH24UETKRLqur+9/WwGcU=; b=b/fhSqJCCaIUfCaAPN+jr+y3/iIlNl5HIl+iy+T3XykDnOICwT6Ks+jei+Vs5m4kAe kzVfsJDsGipymtuCEbfWYjkYhaeJl+RhrBPVrDZHaQaNtqEByVX2D4CMZ68R8ESSH4e/ EzPPGtK5+5PRwe4MlE6frcJJT2aNstj260FdZ32jxrr5MSjENRcOOhO4Smle7Bn31Zx6 q35gvH3VZDtwUKCBfiHU6MCvd8j2p/7dArmGPxoRrbKFnpdhCHE1+HJSBuxIx2XgGD2f Vl/jc+SvUem4vDqUrrwU+D5qX6qIsZZxCK9uzQKs2mb5EZUk0KTcZTnn6WlTZn10dStL BZtw== X-Gm-Message-State: AOJu0YzhBrzLzuzw9R8/oJRLTViP+1zD0PrRLE+KfPv0hDZfatdfyS7A wO5aLJsz6QwJeCtQsLI5AzbWIDq2ih2u4MuSO4UJTUGbhXqVPcTFINdRex1sCDkvA357GfliQVB yVqSQIT0= X-Gm-Gg: AeBDieuPLBXpbBNjuPv9J2SdKEV4IJgy1Z2tlGTUMgI/hCJT+7nUzwCwpGPeu291ZTj m9zdUwg5abpFzJaU6ozxuczZgywPaBxQj6dpZBl1T/cIKkjAD/A+S/9sKuM+Q1jz8GjkbeJCQI+ M0+0W9mRkebPfQ4fRuFIfxf77dDO7pb5HrKDxswIcb1EQoI/td8+YHHHYESP3nE+JD+y/B9k7I7 8SYgWKuBBfI9k+qsvF6tjepjvfOUpM4pTendXb4Z5PDcfLy3f8SYdVl2xGW5/+DJ2mVCx1xaXJ+ KTOC+PBdan5fZ7NehZJRhmSzeX8VxS1CyuC6YEfgC7WOO3H41MeGPoh6e4H+bl/48hh9SLcdEaf kuWJP2+VQMfQ2WjnKtYDS5uovFbwCOapgrAq7aqifoCeSkzuPtkVyQ4KWlg97dyPVyw/9Ax0MkY T5BiklxmZ8DCnyOI4pUQA= X-Received: by 2002:a05:7300:a194:b0:2c4:b8d6:45cf with SMTP id 5a478bee46e88-2d5876a4970mr2334917eec.9.1775838664537; Fri, 10 Apr 2026 09:31:04 -0700 (PDT) Received: from krios.corp.tfbnw.net ([2620:10d:c090:600::6eaf]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2d55f5c69d5sm5642619eec.3.2026.04.10.09.31.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2026 09:31:04 -0700 (PDT) From: Emil Tsalapatis To: bpf@vger.kernel.org Cc: ast@kernel.org, andrii@kernel.org, memxor@gmail.com, daniel@iogearbox.net, eddyz87@gmail.com, song@kernel.org, Emil Tsalapatis Subject: [PATCH bpf-next v5 5/9] selftests/bpf: Add basic libarena scaffolding Date: Fri, 10 Apr 2026 12:30:37 -0400 Message-ID: <20260410163041.8063-6-emil@etsalapatis.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260410163041.8063-1-emil@etsalapatis.com> References: <20260410163041.8063-1-emil@etsalapatis.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add initial code for an arena-based BPF library. The current commit introduces a test runner and Makefile for the library. Library code can be added just by including the source file in the library's src/ subdirectory. Future commits will introduce the library code itself. The current commit also includes a standalone test runner. This is to keep libarena self-contained and testable even when copied out of the kernel tree. Subsequent commits add integration with test_progs. Signed-off-by: Emil Tsalapatis --- tools/testing/selftests/bpf/.gitignore | 1 + tools/testing/selftests/bpf/Makefile | 15 ++ tools/testing/selftests/bpf/libarena/Makefile | 50 ++++++ .../selftests/bpf/libarena/include/common.h | 67 +++++++++ .../bpf/libarena/include/selftest_helpers.h | 86 +++++++++++ .../bpf/libarena/selftests/selftest.c | 142 ++++++++++++++++++ .../selftests/bpf/libarena/src/common.bpf.c | 59 ++++++++ 7 files changed, 420 insertions(+) create mode 100644 tools/testing/selftests/bpf/libarena/Makefile create mode 100644 tools/testing/selftests/bpf/libarena/include/common.h create mode 100644 tools/testing/selftests/bpf/libarena/include/selftest_helpers.h create mode 100644 tools/testing/selftests/bpf/libarena/selftests/selftest.c create mode 100644 tools/testing/selftests/bpf/libarena/src/common.bpf.c diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore index bfdc5518ecc8..7f1960d6b59e 100644 --- a/tools/testing/selftests/bpf/.gitignore +++ b/tools/testing/selftests/bpf/.gitignore @@ -49,3 +49,4 @@ verification_cert.h *.BTF.base usdt_1 usdt_2 +libarena/test_libarena diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index f75c4f52c028..0d332c991023 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -153,6 +153,7 @@ override define CLEAN $(Q)$(RM) -r $(TEST_KMODS) $(Q)$(RM) -r $(EXTRA_CLEAN) $(Q)$(MAKE) -C test_kmods clean + $(Q)$(MAKE) -C libarena clean $(Q)$(MAKE) docs-clean endef @@ -739,6 +740,17 @@ $(VERIFY_SIG_HDR): $(VERIFICATION_CERT) echo "};"; \ echo "unsigned int test_progs_verification_cert_len = $$(wc -c < $<);") > $@ +LIBARENA_MAKE_ARGS = \ + BPFTOOL="$(BPFTOOL)" \ + INCLUDE_DIR="$(HOST_INCLUDE_DIR)" \ + LIBBPF_INCLUDE="$(HOST_INCLUDE_DIR)" \ + BPFOBJ="$(BPFOBJ)" \ + LDLIBS="$(LDLIBS) -lzstd" \ + CLANG="$(CLANG)" \ + BPF_CFLAGS="$(BPF_CFLAGS) $(CLANG_CFLAGS)" \ + BPF_TARGET_ENDIAN="$(BPF_TARGET_ENDIAN)" \ + Q="$(Q)" + # Define test_progs test runner. TRUNNER_TESTS_DIR := prog_tests TRUNNER_BPF_PROGS_DIR := progs @@ -931,3 +943,6 @@ override define INSTALL_RULE rsync -a $(OUTPUT)/$$DIR/*.bpf.o $(INSTALL_PATH)/$$DIR;\ done endef + +test_libarena: $(INCLUDE_DIR)/vmlinux.h $(BPFOBJ) + +$(MAKE) -C libarena $@ $(LIBARENA_MAKE_ARGS) diff --git a/tools/testing/selftests/bpf/libarena/Makefile b/tools/testing/selftests/bpf/libarena/Makefile new file mode 100644 index 000000000000..151ab6d0509c --- /dev/null +++ b/tools/testing/selftests/bpf/libarena/Makefile @@ -0,0 +1,50 @@ +# SPDX-License-Identifier: LGPL-2.1 OR BSD-2-Clause +# Copyright (c) 2026 Meta Platforms, Inc. and affiliates. + +.PHONY: clean + +LIBARENA=$(abspath .) + + +LIBARENA_SOURCES = $(wildcard $(LIBARENA)/src/*.bpf.c) $(wildcard $(LIBARENA)/selftests/*.bpf.c) +LIBARENA_OBJECTS = $(notdir $(LIBARENA_SOURCES:.bpf.c=.bpf.o)) + +INCLUDES = -I$(LIBARENA)/include -I$(LIBARENA)/.. +ifneq ($(INCLUDE_DIR),) +INCLUDES += -I$(INCLUDE_DIR) +endif +ifneq ($(LIBBPF_INCLUDE),) +INCLUDES += -I$(LIBBPF_INCLUDE) +endif + +# ENABLE_ATOMICS_TESTS required because we use arena spinlocks +override BPF_CFLAGS += -DENABLE_ATOMICS_TESTS +override BPF_CFLAGS += -O2 -Wno-incompatible-pointer-types-discards-qualifiers +override BPF_CFLAGS += $(INCLUDES) + +CFLAGS = -O2 -no-pie +CFLAGS += $(INCLUDES) + +vpath %.bpf.c $(LIBARENA)/src $(LIBARENA)/selftests +vpath %.c $(LIBARENA)/src $(LIBARENA)/selftests + +all: test_libarena + +test_libarena: selftest.c $(BPFOBJ) libarena.skel.h + $(call msg,BINARY,libarena,$@) + $(Q)$(CLANG) $(CFLAGS) $< $(BPFOBJ) $(LDLIBS) -o $@ + +libarena.skel.h: main.bpf.o + $(call msg,GEN-SKEL,libarena,$@) + $(Q)$(BPFTOOL) gen skeleton $< name "libarena" > $@ + +main.bpf.o: $(LIBARENA_OBJECTS) + $(call msg,GEN-OBJ,libarena,$@) + $(Q)$(BPFTOOL) gen object $@ $^ + +%.bpf.o: %.bpf.c + $(call msg,CLNG-BPF,libarena,$@) + $(Q)$(CLANG) $(BPF_CFLAGS) $(BPF_TARGET_ENDIAN) -c $< -o $@ + +clean: + $(Q)rm -f *.skel.h *.bpf.o test_libarena diff --git a/tools/testing/selftests/bpf/libarena/include/common.h b/tools/testing/selftests/bpf/libarena/include/common.h new file mode 100644 index 000000000000..5acf9b994943 --- /dev/null +++ b/tools/testing/selftests/bpf/libarena/include/common.h @@ -0,0 +1,67 @@ +// SPDX-License-Identifier: LGPL-2.1 OR BSD-2-Clause +/* Copyright (c) 2026 Meta Platforms, Inc. and affiliates. */ +#pragma once + +#ifdef __BPF__ + +#include + +#include "bpf_experimental.h" +#include "bpf_arena_common.h" +#include "bpf_arena_spin_lock.h" + +#include + +#ifndef __BPF_FEATURE_ADDR_SPACE_CAST +#error "Arena allocators require bpf_addr_space_cast feature" +#endif + +#define arena_stdout(fmt, ...) bpf_stream_printk(1, (fmt), ##__VA_ARGS__) +#define arena_stderr(fmt, ...) bpf_stream_printk(2, (fmt), ##__VA_ARGS__) + +#ifndef __maybe_unused +#define __maybe_unused __attribute__((__unused__)) +#endif + +#define private(name) SEC(".data." #name) __hidden __attribute__((aligned(8))) + +#define ARENA_PAGES (1UL << (32 - __builtin_ffs(__PAGE_SIZE) + 1)) + +struct { + __uint(type, BPF_MAP_TYPE_ARENA); + __uint(map_flags, BPF_F_MMAPABLE); + __uint(max_entries, ARENA_PAGES); /* number of pages */ +#if defined(__TARGET_ARCH_arm64) || defined(__aarch64__) + __ulong(map_extra, (1ull << 32)); /* start of mmap() region */ +#else + __ulong(map_extra, (1ull << 44)); /* start of mmap() region */ +#endif +} arena __weak SEC(".maps"); + +extern const volatile u32 zero; + +int arena_fls(__u64 word); + +#else /* ! __BPF__ */ + +#include + +#define __arena + +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint32_t u32; +typedef uint64_t u64; +typedef int8_t s8; +typedef int16_t s16; +typedef int32_t s32; +typedef int64_t s64; + +/* Dummy "definition" for userspace. */ +#define arena_spinlock_t int + +#endif /* __BPF__ */ + +struct arena_get_base_args { + void __arena *arena_base; +}; diff --git a/tools/testing/selftests/bpf/libarena/include/selftest_helpers.h b/tools/testing/selftests/bpf/libarena/include/selftest_helpers.h new file mode 100644 index 000000000000..78db8bc0fc67 --- /dev/null +++ b/tools/testing/selftests/bpf/libarena/include/selftest_helpers.h @@ -0,0 +1,86 @@ +// SPDX-License-Identifier: LGPL-2.1 OR BSD-2-Clause +/* Copyright (c) 2026 Meta Platforms, Inc. and affiliates. */ +#pragma once + +#include +#include +#include +#include + +#include +#include + +static inline int libarena_run_prog(int prog_fd) +{ + LIBBPF_OPTS(bpf_test_run_opts, opts); + int ret; + + ret = bpf_prog_test_run_opts(prog_fd, &opts); + if (ret) + return ret; + + return opts.retval; +} + +static inline bool libarena_is_test_prog(const char *name) +{ + return strstr(name, "test_") != NULL; +} + +static inline int libarena_get_arena_base(int arena_get_base_fd, + void **arena_base) +{ + LIBBPF_OPTS(bpf_test_run_opts, opts); + struct arena_get_base_args args = { .arena_base = NULL }; + int ret; + + opts.ctx_in = &args; + opts.ctx_size_in = sizeof(args); + + ret = bpf_prog_test_run_opts(arena_get_base_fd, &opts); + if (ret) + return ret; + if (opts.retval) + return opts.retval; + + *arena_base = args.arena_base; + return 0; +} + +static inline int libarena_get_globals_pages(int arena_get_base_fd, + size_t arena_all_pages, + u64 *globals_pages) +{ + size_t pgsize = sysconf(_SC_PAGESIZE); + void *arena_base; + ssize_t i; + u8 *vec; + int ret; + + ret = libarena_get_arena_base(arena_get_base_fd, &arena_base); + if (ret) + return ret; + + if (!arena_base) + return -EINVAL; + + vec = calloc(arena_all_pages, sizeof(*vec)); + if (!vec) + return -ENOMEM; + + if (mincore(arena_base, arena_all_pages * pgsize, vec) < 0) { + ret = -errno; + free(vec); + return ret; + } + + *globals_pages = 0; + for (i = arena_all_pages - 1; i >= 0; i--) { + if (!(vec[i] & 0x1)) + break; + *globals_pages += 1; + } + + free(vec); + return 0; +} diff --git a/tools/testing/selftests/bpf/libarena/selftests/selftest.c b/tools/testing/selftests/bpf/libarena/selftests/selftest.c new file mode 100644 index 000000000000..da70648968d4 --- /dev/null +++ b/tools/testing/selftests/bpf/libarena/selftests/selftest.c @@ -0,0 +1,142 @@ +// SPDX-License-Identifier: LGPL-2.1 OR BSD-2-Clause +/* Copyright (c) 2026 Meta Platforms, Inc. and affiliates. */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +#include +#include + +#include "../libarena.skel.h" +typedef struct libarena selftest; +#define selftest__open libarena__open +#define selftest__open_and_load libarena__open_and_load +#define selftest__load libarena__load +#define selftest__attach libarena__attach +#define selftest__destroy libarena__destroy + +static bool verbose; +static int testno = 1; + +static int +run_prog_verbose(int prog_fd) +{ + char buf[1024]; + int ret, err; + + ret = libarena_run_prog(prog_fd); + + if (ret) + fprintf(stderr, "error %d in %s\n", ret, __func__); + + if (verbose) { + printf("BPF stdout:\n"); + while ((err = bpf_prog_stream_read(prog_fd, 1, buf, 1024, NULL)) > 0) + printf("%.*s", err, buf); + + if (err) + return err; + + printf("BPF stderr:\n"); + while ((err = bpf_prog_stream_read(prog_fd, 2, buf, 1024, NULL)) > 0) + printf("%.*s", err, buf); + + if (err) + return err; + } + + return ret; +} + +static int libbpf_print_fn(enum libbpf_print_level level, + const char *format, va_list args) +{ + if (level == LIBBPF_DEBUG) + return 0; + return vfprintf(stderr, format, args); +} + +static int run_test(selftest *skel, struct bpf_program *prog) +{ + int prog_fd; + + prog_fd = bpf_program__fd(prog); + if (prog_fd < 0) + return prog_fd; + + return run_prog_verbose(prog_fd); +} + +static void +banner(const char *progpath) +{ + char *name = basename(progpath); + + printf("%s\n", name); + + printf("=== %s ===\n", "libarena selftests"); +} + +int main(int argc, char *argv[]) +{ + struct bpf_program *prog; + selftest *skel; + int ret; + + banner(argv[0]); + + for (int i = 1; i < argc; i++) { + if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--verbose") == 0) + verbose = true; + } + + libbpf_set_print(libbpf_print_fn); + + skel = selftest__open_and_load(); + if (!skel) { + fprintf(stderr, "Failed to open and load skeleton\n"); + return 1; + } + + ret = selftest__attach(skel); + if (ret) { + fprintf(stderr, "Failed to attach skeleton\n"); + selftest__destroy(skel); + return 1; + } + + ret = libarena_run_prog(bpf_program__fd(skel->progs.arena_alloc_reserve)); + if (ret) { + fprintf(stderr, "Failed to initialize arena: %d\n", ret); + selftest__destroy(skel); + return 1; + } + + bpf_object__for_each_program(prog, skel->obj) { + const char *name = bpf_program__name(prog); + + if (!libarena_is_test_prog(name)) + continue; + + ret = run_test(skel, prog); + if (ret) + printf("not ok %d - %s\n", testno++, name); + else + printf("ok %d - %s\n", testno++, name); + } + + selftest__destroy(skel); + + return 0; +} diff --git a/tools/testing/selftests/bpf/libarena/src/common.bpf.c b/tools/testing/selftests/bpf/libarena/src/common.bpf.c new file mode 100644 index 000000000000..4f9e95aa6cd5 --- /dev/null +++ b/tools/testing/selftests/bpf/libarena/src/common.bpf.c @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: LGPL-2.1 OR BSD-2-Clause +/* Copyright (c) 2026 Meta Platforms, Inc. and affiliates. */ +#include + +const volatile u32 zero = 0; + +/* How many pages do we reserve at the beginning of the arena segment? */ +#define RESERVE_ALLOC (8) + +int arena_fls(__u64 word) +{ + unsigned int num = 0; + + if (word & 0xffffffff00000000ULL) { + num += 32; + word >>= 32; + } + + if (word & 0xffff0000) { + num += 16; + word >>= 16; + } + + if (word & 0xff00) { + num += 8; + word >>= 8; + } + + if (word & 0xf0) { + num += 4; + word >>= 4; + } + + if (word & 0xc) { + num += 2; + word >>= 2; + } + + if (word & 0x2) + num += 1; + + return num; +} + +SEC("syscall") +__weak int arena_get_base(struct arena_get_base_args *args) +{ + args->arena_base = arena_base(&arena); + + return 0; +} + +SEC("syscall") +__weak int arena_alloc_reserve(void) +{ + return bpf_arena_reserve_pages(&arena, NULL, RESERVE_ALLOC); +} + +char _license[] SEC("license") = "GPL"; -- 2.53.0