Commit fbeed934 authored by Andrii Nakryiko's avatar Andrii Nakryiko
Browse files

Merge branch 'selftests/bpf: Some build fixes' 

Jean-Philippe Brucker says:

====================

A few fixes for cross-building the sefltests out of tree. This will
enable wider automated testing on various Arm hardware.

Changes since v1 [1]:
* Use wildcard in patch 5
* Move the MAKE_DIRS declaration in patch 1

[1] https://lore.kernel.org/bpf/20210112135959.649075-1-jean-philippe@linaro.org/


====================

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
parents 7c7a80ea b8d1cbef

tools/testing/selftests/bpf/Makefile

+41 −17
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

include ../../../../scripts/Kbuild.include

include ../../../scripts/Makefile.arch

include ../../../scripts/Makefile.include



CXX ?= $(CROSS_COMPILE)g++
@@ -24,7 +25,7 @@ BPF_GCC ?= $(shell command -v bpf-gcc;) 
SAN_CFLAGS	?=

CFLAGS += -g -rdynamic -Wall -O2 $(GENFLAGS) $(SAN_CFLAGS)		\

	  -I$(CURDIR) -I$(INCLUDE_DIR) -I$(GENDIR) -I$(LIBDIR)		\

	  -I$(TOOLSINCDIR) -I$(APIDIR)					\

	  -I$(TOOLSINCDIR) -I$(APIDIR) -I$(OUTPUT)			\

	  -Dbpf_prog_load=bpf_prog_test_load				\

	  -Dbpf_load_program=bpf_test_load_program

LDLIBS += -lcap -lelf -lz -lrt -lpthread
@@ -43,10 +44,10 @@ ifneq ($(BPF_GCC),) 
TEST_GEN_PROGS += test_progs-bpf_gcc

endif



TEST_GEN_FILES =

TEST_FILES = test_lwt_ip_encap.o \

	test_tc_edt.o \

	xsk_prereqs.sh

TEST_GEN_FILES = test_lwt_ip_encap.o \

	test_tc_edt.o

TEST_FILES = xsk_prereqs.sh \

	$(wildcard progs/btf_dump_test_case_*.c)



# Order correspond to 'make run_tests' order

TEST_PROGS := test_kmod.sh \
@@ -82,7 +83,7 @@ TEST_GEN_PROGS_EXTENDED = test_sock_addr test_skb_cgroup_id_user \ 
	test_lirc_mode2_user xdping test_cpp runqslower bench bpf_testmod.ko \

	xdpxceiver



TEST_CUSTOM_PROGS = urandom_read

TEST_CUSTOM_PROGS = $(OUTPUT)/urandom_read



# Emit succinct information message describing current building step

# $1 - generic step name (e.g., CC, LINK, etc);
@@ -113,7 +114,15 @@ SCRATCH_DIR := $(OUTPUT)/tools 
BUILD_DIR := $(SCRATCH_DIR)/build

INCLUDE_DIR := $(SCRATCH_DIR)/include

BPFOBJ := $(BUILD_DIR)/libbpf/libbpf.a

RESOLVE_BTFIDS := $(BUILD_DIR)/resolve_btfids/resolve_btfids

ifneq ($(CROSS_COMPILE),)

HOST_BUILD_DIR		:= $(BUILD_DIR)/host

HOST_SCRATCH_DIR	:= $(OUTPUT)/host-tools

else

HOST_BUILD_DIR		:= $(BUILD_DIR)

HOST_SCRATCH_DIR	:= $(SCRATCH_DIR)

endif

HOST_BPFOBJ := $(HOST_BUILD_DIR)/libbpf/libbpf.a

RESOLVE_BTFIDS := $(HOST_BUILD_DIR)/resolve_btfids/resolve_btfids



VMLINUX_BTF_PATHS ?= $(if $(O),$(O)/vmlinux)				\

		     $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux)	\
@@ -135,6 +144,14 @@ $(notdir $(TEST_GEN_PROGS) \ 
	 $(TEST_GEN_PROGS_EXTENDED)					\

	 $(TEST_CUSTOM_PROGS)): %: $(OUTPUT)/% ;



# sort removes libbpf duplicates when not cross-building

MAKE_DIRS := $(sort $(BUILD_DIR)/libbpf $(HOST_BUILD_DIR)/libbpf	       \

	       $(HOST_BUILD_DIR)/bpftool $(HOST_BUILD_DIR)/resolve_btfids      \

	       $(INCLUDE_DIR))

$(MAKE_DIRS):

	$(call msg,MKDIR,,$@)

	$(Q)mkdir -p $@



$(OUTPUT)/%.o: %.c

	$(call msg,CC,,$@)

	$(Q)$(CC) $(CFLAGS) -c $(filter %.c,$^) $(LDLIBS) -o $@
@@ -157,7 +174,7 @@ $(OUTPUT)/test_stub.o: test_stub.c $(BPFOBJ) 
	$(call msg,CC,,$@)

	$(Q)$(CC) -c $(CFLAGS) -o $@ $<



DEFAULT_BPFTOOL := $(SCRATCH_DIR)/sbin/bpftool

DEFAULT_BPFTOOL := $(HOST_SCRATCH_DIR)/sbin/bpftool



$(OUTPUT)/runqslower: $(BPFOBJ) | $(DEFAULT_BPFTOOL)

	$(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/runqslower	\
@@ -182,10 +199,11 @@ $(OUTPUT)/test_sysctl: cgroup_helpers.c 


BPFTOOL ?= $(DEFAULT_BPFTOOL)

$(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile)    \

		    $(BPFOBJ) | $(BUILD_DIR)/bpftool

		    $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/bpftool

	$(Q)$(MAKE) $(submake_extras)  -C $(BPFTOOLDIR)			       \

		    OUTPUT=$(BUILD_DIR)/bpftool/			       \

		    prefix= DESTDIR=$(SCRATCH_DIR)/ install

		    CC=$(HOSTCC) LD=$(HOSTLD)				       \

		    OUTPUT=$(HOST_BUILD_DIR)/bpftool/			       \

		    prefix= DESTDIR=$(HOST_SCRATCH_DIR)/ install

	$(Q)mkdir -p $(BUILD_DIR)/bpftool/Documentation

	$(Q)RST2MAN_OPTS="--exit-status=1" $(MAKE) $(submake_extras)	       \

		    -C $(BPFTOOLDIR)/Documentation			       \
@@ -198,9 +216,14 @@ $(BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile) \ 
	$(Q)$(MAKE) $(submake_extras) -C $(BPFDIR) OUTPUT=$(BUILD_DIR)/libbpf/ \

		    DESTDIR=$(SCRATCH_DIR) prefix= all install_headers



$(BUILD_DIR)/libbpf $(BUILD_DIR)/bpftool $(BUILD_DIR)/resolve_btfids $(INCLUDE_DIR):

	$(call msg,MKDIR,,$@)

	$(Q)mkdir -p $@

ifneq ($(BPFOBJ),$(HOST_BPFOBJ))

$(HOST_BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile)                \

	   ../../../include/uapi/linux/bpf.h                                   \

	   | $(INCLUDE_DIR) $(HOST_BUILD_DIR)/libbpf

	$(Q)$(MAKE) $(submake_extras) -C $(BPFDIR)                             \

		OUTPUT=$(HOST_BUILD_DIR)/libbpf/ CC=$(HOSTCC) LD=$(HOSTLD)     \

		    DESTDIR=$(HOST_SCRATCH_DIR)/ prefix= all install_headers

endif



$(INCLUDE_DIR)/vmlinux.h: $(VMLINUX_BTF) | $(BPFTOOL) $(INCLUDE_DIR)

ifeq ($(VMLINUX_H),)
@@ -211,7 +234,7 @@ else 
	$(Q)cp "$(VMLINUX_H)" $@

endif



$(RESOLVE_BTFIDS): $(BPFOBJ) | $(BUILD_DIR)/resolve_btfids	\

$(RESOLVE_BTFIDS): $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/resolve_btfids	\

		       $(TOOLSDIR)/bpf/resolve_btfids/main.c	\

		       $(TOOLSDIR)/lib/rbtree.c			\

		       $(TOOLSDIR)/lib/zalloc.c			\
@@ -219,7 +242,8 @@ $(RESOLVE_BTFIDS): $(BPFOBJ) | $(BUILD_DIR)/resolve_btfids \ 
		       $(TOOLSDIR)/lib/ctype.c			\

		       $(TOOLSDIR)/lib/str_error_r.c

	$(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/resolve_btfids	\

		OUTPUT=$(BUILD_DIR)/resolve_btfids/ BPFOBJ=$(BPFOBJ)

		CC=$(HOSTCC) LD=$(HOSTLD) AR=$(HOSTAR) \

		OUTPUT=$(HOST_BUILD_DIR)/resolve_btfids/ BPFOBJ=$(HOST_BPFOBJ)



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

# '-target bpf'. This fixes "missing" files on some architectures/distros,
@@ -450,7 +474,7 @@ $(OUTPUT)/bench: $(OUTPUT)/bench.o $(OUTPUT)/testing_helpers.o \ 
	$(call msg,BINARY,,$@)

	$(Q)$(CC) $(LDFLAGS) -o $@ $(filter %.a %.o,$^) $(LDLIBS)



EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR)			\

EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR)	\

	prog_tests/tests.h map_tests/tests.h verifier/tests.h		\

	feature								\

	$(addprefix $(OUTPUT)/,*.o *.skel.h no_alu32 bpf_gcc bpf_testmod.ko)