mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
![Arnaldo Carvalho de Melo](/assets/img/avatar_default.png)
By adding a feature test for bpf_map_create() and providing a fallback if it isn't present in older versions of libbpf. This also fixes the build with torvalds/master at this point: $ git log --oneline -5 torvalds/masterbabf0bb978
(torvalds/master) Merge tag 'xfs-5.19-for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linuxe375780b63
Merge tag 'fsnotify_for_v5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs8b728edc5b
Merge tag 'fs_for_v5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs3f306ea2e1
Merge tag 'dma-mapping-5.19-2022-05-25' of git://git.infradead.org/users/hch/dma-mappingfbe86daca0
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi $ Coping with: $ git log --oneline -2d16495a982
d16495a982
libbpf: remove bpf_create_map*() APIse2371b1632
libbpf: start 1.0 development cycle $ As the __weak function fails to build as it calls the now removed bpf_create_map() API. Testing: $ rpm -q libbpf-devel libbpf-devel-0.4.0-2.fc35.x86_64 $ $ make -C tools/perf BUILD_BPF_SKEL=1 LIBBPF_DYNAMIC=1 O=/tmp/build/perf install-bin $ cat /tmp/build/perf/feature/test-libbpf-bpf_map_create.make.output test-libbpf-bpf_map_create.c: In function ‘main’: test-libbpf-bpf_map_create.c:6:16: error: implicit declaration of function ‘bpf_map_create’; did you mean ‘bpf_map_freeze’? [-Werror=implicit-function-declaration] 6 | return bpf_map_create(0 /* map_type */, NULL /* map_name */, 0, /* key_size */, | ^~~~~~~~~~~~~~ | bpf_map_freeze test-libbpf-bpf_map_create.c:6:87: error: expected expression before ‘,’ token 6 | return bpf_map_create(0 /* map_type */, NULL /* map_name */, 0, /* key_size */, | ^ cc1: all warnings being treated as errors $ $ objdump -dS /tmp/build/perf/perf | grep '<bpf_map_create>:' -A20 000000000058b290 <bpf_map_create>: { 58b290: 55 push %rbp 58b291: 48 89 e5 mov %rsp,%rbp 58b294: 48 83 ec 10 sub $0x10,%rsp 58b298: 64 48 8b 04 25 28 00 mov %fs:0x28,%rax 58b29f: 00 00 58b2a1: 48 89 45 f8 mov %rax,-0x8(%rbp) 58b2a5: 31 c0 xor %eax,%eax return bpf_create_map(map_type, key_size, value_size, max_entries, 0); 58b2a7: 48 8b 45 f8 mov -0x8(%rbp),%rax 58b2ab: 64 48 2b 04 25 28 00 sub %fs:0x28,%rax 58b2b2: 00 00 58b2b4: 75 10 jne 58b2c6 <bpf_map_create+0x36> } 58b2b6: c9 leave 58b2b7: 89 d6 mov %edx,%esi 58b2b9: 89 ca mov %ecx,%edx 58b2bb: 44 89 c1 mov %r8d,%ecx return bpf_create_map(map_type, key_size, value_size, max_entries, 0); 58b2be: 45 31 c0 xor %r8d,%r8d $ Cc: Andrii Nakryiko <andrii@kernel.org> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: Ian Rogers <irogers@google.com> Cc: Ilya Leoshkevich <iii@linux.ibm.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Song Liu <songliubraving@fb.com> Cc: Sumanth Korikkar <sumanthk@linux.ibm.com> Cc: Sven Schnelle <svens@linux.ibm.com> Cc: Thomas Richter <tmricht@linux.ibm.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Link: http://lore.kernel.org/linux-perf-users/Yo+XvQNKL4K5khl2@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
374 lines
10 KiB
Makefile
374 lines
10 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
include ../../scripts/Makefile.include
|
|
|
|
FILES= \
|
|
test-all.bin \
|
|
test-backtrace.bin \
|
|
test-bionic.bin \
|
|
test-dwarf.bin \
|
|
test-dwarf_getlocations.bin \
|
|
test-eventfd.bin \
|
|
test-fortify-source.bin \
|
|
test-get_current_dir_name.bin \
|
|
test-glibc.bin \
|
|
test-gtk2.bin \
|
|
test-gtk2-infobar.bin \
|
|
test-hello.bin \
|
|
test-libaudit.bin \
|
|
test-libbfd.bin \
|
|
test-libbfd-buildid.bin \
|
|
test-disassembler-four-args.bin \
|
|
test-reallocarray.bin \
|
|
test-libbfd-liberty.bin \
|
|
test-libbfd-liberty-z.bin \
|
|
test-cplus-demangle.bin \
|
|
test-libcap.bin \
|
|
test-libelf.bin \
|
|
test-libelf-getphdrnum.bin \
|
|
test-libelf-gelf_getnote.bin \
|
|
test-libelf-getshdrstrndx.bin \
|
|
test-libdebuginfod.bin \
|
|
test-libnuma.bin \
|
|
test-numa_num_possible_cpus.bin \
|
|
test-libperl.bin \
|
|
test-libpython.bin \
|
|
test-libslang.bin \
|
|
test-libslang-include-subdir.bin \
|
|
test-libtraceevent.bin \
|
|
test-libtracefs.bin \
|
|
test-libcrypto.bin \
|
|
test-libunwind.bin \
|
|
test-libunwind-debug-frame.bin \
|
|
test-libunwind-x86.bin \
|
|
test-libunwind-x86_64.bin \
|
|
test-libunwind-arm.bin \
|
|
test-libunwind-aarch64.bin \
|
|
test-libunwind-debug-frame-arm.bin \
|
|
test-libunwind-debug-frame-aarch64.bin \
|
|
test-pthread-attr-setaffinity-np.bin \
|
|
test-pthread-barrier.bin \
|
|
test-stackprotector-all.bin \
|
|
test-timerfd.bin \
|
|
test-libdw-dwarf-unwind.bin \
|
|
test-libbabeltrace.bin \
|
|
test-compile-32.bin \
|
|
test-compile-x32.bin \
|
|
test-zlib.bin \
|
|
test-lzma.bin \
|
|
test-bpf.bin \
|
|
test-libbpf.bin \
|
|
test-libbpf-btf__load_from_kernel_by_id.bin \
|
|
test-libbpf-bpf_prog_load.bin \
|
|
test-libbpf-bpf_map_create.bin \
|
|
test-libbpf-bpf_object__next_program.bin \
|
|
test-libbpf-bpf_object__next_map.bin \
|
|
test-libbpf-btf__raw_data.bin \
|
|
test-get_cpuid.bin \
|
|
test-sdt.bin \
|
|
test-cxx.bin \
|
|
test-gettid.bin \
|
|
test-jvmti.bin \
|
|
test-jvmti-cmlr.bin \
|
|
test-sched_getcpu.bin \
|
|
test-setns.bin \
|
|
test-libopencsd.bin \
|
|
test-clang.bin \
|
|
test-llvm.bin \
|
|
test-llvm-version.bin \
|
|
test-libaio.bin \
|
|
test-libzstd.bin \
|
|
test-clang-bpf-co-re.bin \
|
|
test-file-handle.bin \
|
|
test-libpfm4.bin
|
|
|
|
FILES := $(addprefix $(OUTPUT),$(FILES))
|
|
|
|
PKG_CONFIG ?= $(CROSS_COMPILE)pkg-config
|
|
|
|
all: $(FILES)
|
|
|
|
__BUILD = $(CC) $(CFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.c,$(@F)) $(LDFLAGS)
|
|
BUILD = $(__BUILD) > $(@:.bin=.make.output) 2>&1
|
|
|
|
__BUILDXX = $(CXX) $(CXXFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$(@F)) $(LDFLAGS)
|
|
BUILDXX = $(__BUILDXX) > $(@:.bin=.make.output) 2>&1
|
|
|
|
###############################
|
|
|
|
$(OUTPUT)test-all.bin:
|
|
$(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma -lzstd -lcap
|
|
|
|
$(OUTPUT)test-hello.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-pthread-attr-setaffinity-np.bin:
|
|
$(BUILD) -D_GNU_SOURCE -lpthread
|
|
|
|
$(OUTPUT)test-pthread-barrier.bin:
|
|
$(BUILD) -lpthread
|
|
|
|
$(OUTPUT)test-stackprotector-all.bin:
|
|
$(BUILD) -fstack-protector-all
|
|
|
|
$(OUTPUT)test-fortify-source.bin:
|
|
$(BUILD) -O2 -D_FORTIFY_SOURCE=2
|
|
|
|
$(OUTPUT)test-bionic.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-libcap.bin:
|
|
$(BUILD) -lcap
|
|
|
|
$(OUTPUT)test-libelf.bin:
|
|
$(BUILD) -lelf
|
|
|
|
$(OUTPUT)test-eventfd.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-get_current_dir_name.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-glibc.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-sched_getcpu.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-setns.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-libopencsd.bin:
|
|
$(BUILD) # -lopencsd_c_api -lopencsd provided by
|
|
# $(FEATURE_CHECK_LDFLAGS-libopencsd)
|
|
|
|
DWARFLIBS := -ldw
|
|
ifeq ($(findstring -static,${LDFLAGS}),-static)
|
|
DWARFLIBS += -lelf -lebl -lz -llzma -lbz2
|
|
endif
|
|
|
|
$(OUTPUT)test-dwarf.bin:
|
|
$(BUILD) $(DWARFLIBS)
|
|
|
|
$(OUTPUT)test-dwarf_getlocations.bin:
|
|
$(BUILD) $(DWARFLIBS)
|
|
|
|
$(OUTPUT)test-libelf-getphdrnum.bin:
|
|
$(BUILD) -lelf
|
|
|
|
$(OUTPUT)test-libelf-gelf_getnote.bin:
|
|
$(BUILD) -lelf
|
|
|
|
$(OUTPUT)test-libelf-getshdrstrndx.bin:
|
|
$(BUILD) -lelf
|
|
|
|
$(OUTPUT)test-libdebuginfod.bin:
|
|
$(BUILD) -ldebuginfod
|
|
|
|
$(OUTPUT)test-libnuma.bin:
|
|
$(BUILD) -lnuma
|
|
|
|
$(OUTPUT)test-numa_num_possible_cpus.bin:
|
|
$(BUILD) -lnuma
|
|
|
|
$(OUTPUT)test-libunwind.bin:
|
|
$(BUILD) -lelf
|
|
|
|
$(OUTPUT)test-libunwind-debug-frame.bin:
|
|
$(BUILD) -lelf
|
|
$(OUTPUT)test-libunwind-x86.bin:
|
|
$(BUILD) -lelf -lunwind-x86
|
|
|
|
$(OUTPUT)test-libunwind-x86_64.bin:
|
|
$(BUILD) -lelf -lunwind-x86_64
|
|
|
|
$(OUTPUT)test-libunwind-arm.bin:
|
|
$(BUILD) -lelf -lunwind-arm
|
|
|
|
$(OUTPUT)test-libunwind-aarch64.bin:
|
|
$(BUILD) -lelf -lunwind-aarch64
|
|
|
|
$(OUTPUT)test-libunwind-debug-frame-arm.bin:
|
|
$(BUILD) -lelf -lunwind-arm
|
|
|
|
$(OUTPUT)test-libunwind-debug-frame-aarch64.bin:
|
|
$(BUILD) -lelf -lunwind-aarch64
|
|
|
|
$(OUTPUT)test-libaudit.bin:
|
|
$(BUILD) -laudit
|
|
|
|
$(OUTPUT)test-libslang.bin:
|
|
$(BUILD) -lslang
|
|
|
|
$(OUTPUT)test-libslang-include-subdir.bin:
|
|
$(BUILD) -lslang
|
|
|
|
$(OUTPUT)test-libtraceevent.bin:
|
|
$(BUILD) -ltraceevent
|
|
|
|
$(OUTPUT)test-libtracefs.bin:
|
|
$(BUILD) -ltracefs
|
|
|
|
$(OUTPUT)test-libcrypto.bin:
|
|
$(BUILD) -lcrypto
|
|
|
|
$(OUTPUT)test-gtk2.bin:
|
|
$(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) -Wno-deprecated-declarations
|
|
|
|
$(OUTPUT)test-gtk2-infobar.bin:
|
|
$(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null)
|
|
|
|
grep-libs = $(filter -l%,$(1))
|
|
strip-libs = $(filter-out -l%,$(1))
|
|
|
|
PERL_EMBED_LDOPTS = $(shell perl -MExtUtils::Embed -e ldopts 2>/dev/null)
|
|
PERL_EMBED_LDFLAGS = $(call strip-libs,$(PERL_EMBED_LDOPTS))
|
|
PERL_EMBED_LIBADD = $(call grep-libs,$(PERL_EMBED_LDOPTS))
|
|
PERL_EMBED_CCOPTS = $(shell perl -MExtUtils::Embed -e ccopts 2>/dev/null)
|
|
FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS)
|
|
|
|
ifeq ($(CC_NO_CLANG), 0)
|
|
PERL_EMBED_LDOPTS := $(filter-out -specs=%,$(PERL_EMBED_LDOPTS))
|
|
PERL_EMBED_CCOPTS := $(filter-out -flto=auto -ffat-lto-objects, $(PERL_EMBED_CCOPTS))
|
|
PERL_EMBED_CCOPTS := $(filter-out -specs=%,$(PERL_EMBED_CCOPTS))
|
|
FLAGS_PERL_EMBED += -Wno-compound-token-split-by-macro
|
|
endif
|
|
|
|
$(OUTPUT)test-libperl.bin:
|
|
$(BUILD) $(FLAGS_PERL_EMBED)
|
|
|
|
$(OUTPUT)test-libpython.bin:
|
|
$(BUILD) $(FLAGS_PYTHON_EMBED)
|
|
|
|
$(OUTPUT)test-libbfd.bin:
|
|
$(BUILD) -DPACKAGE='"perf"' -lbfd -ldl
|
|
|
|
$(OUTPUT)test-libbfd-buildid.bin:
|
|
$(BUILD) -DPACKAGE='"perf"' -lbfd -ldl
|
|
|
|
$(OUTPUT)test-disassembler-four-args.bin:
|
|
$(BUILD) -DPACKAGE='"perf"' -lbfd -lopcodes
|
|
|
|
$(OUTPUT)test-reallocarray.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-libbfd-liberty.bin:
|
|
$(CC) $(CFLAGS) -Wall -Werror -o $@ test-libbfd.c -DPACKAGE='"perf"' $(LDFLAGS) -lbfd -ldl -liberty
|
|
|
|
$(OUTPUT)test-libbfd-liberty-z.bin:
|
|
$(CC) $(CFLAGS) -Wall -Werror -o $@ test-libbfd.c -DPACKAGE='"perf"' $(LDFLAGS) -lbfd -ldl -liberty -lz
|
|
|
|
$(OUTPUT)test-cplus-demangle.bin:
|
|
$(BUILD) -liberty
|
|
|
|
$(OUTPUT)test-backtrace.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-timerfd.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-libdw-dwarf-unwind.bin:
|
|
$(BUILD) # -ldw provided by $(FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind)
|
|
|
|
$(OUTPUT)test-libbabeltrace.bin:
|
|
$(BUILD) # -lbabeltrace provided by $(FEATURE_CHECK_LDFLAGS-libbabeltrace)
|
|
|
|
$(OUTPUT)test-compile-32.bin:
|
|
$(CC) -m32 -o $@ test-compile.c
|
|
|
|
$(OUTPUT)test-compile-x32.bin:
|
|
$(CC) -mx32 -o $@ test-compile.c
|
|
|
|
$(OUTPUT)test-zlib.bin:
|
|
$(BUILD) -lz
|
|
|
|
$(OUTPUT)test-lzma.bin:
|
|
$(BUILD) -llzma
|
|
|
|
$(OUTPUT)test-get_cpuid.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-bpf.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-libbpf.bin:
|
|
$(BUILD) -lbpf
|
|
|
|
$(OUTPUT)test-libbpf-btf__load_from_kernel_by_id.bin:
|
|
$(BUILD) -lbpf
|
|
|
|
$(OUTPUT)test-libbpf-bpf_prog_load.bin:
|
|
$(BUILD) -lbpf
|
|
|
|
$(OUTPUT)test-libbpf-bpf_map_create.bin:
|
|
$(BUILD) -lbpf
|
|
|
|
$(OUTPUT)test-libbpf-bpf_object__next_program.bin:
|
|
$(BUILD) -lbpf
|
|
|
|
$(OUTPUT)test-libbpf-bpf_object__next_map.bin:
|
|
$(BUILD) -lbpf
|
|
|
|
$(OUTPUT)test-libbpf-btf__raw_data.bin:
|
|
$(BUILD) -lbpf
|
|
|
|
$(OUTPUT)test-sdt.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-cxx.bin:
|
|
$(BUILDXX) -std=gnu++11
|
|
|
|
$(OUTPUT)test-gettid.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-jvmti.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-jvmti-cmlr.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-llvm.bin:
|
|
$(BUILDXX) -std=gnu++14 \
|
|
-I$(shell $(LLVM_CONFIG) --includedir) \
|
|
-L$(shell $(LLVM_CONFIG) --libdir) \
|
|
$(shell $(LLVM_CONFIG) --libs Core BPF) \
|
|
$(shell $(LLVM_CONFIG) --system-libs) \
|
|
> $(@:.bin=.make.output) 2>&1
|
|
|
|
$(OUTPUT)test-llvm-version.bin:
|
|
$(BUILDXX) -std=gnu++14 \
|
|
-I$(shell $(LLVM_CONFIG) --includedir) \
|
|
> $(@:.bin=.make.output) 2>&1
|
|
|
|
$(OUTPUT)test-clang.bin:
|
|
$(BUILDXX) -std=gnu++14 \
|
|
-I$(shell $(LLVM_CONFIG) --includedir) \
|
|
-L$(shell $(LLVM_CONFIG) --libdir) \
|
|
-Wl,--start-group -lclangBasic -lclangDriver \
|
|
-lclangFrontend -lclangEdit -lclangLex \
|
|
-lclangAST -Wl,--end-group \
|
|
$(shell $(LLVM_CONFIG) --libs Core option) \
|
|
$(shell $(LLVM_CONFIG) --system-libs) \
|
|
> $(@:.bin=.make.output) 2>&1
|
|
|
|
-include $(OUTPUT)*.d
|
|
|
|
$(OUTPUT)test-libaio.bin:
|
|
$(BUILD) -lrt
|
|
|
|
$(OUTPUT)test-libzstd.bin:
|
|
$(BUILD) -lzstd
|
|
|
|
$(OUTPUT)test-clang-bpf-co-re.bin:
|
|
$(CLANG) -S -g -target bpf -o - $(patsubst %.bin,%.c,$(@F)) | \
|
|
grep BTF_KIND_VAR
|
|
|
|
$(OUTPUT)test-file-handle.bin:
|
|
$(BUILD)
|
|
|
|
$(OUTPUT)test-libpfm4.bin:
|
|
$(BUILD) -lpfm
|
|
|
|
###############################
|
|
|
|
clean:
|
|
rm -f $(FILES) $(OUTPUT)*.d $(FILES:.bin=.make.output)
|