| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAP-5=fWUevSnyn5MtVO1p6cEVE8MvBTq4Qgth7RcPYueRERQKA@mail.gmail.com>
Date: Mon, 17 Apr 2023 10:14:51 -0700
From: Ian Rogers <irogers@...gle.com>
To: Anders Roxell <anders.roxell@...aro.org>
Cc: stable@...r.kernel.org, acme@...hat.com, andres@...razel.de,
linux-kernel@...r.kernel.org, linux-perf-users@...r.kernel.org,
Quentin Monnet <quentin@...valent.com>,
Alexei Starovoitov <ast@...nel.org>,
Ben Hutchings <benh@...ian.org>, Jiri Olsa <jolsa@...nel.org>,
Sedat Dilek <sedat.dilek@...il.com>, bpf@...r.kernel.org
Subject: Re: [backport PATCH 1/2] tools perf: Fix compilation error with new binutils
On Mon, Apr 17, 2023 at 5:30 AM Anders Roxell <anders.roxell@...aro.org> wrote:
>
> From: Andres Freund <andres@...razel.de>
>
> binutils changed the signature of init_disassemble_info(), which now causes
> compilation failures for tools/perf/util/annotate.c, e.g. on debian
> unstable.
Thanks, I believe the compilation issue may well be resolved by:
https://lore.kernel.org/lkml/20230311065753.3012826-8-irogers@google.com/
where binutils is made opt-in rather than opt-out.
> 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 was kind of surprised to see no version check ifdef. Is
init_disassemble_info_compat is supported in older binutils?
Thanks,
Ian
> I verified that perf can still disassemble bpf programs by using bpftrace
> under load, recording a perf trace, and then annotating the bpf "function"
> with and without the changes. 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:
>
> 1.15 : 55:mov %rbp,%rdx
> 0.00 : 58:add $0xfffffffffffffff8,%rdx
> 0.00 : 5c:xor %ecx,%ecx
> - 1.03 : 5e:callq 0xffffffffe12aca3c
> + 1.03 : 5e:call 0xffffffffe12aca3c
> 0.00 : 63:xor %eax,%eax
> - 2.18 : 65:leaveq
> - 2.82 : 66:retq
> + 2.18 : 65:leave
> + 2.82 : 66:ret
>
> Signed-off-by: Andres Freund <andres@...razel.de>
> Acked-by: Quentin Monnet <quentin@...valent.com>
> Cc: Alexei Starovoitov <ast@...nel.org>
> Cc: Ben Hutchings <benh@...ian.org>
> Cc: Jiri Olsa <jolsa@...nel.org>
> Cc: Sedat Dilek <sedat.dilek@...il.com>
> Cc: bpf@...r.kernel.org
> Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de
> Link: https://lore.kernel.org/r/20220801013834.156015-5-andres@anarazel.de
> Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
> Signed-off-by: Anders Roxell <anders.roxell@...aro.org>
> ---
> tools/perf/Makefile.config | 8 ++++++++
> tools/perf/util/annotate.c | 7 ++++---
> 2 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
> index 3e7706c251e9..55905571f87b 100644
> --- a/tools/perf/Makefile.config
> +++ b/tools/perf/Makefile.config
> @@ -281,6 +281,7 @@ FEATURE_CHECK_LDFLAGS-libpython := $(PYTHON_EMBED_LDOPTS)
> FEATURE_CHECK_LDFLAGS-libaio = -lrt
>
> FEATURE_CHECK_LDFLAGS-disassembler-four-args = -lbfd -lopcodes -ldl
> +FEATURE_CHECK_LDFLAGS-disassembler-init-styled = -lbfd -lopcodes -ldl
>
> CORE_CFLAGS += -fno-omit-frame-pointer
> CORE_CFLAGS += -ggdb3
> @@ -838,13 +839,16 @@ else
> ifeq ($(feature-libbfd-liberty), 1)
> EXTLIBS += -lbfd -lopcodes -liberty
> FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -ldl
> + FEATURE_CHECK_LDFLAGS-disassembler-init-styled += -liberty -ldl
> else
> ifeq ($(feature-libbfd-liberty-z), 1)
> EXTLIBS += -lbfd -lopcodes -liberty -lz
> FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -lz -ldl
> + FEATURE_CHECK_LDFLAGS-disassembler-init-styled += -liberty -ldl
> endif
> endif
> $(call feature_check,disassembler-four-args)
> + $(call feature_check,disassembler-init-styled)
> endif
>
> ifeq ($(feature-libbfd-buildid), 1)
> @@ -957,6 +961,10 @@ ifeq ($(feature-disassembler-four-args), 1)
> CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE
> endif
>
> +ifeq ($(feature-disassembler-init-styled), 1)
> + CFLAGS += -DDISASM_INIT_STYLED
> +endif
> +
> ifeq (${IS_64_BIT}, 1)
> ifndef NO_PERF_READ_VDSO32
> $(call feature_check,compile-32)
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index 308189454788..f2d1741b7610 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -1684,6 +1684,7 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil
> #define PACKAGE "perf"
> #include <bfd.h>
> #include <dis-asm.h>
> +#include <tools/dis-asm-compat.h>
>
> static int symbol__disassemble_bpf(struct symbol *sym,
> struct annotate_args *args)
> @@ -1726,9 +1727,9 @@ static int symbol__disassemble_bpf(struct symbol *sym,
> ret = errno;
> goto out;
> }
> - init_disassemble_info(&info, s,
> - (fprintf_ftype) fprintf);
> -
> + init_disassemble_info_compat(&info, s,
> + (fprintf_ftype) fprintf,
> + fprintf_styled);
> info.arch = bfd_get_arch(bfdf);
> info.mach = bfd_get_mach(bfdf);
>
> --
> 2.39.2
>
Powered by blists - more mailing lists