Commit 3848636b authored by Pu Lehui's avatar Pu Lehui Committed by Andrii Nakryiko
Browse files

bpf: iterators: Build and use lightweight bootstrap version of bpftool 



kernel/bpf/preload/iterators use bpftool for vmlinux.h, skeleton, and
static linking only. So we can use lightweight bootstrap version of
bpftool to handle these, and it will be faster.

Suggested-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarPu Lehui <pulehui@huawei.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220714024612.944071-4-pulehui@huawei.com
parent 3a2a58c4

kernel/bpf/preload/iterators/Makefile

+3 −7
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ LLVM_STRIP ?= llvm-strip 
TOOLS_PATH := $(abspath ../../../../tools)

BPFTOOL_SRC := $(TOOLS_PATH)/bpf/bpftool

BPFTOOL_OUTPUT := $(abs_out)/bpftool

DEFAULT_BPFTOOL := $(OUTPUT)/sbin/bpftool

DEFAULT_BPFTOOL := $(BPFTOOL_OUTPUT)/bootstrap/bpftool

BPFTOOL ?= $(DEFAULT_BPFTOOL)



LIBBPF_SRC := $(TOOLS_PATH)/lib/bpf
@@ -61,9 +61,5 @@ $(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(LIBBPF_OU 
		    OUTPUT=$(abspath $(dir $@))/ prefix=		       \

		    DESTDIR=$(LIBBPF_DESTDIR) $(abspath $@) install_headers



$(DEFAULT_BPFTOOL): $(BPFOBJ) | $(BPFTOOL_OUTPUT)

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

		    OUTPUT=$(BPFTOOL_OUTPUT)/				       \

		    LIBBPF_OUTPUT=$(LIBBPF_OUTPUT)/			       \

		    LIBBPF_DESTDIR=$(LIBBPF_DESTDIR)/			       \

		    prefix= DESTDIR=$(abs_out)/ install-bin
 
$(DEFAULT_BPFTOOL): | $(BPFTOOL_OUTPUT)

	$(Q)$(MAKE) $(submake_extras) -C $(BPFTOOL_SRC)	OUTPUT=$(BPFTOOL_OUTPUT)/ bootstrap