From nobody Thu Apr 2 18:59:43 2026 Received: from out-183.mta0.migadu.com (out-183.mta0.migadu.com [91.218.175.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1749036AB63 for ; Mon, 23 Feb 2026 19:08:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771873696; cv=none; b=aNrxIp/JoK4gTvKUGqfSoEgCiIBuo+dUccD151UWRheTO+/bVXyGuiXtIdoicwMrub1eDWEKBx6stYZq8jM+FI8hD9tRNyPoDB5nZd9JIlBN9/NgD7FnEqGrh4pe2N6axTM4s41APRhPNqN66STFDKNU9zLPWQRhctJgVvjmXY4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771873696; c=relaxed/simple; bh=HICa71eTyoGa2gtWWBPBm61GreXnEJiLwdqfTHeS+2U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W1/PCM+2W8SHwuOJ+s9flI7g2vUzm6Hj+Xx0CXMcfhn01zeqBa3hx41JhZr+UCMI7h5yDgh11GshJlqmKi7Ktxcny0aUuCWo0sbOPBKc+Q6vWzDDp4j8G4DWphmO3GwhYhRZ2RSllZI77l4gCBbeCGUPlHC7QbwpOXYS2f3kcFE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=G3SZga9U; arc=none smtp.client-ip=91.218.175.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="G3SZga9U" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1771873693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zSgXN6cPXd9AY0ySct74Vg374gm0gtf3x3gbJSUR/r4=; b=G3SZga9UAwTOY17LOGfI4gC3ONl9tztL7oNLVMxwOb3xU8uXQFyiRgUkWLZmJmwposvpqO ZxpUyZEcC9CkJ7zrNmQdrISHs9/R1dbgJteQ/L0sV+nZENNoICVy/6ASULo6OT7buu4bMh apnyS6HIqC920BShTQw8UH/pFOWwaJk= From: Ihor Solodrai To: Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Eduard Zingerman , Jiri Olsa , Mykyta Yatsenko , =?UTF-8?q?Alexis=20Lothor=C3=A9?= Cc: Amery Hung , bpf@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com Subject: [PATCH bpf v4 06/20] selftests/bpf: Pass through build flags to bpftool and resolve_btfids Date: Mon, 23 Feb 2026 11:07:22 -0800 Message-ID: <20260223190736.649171-7-ihor.solodrai@linux.dev> In-Reply-To: <20260223190736.649171-1-ihor.solodrai@linux.dev> References: <20260223190736.649171-1-ihor.solodrai@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" EXTRA_* and SAN_* build flags were not correctly propagated to bpftool and resolve_btids when building selftests/bpf. This led to various build errors on attempt to build with SAN_CFLAGS=3D"-fsanitize=3Daddress", for example. Fix the makefiles to address this: - Pass SAN_CFLAGS/SAN_LDFLAGS to bpftool and resolve_btfids build - Propagate EXTRA_LDFLAGS to resolve_btfids link command - Use pkg-config to detect zlib and zstd for resolve_btfids, similar libelf handling Also check for ASAN flag in selftests/bpf/Makefile for convenience. Signed-off-by: Ihor Solodrai --- tools/bpf/resolve_btfids/Makefile | 7 +++++-- tools/testing/selftests/bpf/Makefile | 13 +++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/M= akefile index 1733a6e93a07..ef083602b73a 100644 --- a/tools/bpf/resolve_btfids/Makefile +++ b/tools/bpf/resolve_btfids/Makefile @@ -65,6 +65,9 @@ $(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/= Makefile) | $(LIBBPF_OU LIBELF_FLAGS :=3D $(shell $(HOSTPKG_CONFIG) libelf --cflags 2>/dev/null) LIBELF_LIBS :=3D $(shell $(HOSTPKG_CONFIG) libelf --libs 2>/dev/null || e= cho -lelf) =20 +ZLIB_LIBS :=3D $(shell $(HOSTPKG_CONFIG) zlib --libs 2>/dev/null || echo = -lz) +ZSTD_LIBS :=3D $(shell $(HOSTPKG_CONFIG) libzstd --libs 2>/dev/null || ec= ho -lzstd) + HOSTCFLAGS_resolve_btfids +=3D -g \ -I$(srctree)/tools/include \ -I$(srctree)/tools/include/uapi \ @@ -73,7 +76,7 @@ HOSTCFLAGS_resolve_btfids +=3D -g \ $(LIBELF_FLAGS) \ -Wall -Werror =20 -LIBS =3D $(LIBELF_LIBS) -lz +LIBS =3D $(LIBELF_LIBS) $(ZLIB_LIBS) $(ZSTD_LIBS) =20 export srctree OUTPUT HOSTCFLAGS_resolve_btfids Q HOSTCC HOSTLD HOSTAR include $(srctree)/tools/build/Makefile.include @@ -83,7 +86,7 @@ $(BINARY_IN): fixdep FORCE prepare | $(OUTPUT) =20 $(BINARY): $(BPFOBJ) $(SUBCMDOBJ) $(BINARY_IN) $(call msg,LINK,$@) - $(Q)$(HOSTCC) $(BINARY_IN) $(KBUILD_HOSTLDFLAGS) -o $@ $(BPFOBJ) $(SUBCMD= OBJ) $(LIBS) + $(Q)$(HOSTCC) $(BINARY_IN) $(KBUILD_HOSTLDFLAGS) $(EXTRA_LDFLAGS) -o $@ $= (BPFOBJ) $(SUBCMDOBJ) $(LIBS) =20 clean_objects :=3D $(wildcard $(OUTPUT)/*.o \ $(OUTPUT)/.*.o.cmd \ diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests= /bpf/Makefile index 6776158f1f3e..72a9ba41f95e 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -27,7 +27,11 @@ ifneq ($(wildcard $(GENHDR)),) endif =20 BPF_GCC ?=3D $(shell command -v bpf-gcc;) +ifdef ASAN +SAN_CFLAGS ?=3D -fsanitize=3Daddress -fno-omit-frame-pointer +else SAN_CFLAGS ?=3D +endif SAN_LDFLAGS ?=3D $(SAN_CFLAGS) RELEASE ?=3D OPT_FLAGS ?=3D $(if $(RELEASE),-O2,-O0) @@ -326,8 +330,8 @@ $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(B= PFTOOLDIR)/Makefile) \ $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/bpftool $(Q)$(MAKE) $(submake_extras) -C $(BPFTOOLDIR) \ ARCH=3D CROSS_COMPILE=3D CC=3D"$(HOSTCC)" LD=3D"$(HOSTLD)" \ - EXTRA_CFLAGS=3D'-g $(OPT_FLAGS) $(EXTRA_CFLAGS)' \ - EXTRA_LDFLAGS=3D'$(EXTRA_LDFLAGS)' \ + EXTRA_CFLAGS=3D'-g $(OPT_FLAGS) $(SAN_CFLAGS) $(EXTRA_CFLAGS)' = \ + EXTRA_LDFLAGS=3D'$(SAN_LDFLAGS) $(EXTRA_LDFLAGS)' \ OUTPUT=3D$(HOST_BUILD_DIR)/bpftool/ \ LIBBPF_OUTPUT=3D$(HOST_BUILD_DIR)/libbpf/ \ LIBBPF_DESTDIR=3D$(HOST_SCRATCH_DIR)/ \ @@ -338,8 +342,8 @@ $(CROSS_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPF= TOOLDIR)/Makefile) \ $(BPFOBJ) | $(BUILD_DIR)/bpftool $(Q)$(MAKE) $(submake_extras) -C $(BPFTOOLDIR) \ ARCH=3D$(ARCH) CROSS_COMPILE=3D$(CROSS_COMPILE) \ - EXTRA_CFLAGS=3D'-g $(OPT_FLAGS) $(EXTRA_CFLAGS)' \ - EXTRA_LDFLAGS=3D'$(EXTRA_LDFLAGS)' \ + EXTRA_CFLAGS=3D'-g $(OPT_FLAGS) $(SAN_CFLAGS) $(EXTRA_CFLAGS)' = \ + EXTRA_LDFLAGS=3D'$(SAN_LDFLAGS) $(EXTRA_LDFLAGS)' \ OUTPUT=3D$(BUILD_DIR)/bpftool/ \ LIBBPF_OUTPUT=3D$(BUILD_DIR)/libbpf/ \ LIBBPF_DESTDIR=3D$(SCRATCH_DIR)/ \ @@ -404,6 +408,7 @@ $(RESOLVE_BTFIDS): $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/r= esolve_btfids \ $(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/resolve_btfids \ CC=3D"$(HOSTCC)" LD=3D"$(HOSTLD)" AR=3D"$(HOSTAR)" \ LIBBPF_INCLUDE=3D$(HOST_INCLUDE_DIR) \ + EXTRA_LDFLAGS=3D'$(SAN_LDFLAGS) $(EXTRA_LDFLAGS)' \ OUTPUT=3D$(HOST_BUILD_DIR)/resolve_btfids/ BPFOBJ=3D$(HOST_BPFOBJ) =20 # Get Clang's default includes on this system, as opposed to those seen by --=20 2.53.0