mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-28 05:24:47 +08:00
1c27fab243
commit96ed066054upstream. binutils changed the signature of init_disassemble_info(), which now causes compilation to fail for tools/bpf/bpf_jit_disasm.c, e.g. on debian unstable. Relevant binutils commit: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07 Wire up the feature test and switch to init_disassemble_info_compat(), which were introduced in prior commits, fixing the compilation failure. I verified that bpf_jit_disasm can still disassemble bpf programs, both with the old and new dis-asm.h API. With old binutils there's no change in output before/after this patch. When comparing the output from old binutils (2.35) to new bintuils with the patch (upstream snapshot) there are a few output differences, but they are unrelated to this patch. An example hunk is: f4: mov %r14,%rsi f7: mov %r15,%rdx fa: mov $0x2a,%ecx - ff: callq 0xffffffffea8c4988 + ff: call 0xffffffffea8c4988 104: test %rax,%rax 107: jge 0x0000000000000110 109: xor %eax,%eax - 10b: jmpq 0x0000000000000073 + 10b: jmp 0x0000000000000073 110: cmp $0x16,%rax However, I had to use an older kernel to generate the bpf_jit_enabled = 2 output, as that has been broken since 5.18 /1022a5498f("bpf, x86_64: Use bpf_jit_binary_pack_alloc"). https://lore.kernel.org/20220703030210.pmjft7qc2eajzi6c@alap3.anarazel.de Signed-off-by: Andres Freund <andres@anarazel.de> Acked-by: Quentin Monnet <quentin@isovalent.com> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Ben Hutchings <benh@debian.org> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Quentin Monnet <quentin@isovalent.com> Cc: Sedat Dilek <sedat.dilek@gmail.com> Cc: bpf@vger.kernel.org Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de Link: https://lore.kernel.org/r/20220801013834.156015-6-andres@anarazel.de Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
136 lines
3.6 KiB
Makefile
136 lines
3.6 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
include ../scripts/Makefile.include
|
|
|
|
prefix ?= /usr/local
|
|
|
|
LEX = flex
|
|
YACC = bison
|
|
MAKE = make
|
|
INSTALL ?= install
|
|
|
|
CFLAGS += -Wall -O2
|
|
CFLAGS += -D__EXPORTED_HEADERS__ -I$(srctree)/tools/include/uapi \
|
|
-I$(srctree)/tools/include
|
|
|
|
# This will work when bpf is built in tools env. where srctree
|
|
# isn't set and when invoked from selftests build, where srctree
|
|
# is set to ".". building_out_of_srctree is undefined for in srctree
|
|
# builds
|
|
ifeq ($(srctree),)
|
|
update_srctree := 1
|
|
endif
|
|
ifndef building_out_of_srctree
|
|
update_srctree := 1
|
|
endif
|
|
ifeq ($(update_srctree),1)
|
|
srctree := $(patsubst %/,%,$(dir $(CURDIR)))
|
|
srctree := $(patsubst %/,%,$(dir $(srctree)))
|
|
endif
|
|
|
|
ifeq ($(V),1)
|
|
Q =
|
|
else
|
|
Q = @
|
|
endif
|
|
|
|
FEATURE_USER = .bpf
|
|
FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled
|
|
FEATURE_DISPLAY = libbfd disassembler-four-args
|
|
|
|
check_feat := 1
|
|
NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean resolve_btfids_clean
|
|
ifdef MAKECMDGOALS
|
|
ifeq ($(filter-out $(NON_CHECK_FEAT_TARGETS),$(MAKECMDGOALS)),)
|
|
check_feat := 0
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(check_feat),1)
|
|
ifeq ($(FEATURES_DUMP),)
|
|
include $(srctree)/tools/build/Makefile.feature
|
|
else
|
|
include $(FEATURES_DUMP)
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(feature-disassembler-four-args), 1)
|
|
CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE
|
|
endif
|
|
ifeq ($(feature-disassembler-init-styled), 1)
|
|
CFLAGS += -DDISASM_INIT_STYLED
|
|
endif
|
|
|
|
$(OUTPUT)%.yacc.c: $(srctree)/tools/bpf/%.y
|
|
$(QUIET_BISON)$(YACC) -o $@ -d $<
|
|
|
|
$(OUTPUT)%.lex.c: $(srctree)/tools/bpf/%.l
|
|
$(QUIET_FLEX)$(LEX) -o $@ $<
|
|
|
|
$(OUTPUT)%.o: $(srctree)/tools/bpf/%.c
|
|
$(QUIET_CC)$(CC) $(CFLAGS) -c -o $@ $<
|
|
|
|
$(OUTPUT)%.yacc.o: $(OUTPUT)%.yacc.c
|
|
$(QUIET_CC)$(CC) $(CFLAGS) -c -o $@ $<
|
|
$(OUTPUT)%.lex.o: $(OUTPUT)%.lex.c
|
|
$(QUIET_CC)$(CC) $(CFLAGS) -c -o $@ $<
|
|
|
|
PROGS = $(OUTPUT)bpf_jit_disasm $(OUTPUT)bpf_dbg $(OUTPUT)bpf_asm
|
|
|
|
all: $(PROGS) bpftool runqslower
|
|
|
|
$(OUTPUT)bpf_jit_disasm: CFLAGS += -DPACKAGE='bpf_jit_disasm'
|
|
$(OUTPUT)bpf_jit_disasm: $(OUTPUT)bpf_jit_disasm.o
|
|
$(QUIET_LINK)$(CC) $(CFLAGS) -o $@ $^ -lopcodes -lbfd -ldl
|
|
|
|
$(OUTPUT)bpf_dbg: $(OUTPUT)bpf_dbg.o
|
|
$(QUIET_LINK)$(CC) $(CFLAGS) -o $@ $^ -lreadline
|
|
|
|
$(OUTPUT)bpf_asm: $(OUTPUT)bpf_asm.o $(OUTPUT)bpf_exp.yacc.o $(OUTPUT)bpf_exp.lex.o
|
|
$(QUIET_LINK)$(CC) $(CFLAGS) -o $@ $^
|
|
|
|
$(OUTPUT)bpf_exp.lex.c: $(OUTPUT)bpf_exp.yacc.c
|
|
$(OUTPUT)bpf_exp.yacc.o: $(OUTPUT)bpf_exp.yacc.c
|
|
$(OUTPUT)bpf_exp.lex.o: $(OUTPUT)bpf_exp.lex.c
|
|
|
|
clean: bpftool_clean runqslower_clean resolve_btfids_clean
|
|
$(call QUIET_CLEAN, bpf-progs)
|
|
$(Q)$(RM) -r -- $(OUTPUT)*.o $(OUTPUT)bpf_jit_disasm $(OUTPUT)bpf_dbg \
|
|
$(OUTPUT)bpf_asm $(OUTPUT)bpf_exp.yacc.* $(OUTPUT)bpf_exp.lex.*
|
|
$(call QUIET_CLEAN, core-gen)
|
|
$(Q)$(RM) -- $(OUTPUT)FEATURE-DUMP.bpf
|
|
$(Q)$(RM) -r -- $(OUTPUT)feature
|
|
|
|
install: $(PROGS) bpftool_install
|
|
$(call QUIET_INSTALL, bpf_jit_disasm)
|
|
$(Q)$(INSTALL) -m 0755 -d $(DESTDIR)$(prefix)/bin
|
|
$(Q)$(INSTALL) $(OUTPUT)bpf_jit_disasm $(DESTDIR)$(prefix)/bin/bpf_jit_disasm
|
|
$(call QUIET_INSTALL, bpf_dbg)
|
|
$(Q)$(INSTALL) $(OUTPUT)bpf_dbg $(DESTDIR)$(prefix)/bin/bpf_dbg
|
|
$(call QUIET_INSTALL, bpf_asm)
|
|
$(Q)$(INSTALL) $(OUTPUT)bpf_asm $(DESTDIR)$(prefix)/bin/bpf_asm
|
|
|
|
bpftool:
|
|
$(call descend,bpftool)
|
|
|
|
bpftool_install:
|
|
$(call descend,bpftool,install)
|
|
|
|
bpftool_clean:
|
|
$(call descend,bpftool,clean)
|
|
|
|
runqslower:
|
|
$(call descend,runqslower)
|
|
|
|
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_clean \
|
|
resolve_btfids resolve_btfids_clean
|