Skip to content

Commit 4021848

Browse files
theihorAlexei Starovoitov
authored andcommitted
selftests/bpf: Pass through build flags to bpftool and resolve_btfids
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="-fsanitize=address", 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 <ihor.solodrai@linux.dev> Link: https://lore.kernel.org/r/20260223190736.649171-7-ihor.solodrai@linux.dev Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1 parent 9d86852 commit 4021848

2 files changed

Lines changed: 14 additions & 6 deletions

File tree

tools/bpf/resolve_btfids/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ $(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(LIBBPF_OU
6565
LIBELF_FLAGS := $(shell $(HOSTPKG_CONFIG) libelf --cflags 2>/dev/null)
6666
LIBELF_LIBS := $(shell $(HOSTPKG_CONFIG) libelf --libs 2>/dev/null || echo -lelf)
6767

68+
ZLIB_LIBS := $(shell $(HOSTPKG_CONFIG) zlib --libs 2>/dev/null || echo -lz)
69+
ZSTD_LIBS := $(shell $(HOSTPKG_CONFIG) libzstd --libs 2>/dev/null || echo -lzstd)
70+
6871
HOSTCFLAGS_resolve_btfids += -g \
6972
-I$(srctree)/tools/include \
7073
-I$(srctree)/tools/include/uapi \
@@ -73,7 +76,7 @@ HOSTCFLAGS_resolve_btfids += -g \
7376
$(LIBELF_FLAGS) \
7477
-Wall -Werror
7578

76-
LIBS = $(LIBELF_LIBS) -lz
79+
LIBS = $(LIBELF_LIBS) $(ZLIB_LIBS) $(ZSTD_LIBS)
7780

7881
export srctree OUTPUT HOSTCFLAGS_resolve_btfids Q HOSTCC HOSTLD HOSTAR
7982
include $(srctree)/tools/build/Makefile.include
@@ -83,7 +86,7 @@ $(BINARY_IN): fixdep FORCE prepare | $(OUTPUT)
8386

8487
$(BINARY): $(BPFOBJ) $(SUBCMDOBJ) $(BINARY_IN)
8588
$(call msg,LINK,$@)
86-
$(Q)$(HOSTCC) $(BINARY_IN) $(KBUILD_HOSTLDFLAGS) -o $@ $(BPFOBJ) $(SUBCMDOBJ) $(LIBS)
89+
$(Q)$(HOSTCC) $(BINARY_IN) $(KBUILD_HOSTLDFLAGS) $(EXTRA_LDFLAGS) -o $@ $(BPFOBJ) $(SUBCMDOBJ) $(LIBS)
8790

8891
clean_objects := $(wildcard $(OUTPUT)/*.o \
8992
$(OUTPUT)/.*.o.cmd \

tools/testing/selftests/bpf/Makefile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ ifneq ($(wildcard $(GENHDR)),)
2727
endif
2828

2929
BPF_GCC ?= $(shell command -v bpf-gcc;)
30+
ifdef ASAN
31+
SAN_CFLAGS ?= -fsanitize=address -fno-omit-frame-pointer
32+
else
3033
SAN_CFLAGS ?=
34+
endif
3135
SAN_LDFLAGS ?= $(SAN_CFLAGS)
3236
RELEASE ?=
3337
OPT_FLAGS ?= $(if $(RELEASE),-O2,-O0)
@@ -326,8 +330,8 @@ $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \
326330
$(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/bpftool
327331
$(Q)$(MAKE) $(submake_extras) -C $(BPFTOOLDIR) \
328332
ARCH= CROSS_COMPILE= CC="$(HOSTCC)" LD="$(HOSTLD)" \
329-
EXTRA_CFLAGS='-g $(OPT_FLAGS) $(EXTRA_CFLAGS)' \
330-
EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' \
333+
EXTRA_CFLAGS='-g $(OPT_FLAGS) $(SAN_CFLAGS) $(EXTRA_CFLAGS)' \
334+
EXTRA_LDFLAGS='$(SAN_LDFLAGS) $(EXTRA_LDFLAGS)' \
331335
OUTPUT=$(HOST_BUILD_DIR)/bpftool/ \
332336
LIBBPF_OUTPUT=$(HOST_BUILD_DIR)/libbpf/ \
333337
LIBBPF_DESTDIR=$(HOST_SCRATCH_DIR)/ \
@@ -338,8 +342,8 @@ $(CROSS_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \
338342
$(BPFOBJ) | $(BUILD_DIR)/bpftool
339343
$(Q)$(MAKE) $(submake_extras) -C $(BPFTOOLDIR) \
340344
ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) \
341-
EXTRA_CFLAGS='-g $(OPT_FLAGS) $(EXTRA_CFLAGS)' \
342-
EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' \
345+
EXTRA_CFLAGS='-g $(OPT_FLAGS) $(SAN_CFLAGS) $(EXTRA_CFLAGS)' \
346+
EXTRA_LDFLAGS='$(SAN_LDFLAGS) $(EXTRA_LDFLAGS)' \
343347
OUTPUT=$(BUILD_DIR)/bpftool/ \
344348
LIBBPF_OUTPUT=$(BUILD_DIR)/libbpf/ \
345349
LIBBPF_DESTDIR=$(SCRATCH_DIR)/ \
@@ -404,6 +408,7 @@ $(RESOLVE_BTFIDS): $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/resolve_btfids \
404408
$(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/resolve_btfids \
405409
CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)" \
406410
LIBBPF_INCLUDE=$(HOST_INCLUDE_DIR) \
411+
EXTRA_LDFLAGS='$(SAN_LDFLAGS) $(EXTRA_LDFLAGS)' \
407412
OUTPUT=$(HOST_BUILD_DIR)/resolve_btfids/ BPFOBJ=$(HOST_BPFOBJ)
408413

409414
# Get Clang's default includes on this system, as opposed to those seen by

0 commit comments

Comments
 (0)