Commit ca4db638 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

selftests/bpf: Allow substituting custom vmlinux.h for selftests build 



Similarly to bpftool Makefile, allow to specify custom location of vmlinux.h
to be used during the build. This allows simpler testing setups with
checked-in pre-generated vmlinux.h.

Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20200630004759.521530-2-andriin@fb.com
parent ec23eb70

tools/testing/selftests/bpf/Makefile

+7 −2
Original line number Diff line number Diff line
@@ -134,12 +134,12 @@ $(OUTPUT)/test_stub.o: test_stub.c $(BPFOBJ) 
	$(call msg,CC,,$@)

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



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

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

		     $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux)	\

		     ../../../../vmlinux				\

		     /sys/kernel/btf/vmlinux				\

		     /boot/vmlinux-$(shell uname -r)

VMLINUX_BTF := $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS))))

VMLINUX_BTF ?= $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS))))



$(OUTPUT)/runqslower: $(BPFOBJ)

	$(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/runqslower	\
@@ -182,8 +182,13 @@ $(BUILD_DIR)/libbpf $(BUILD_DIR)/bpftool $(INCLUDE_DIR): 
	mkdir -p $@



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

ifeq ($(VMLINUX_H),)

	$(call msg,GEN,,$@)

	$(BPFTOOL) btf dump file $(VMLINUX_BTF) format c > $@

else

	$(call msg,CP,,$@)

	cp "$(VMLINUX_H)" $@

endif



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

# '-target bpf'. This fixes "missing" files on some architectures/distros,

CRA Git | Maintained and supported by SUSTech CRA and CCSE