From: Andres Freund <andres@anarazel.de>
To: bpf@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Alexei Starovoitov <ast@kernel.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Jiri Olsa <jolsa@kernel.org>, Sedat Dilek <sedat.dilek@gmail.com>,
Quentin Monnet <quentin@isovalent.com>,
Ben Hutchings <benh@debian.org>
Subject: [PATCH v3 4/8] tools perf: Fix compilation error with new binutils
Date: Sun, 31 Jul 2022 18:38:30 -0700 [thread overview]
Message-ID: <20220801013834.156015-5-andres@anarazel.de> (raw)
In-Reply-To: <20220801013834.156015-1-andres@anarazel.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. 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 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
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de
Signed-off-by: Andres Freund <andres@anarazel.de>
---
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 73e0762092fe..ee417c321adb 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -298,6 +298,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
@@ -905,13 +906,16 @@ ifndef NO_LIBBFD
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 -lz -ldl
endif
endif
$(call feature_check,disassembler-four-args)
+ $(call feature_check,disassembler-init-styled)
endif
ifeq ($(feature-libbfd-buildid), 1)
@@ -1025,6 +1029,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 82cc396ef516..2c6a485c3de5 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1720,6 +1720,7 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil
#include <bpf/btf.h>
#include <bpf/libbpf.h>
#include <linux/btf.h>
+#include <tools/dis-asm-compat.h>
static int symbol__disassemble_bpf(struct symbol *sym,
struct annotate_args *args)
@@ -1762,9 +1763,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.37.0.3.g30cc8d0f14
next prev parent reply other threads:[~2022-08-01 1:38 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-22 18:19 init_disassemble_info() signature changes causes compile failures Andres Freund
2022-06-22 22:53 ` Quentin Monnet
2022-06-22 23:16 ` Andres Freund
2022-06-23 9:49 ` Andrew Burgess
2022-07-03 4:48 ` [PATCH v1 0/3] tools: fix compilation failure caused by init_disassemble_info API changes Andres Freund
2022-07-03 4:48 ` [PATCH v1 1/3] tools build: add feature test for " Andres Freund
2022-07-03 4:48 ` [PATCH v1 2/3] tools: add dis-asm-compat.h to centralize handling of version differences Andres Freund
2022-07-03 4:48 ` [PATCH v1 2/3] tools: introduce dis-asm.h wrapper to hide " Andres Freund
2022-07-03 4:54 ` Andres Freund
2022-07-03 4:48 ` [PATCH v1 3/3] tools: Use tools/dis-asm-compat.h to fix compilation errors with new binutils Andres Freund
2022-07-03 21:25 ` [PATCH v2 0/5] tools: fix compilation failure caused by init_disassemble_info API changes Andres Freund
2022-07-03 21:25 ` [PATCH v2 1/5] tools build: add feature test for " Andres Freund
2022-07-03 21:25 ` [PATCH v2 2/5] tools include: add dis-asm-compat.h to handle version differences Andres Freund
2022-07-05 13:44 ` Quentin Monnet
2022-07-15 19:39 ` Andres Freund
2022-07-15 19:46 ` Andres Freund
2022-07-18 8:58 ` Quentin Monnet
2022-07-03 21:25 ` [PATCH v2 3/5] tools perf: Fix compilation error with new binutils Andres Freund
2022-07-03 21:25 ` [PATCH v2 4/5] tools bpf_jit_disasm: " Andres Freund
2022-07-03 21:25 ` [PATCH v2 5/5] tools bpftool: " Andres Freund
2022-07-04 9:13 ` [PATCH v2 0/5] tools: fix compilation failure caused by init_disassemble_info API changes Jiri Olsa
2022-07-04 20:19 ` Andres Freund
2022-07-04 22:12 ` Jiri Olsa
2022-08-01 1:40 ` Andres Freund
2022-07-10 11:43 ` Sedat Dilek
2022-07-10 17:52 ` Sedat Dilek
2022-07-14 9:16 ` Sedat Dilek
2022-07-14 13:25 ` Ben Hutchings
2022-07-15 19:16 ` Andres Freund
2022-07-15 19:18 ` Ben Hutchings
2022-08-01 18:08 ` Arnaldo Carvalho de Melo
2022-07-27 15:47 ` Arnaldo Carvalho de Melo
2022-07-30 21:45 ` Andres Freund
2022-08-01 1:38 ` [PATCH v3 0/8] " Andres Freund
2022-08-01 1:38 ` [PATCH v3 1/8] tools build: Add feature test for " Andres Freund
2022-08-01 1:38 ` [PATCH v3 2/8] tools build: Don't display disassembler-four-args feature test Andres Freund
2022-08-01 18:10 ` Arnaldo Carvalho de Melo
2022-08-01 1:38 ` [PATCH v3 3/8] tools include: add dis-asm-compat.h to handle version differences Andres Freund
2022-08-01 18:05 ` Arnaldo Carvalho de Melo
2022-08-01 18:10 ` Andres Freund
2022-08-01 1:38 ` Andres Freund [this message]
2022-08-01 1:38 ` [PATCH v3 5/8] tools bpf_jit_disasm: Fix compilation error with new binutils Andres Freund
2022-08-01 1:38 ` [PATCH v3 6/8] tools bpf_jit_disasm: Don't display disassembler-four-args feature test Andres Freund
2022-08-01 18:27 ` Arnaldo Carvalho de Melo
2022-08-01 18:41 ` Andres Freund
2022-08-01 1:38 ` [PATCH v3 7/8] tools bpftool: Fix compilation error with new binutils Andres Freund
2022-08-01 1:38 ` [PATCH v3 8/8] tools bpftool: Don't display disassembler-four-args feature test Andres Freund
2022-08-01 18:28 ` Arnaldo Carvalho de Melo
2022-08-01 12:45 ` [PATCH v3 0/8] tools: fix compilation failure caused by init_disassemble_info API changes Arnaldo Carvalho de Melo
2022-08-01 15:15 ` Quentin Monnet
2022-08-01 18:02 ` Arnaldo Carvalho de Melo
2022-08-08 13:35 ` Daniel Borkmann
2022-08-01 19:53 ` Jiri Olsa
2022-08-01 19:12 ` Sedat Dilek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220801013834.156015-5-andres@anarazel.de \
--to=andres@anarazel.de \
--cc=acme@redhat.com \
--cc=ast@kernel.org \
--cc=benh@debian.org \
--cc=bpf@vger.kernel.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=quentin@isovalent.com \
--cc=sedat.dilek@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).