Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ce6ae22 authored by Yonghong Song's avatar Yonghong Song Committed by Alexei Starovoitov
Browse files

tools/bpf: do not use pahole if clang/llvm can generate BTF sections 



Add additional checks in tools/testing/selftests/bpf and
samples/bpf such that if clang/llvm compiler can generate
BTF sections, do not use pahole.

Signed-off-by: default avatarYonghong Song <yhs@fb.com>
Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 2993e051

samples/bpf/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -208,12 +208,20 @@ endif 
BTF_LLC_PROBE := $(shell $(LLC) -march=bpf -mattr=help 2>&1 | grep dwarfris)

BTF_PAHOLE_PROBE := $(shell $(BTF_PAHOLE) --help 2>&1 | grep BTF)

BTF_OBJCOPY_PROBE := $(shell $(LLVM_OBJCOPY) --help 2>&1 | grep -i 'usage.*llvm')

BTF_LLVM_PROBE := $(shell echo "int main() { return 0; }" | \

			  $(CLANG) -target bpf -O2 -g -c -x c - -o ./llvm_btf_verify.o; \

			  readelf -S ./llvm_btf_verify.o | grep BTF; \

			  /bin/rm -f ./llvm_btf_verify.o)



ifneq ($(BTF_LLVM_PROBE),)

	EXTRA_CFLAGS += -g

else

ifneq ($(and $(BTF_LLC_PROBE),$(BTF_PAHOLE_PROBE),$(BTF_OBJCOPY_PROBE)),)

	EXTRA_CFLAGS += -g

	LLC_FLAGS += -mattr=dwarfris

	DWARF2BTF = y

endif

endif



# Trick to allow make to be run from this directory

all:

tools/testing/selftests/bpf/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -126,7 +126,14 @@ $(OUTPUT)/test_stack_map.o: test_queue_stack_map.h 
BTF_LLC_PROBE := $(shell $(LLC) -march=bpf -mattr=help 2>&1 | grep dwarfris)

BTF_PAHOLE_PROBE := $(shell $(BTF_PAHOLE) --help 2>&1 | grep BTF)

BTF_OBJCOPY_PROBE := $(shell $(LLVM_OBJCOPY) --help 2>&1 | grep -i 'usage.*llvm')

BTF_LLVM_PROBE := $(shell echo "int main() { return 0; }" | \

			  $(CLANG) -target bpf -O2 -g -c -x c - -o ./llvm_btf_verify.o; \

			  readelf -S ./llvm_btf_verify.o | grep BTF; \

			  /bin/rm -f ./llvm_btf_verify.o)



ifneq ($(BTF_LLVM_PROBE),)

	CLANG_FLAGS += -g

else

ifneq ($(BTF_LLC_PROBE),)

ifneq ($(BTF_PAHOLE_PROBE),)

ifneq ($(BTF_OBJCOPY_PROBE),)
@@ -136,6 +143,7 @@ ifneq ($(BTF_OBJCOPY_PROBE),) 
endif

endif

endif

endif



# Have one program compiled without "-target bpf" to test whether libbpf loads

# it successfully