bpf: Compile resolve_btfids tool at kernel compilation start (33a57ce0) · Commits · 戴 / test

Makefile

+18 −4

Original line number	Diff line number	Diff line
		@@ -1053,9 +1053,10 @@ export mod_sign_cmd

		HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null \|\| echo -lelf)

		ifdef CONFIG_STACK_VALIDATION
		has_libelf := $(call try-run,\
		has_libelf = $(call try-run,\
		echo "int main() {}" \| $(HOSTCC) -xc -o /dev/null $(HOST_LIBELF_LIBS) -,1,0)

		ifdef CONFIG_STACK_VALIDATION
		ifeq ($(has_libelf),1)
		objtool_target := tools/objtool FORCE
		else
		@@ -1064,6 +1065,14 @@ ifdef CONFIG_STACK_VALIDATION
		endif
		endif

		ifdef CONFIG_DEBUG_INFO_BTF
		ifeq ($(has_libelf),1)
		resolve_btfids_target := tools/bpf/resolve_btfids FORCE
		else
		ERROR_RESOLVE_BTFIDS := 1
		endif
		endif

		PHONY += prepare0

		export MODORDER := $(extmod-prefix)modules.order
		@@ -1175,7 +1184,7 @@ prepare0: archprepare
		$(Q)$(MAKE) $(build)=.

		# All the preparing..
		prepare: prepare0 prepare-objtool
		prepare: prepare0 prepare-objtool prepare-resolve_btfids

		# Support for using generic headers in asm-generic
		asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj
		@@ -1188,7 +1197,7 @@ uapi-asm-generic:
		$(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/uapi/asm \
		generic=include/uapi/asm-generic

		PHONY += prepare-objtool
		PHONY += prepare-objtool prepare-resolve_btfids
		prepare-objtool: $(objtool_target)
		ifeq ($(SKIP_STACK_VALIDATION),1)
		ifdef CONFIG_UNWINDER_ORC
		@@ -1199,6 +1208,11 @@ else
		endif
		endif

		prepare-resolve_btfids: $(resolve_btfids_target)
		ifeq ($(ERROR_RESOLVE_BTFIDS),1)
		@echo "error: Cannot resolve BTF IDs for CONFIG_DEBUG_INFO_BTF, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2
		@false
		endif
		# Generate some files
		# ---------------------------------------------------------------------------

tools/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,9 @@ cpupower: FORCE
		cgroup firewire hv guest bootconfig spi usb virtio vm bpf iio gpio objtool leds wmi pci firmware debugging: FORCE
		$(call descend,$@)

		bpf/%: FORCE
		$(call descend,$@)

		liblockdep: FORCE
		$(call descend,lib/lockdep)

tools/bpf/Makefile

+8 −1

Original line number	Diff line number	Diff line
		@@ -123,5 +123,12 @@ runqslower_install:
		runqslower_clean:
		$(call descend,runqslower,clean)

		resolve_btfids:
		$(call descend,resolve_btfids)

		resolve_btfids_clean:
		$(call descend,resolve_btfids,clean)

		.PHONY: all install clean bpftool bpftool_install bpftool_clean \
		runqslower runqslower_install runqslower_clean
		runqslower runqslower_install runqslower_clean \
		resolve_btfids resolve_btfids_clean

Admin message