Message ID | 20220801013834.156015-7-andres@anarazel.de (mailing list archive) |
---|---|
State | Awaiting Upstream |
Delegated to: | BPF |
Headers | show |
Series | tools: fix compilation failure caused by init_disassemble_info API changes | expand |
Context | Check | Description |
---|---|---|
netdev/tree_selection | success | Not a local patch |
bpf/vmtest-bpf-VM_Test-1 | success | Logs for Kernel LATEST on ubuntu-latest with gcc |
bpf/vmtest-bpf-VM_Test-2 | success | Logs for Kernel LATEST on ubuntu-latest with llvm-16 |
bpf/vmtest-bpf-VM_Test-3 | success | Logs for Kernel LATEST on z15 with gcc |
bpf/vmtest-bpf-PR | success | PR summary |
Em Sun, Jul 31, 2022 at 06:38:32PM -0700, Andres Freund escreveu: > The feature check does not seem important enough to display. Suggested by > Jiri Olsa. > > Cc: Jiri Olsa <jolsa@kernel.org> > Cc: Alexei Starovoitov <ast@kernel.org> > Cc: Daniel Borkmann <daniel@iogearbox.net> > Cc: Sedat Dilek <sedat.dilek@gmail.com> > Cc: Quentin Monnet <quentin@isovalent.com> > Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de > Signed-off-by: Andres Freund <andres@anarazel.de> > --- > tools/bpf/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/bpf/Makefile b/tools/bpf/Makefile > index 664601ab1705..243b79f2b451 100644 > --- a/tools/bpf/Makefile > +++ b/tools/bpf/Makefile > @@ -35,7 +35,7 @@ endif > > FEATURE_USER = .bpf > FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled > -FEATURE_DISPLAY = libbfd disassembler-four-args > +FEATURE_DISPLAY = libbfd > > check_feat := 1 > NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean resolve_btfids_clean > -- > 2.37.0.3.g30cc8d0f14 After this patch: ⬢[acme@toolbox perf]$ git log --oneline -7 cebe4f3a4a0af5bf (HEAD) tools bpf_jit_disasm: Don't display disassembler-four-args feature test 7f62593e5582cb27 tools bpf_jit_disasm: Fix compilation error with new binutils ee4dc290ee5c09b7 tools perf: Fix compilation error with new binutils 335f8d183a609793 tools include: add dis-asm-compat.h to handle version differences f2f95e8d0def9c5f tools build: Don't display disassembler-four-args feature test ede0fece841bb743 tools build: Add feature test for init_disassemble_info API changes 00b32625982e0c79 perf test: Add ARM SPE system wide test ⬢[acme@toolbox perf]$ ⬢[acme@toolbox perf]$ make -C tools/bpf/bpftool/ clean make: Entering directory '/var/home/acme/git/perf/tools/bpf/bpftool' CLEAN libbpf CLEAN libbpf-bootstrap CLEAN feature-detect CLEAN bpftool CLEAN core-gen make: Leaving directory '/var/home/acme/git/perf/tools/bpf/bpftool' ⬢[acme@toolbox perf]$ make -C tools/bpf/bpftool/ make: Entering directory '/var/home/acme/git/perf/tools/bpf/bpftool' Auto-detecting system features: ... libbfd: [ on ] ... disassembler-four-args: [ on ] ... zlib: [ on ] ... libcap: [ on ] ... clang-bpf-co-re: [ on ] <SNIP> It is still there, we need the hunk below, that I folded into your patch, to disable it, please ack :-) - Arnaldo diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile index c6d2c77d02524a37..a92fb4d312ec2363 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile @@ -95,7 +95,7 @@ RM ?= rm -f FEATURE_USER = .bpftool FEATURE_TESTS = libbfd disassembler-four-args zlib libcap \ clang-bpf-co-re -FEATURE_DISPLAY = libbfd disassembler-four-args zlib libcap \ +FEATURE_DISPLAY = libbfd zlib libcap \ clang-bpf-co-re check_feat := 1
Hi, On 2022-08-01 15:27:22 -0300, Arnaldo Carvalho de Melo wrote: > ⬢[acme@toolbox perf]$ git log --oneline -7 > cebe4f3a4a0af5bf (HEAD) tools bpf_jit_disasm: Don't display disassembler-four-args feature test > 7f62593e5582cb27 tools bpf_jit_disasm: Fix compilation error with new binutils > ee4dc290ee5c09b7 tools perf: Fix compilation error with new binutils > 335f8d183a609793 tools include: add dis-asm-compat.h to handle version differences > f2f95e8d0def9c5f tools build: Don't display disassembler-four-args feature test > ede0fece841bb743 tools build: Add feature test for init_disassemble_info API changes > 00b32625982e0c79 perf test: Add ARM SPE system wide test > ⬢[acme@toolbox perf]$ > > ⬢[acme@toolbox perf]$ make -C tools/bpf/bpftool/ clean > make: Entering directory '/var/home/acme/git/perf/tools/bpf/bpftool' > CLEAN libbpf > CLEAN libbpf-bootstrap > CLEAN feature-detect > CLEAN bpftool > CLEAN core-gen > make: Leaving directory '/var/home/acme/git/perf/tools/bpf/bpftool' > ⬢[acme@toolbox perf]$ make -C tools/bpf/bpftool/ > make: Entering directory '/var/home/acme/git/perf/tools/bpf/bpftool' > > Auto-detecting system features: > ... libbfd: [ on ] > ... disassembler-four-args: [ on ] > ... zlib: [ on ] > ... libcap: [ on ] > ... clang-bpf-co-re: [ on ] > <SNIP> > > It is still there, we need the hunk below, that I folded into your patch, to > disable it, please ack :-) This commit just removed disassembler-four-args display for bpf_jit_disasm, not bpftool. That should be in a later commit. Greetings, Andres Freund
diff --git a/tools/bpf/Makefile b/tools/bpf/Makefile index 664601ab1705..243b79f2b451 100644 --- a/tools/bpf/Makefile +++ b/tools/bpf/Makefile @@ -35,7 +35,7 @@ endif FEATURE_USER = .bpf FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled -FEATURE_DISPLAY = libbfd disassembler-four-args +FEATURE_DISPLAY = libbfd check_feat := 1 NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean resolve_btfids_clean
The feature check does not seem important enough to display. Suggested by Jiri Olsa. Cc: Jiri Olsa <jolsa@kernel.org> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Sedat Dilek <sedat.dilek@gmail.com> Cc: Quentin Monnet <quentin@isovalent.com> Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de Signed-off-by: Andres Freund <andres@anarazel.de> --- tools/bpf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)