binutils-2.39.patch

   1 From patchwork Mon Aug  1 01:38:27 2022
   2 Content-Type: text/plain; charset="utf-8"
   3 MIME-Version: 1.0
   4 Content-Transfer-Encoding: 7bit
   5 X-Patchwork-Submitter: Andres Freund <andres@anarazel.de>
   6 X-Patchwork-Id: 12933313
   7 X-Patchwork-Delegate: bpf@iogearbox.net
   8 Return-Path: <bpf-owner@kernel.org>
   9 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
  10         aws-us-west-2-korg-lkml-1.web.codeaurora.org
  11 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
  12         by smtp.lore.kernel.org (Postfix) with ESMTP id 9E6F7C19F2C
  13         for <bpf@archiver.kernel.org>; Mon,  1 Aug 2022 01:38:44 +0000 (UTC)
  14 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
  15         id S238796AbiHABin (ORCPT <rfc822;bpf@archiver.kernel.org>);
  16         Sun, 31 Jul 2022 21:38:43 -0400
  17 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48010 "EHLO
  18         lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
  19         with ESMTP id S238753AbiHABil (ORCPT <rfc822;bpf@vger.kernel.org>);
  20         Sun, 31 Jul 2022 21:38:41 -0400
  21 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com
  22  [64.147.123.24])
  23         by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FE02D100;
  24         Sun, 31 Jul 2022 18:38:40 -0700 (PDT)
  25 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45])
  26         by mailout.west.internal (Postfix) with ESMTP id 6880632005D8;
  27         Sun, 31 Jul 2022 21:38:37 -0400 (EDT)
  28 Received: from mailfrontend1 ([10.202.2.162])
  29   by compute5.internal (MEProxy); Sun, 31 Jul 2022 21:38:38 -0400
  30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anarazel.de; h=
  31         cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to
  32         :in-reply-to:message-id:mime-version:references:reply-to:sender
  33         :subject:subject:to:to; s=fm3; t=1659317916; x=1659404316; bh=mw
  34         HT53oEdmgh2incFIsZytWOGuM1iKeKZ98Mr0aqk+o=; b=oI5JViG/wLwbjvozJE
  35         FsC9MYTYIX5j0WbwLixwHirqd70d0gSawcJgSbKuYLuSceqjh0pw8IcENtrbketx
  36         QbesEg6ho0LQ2SKd+ms2dbPBQiuGE6e0eHcqmnDPKoSEZ8G078227s1wnjoHS8St
  37         m/XMMMitrpObCZeZDI6MlXv1JOebnd9HmpKk1Tda0KAA1JdCQRB7f36pDIqYJfWC
  38         M8RQ7lZB0ieI9ERxroUsIh2MWAwyMYmeViBajCXmwu67P/rbvkgZSTelHqGY7iYh
  39         s01Nr4Rr2rBsDN1k+cNOgNB9Ku6/1da5vqbdo6E+qS1q2i+tmnfAtKaXZE1RoNZo
  40         FbQg==
  41 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
  42         messagingengine.com; h=cc:cc:content-transfer-encoding:date:date
  43         :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to
  44         :message-id:mime-version:references:reply-to:sender:subject
  45         :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender
  46         :x-sasl-enc; s=fm3; t=1659317916; x=1659404316; bh=mwHT53oEdmgh2
  47         incFIsZytWOGuM1iKeKZ98Mr0aqk+o=; b=NpOvo10qFST+h13Zb5eJ2SU5Zf5Xz
  48         p8BPjAmE6yjNreQYLiTgvEn9plYR6gbLkDb6O/QRYN9frbkyphH3qNch2hLXQ89A
  49         0fo28HDjtP8RBDVi7vmQ5ql4FNvmcVOllFIEGqlZjt5UWn3HUgmc+brxyToazI2S
  50         typ5WEdtn3TOl+SO2DcDvbHbG7OfiDjUEiRGfFRV6cDxsW1k8htUxYD4XMVjT7uY
  51         khbAAf7gkhrWTCGkAJvuH526RpyORVKBu3cPS4/5VWdnWMX3oZ2421RMq1Uwx5ve
  52         qn28LYrRRPWx6NUVn5iO8VfenSU/Xz3gL3zEYfwSud8LBjspF2Tk0+EBQ==
  53 X-ME-Sender: <xms:nC7nYn8AJ3SxXLEum9MNW3yZv4kVjs89kcxvCl91doljZ0fskF3hYw>
  54     <xme:nC7nYjtsF16C73JK3UaQZjO11yrJe2UhsFudrdkFB67AbQBo51vJOHIlDpHB2iKYu
  55     LVTUPbFVtEClCPnCQ>
  56 X-ME-Received:
  57  <xmr:nC7nYlBv-gJ8hmv6HFXVVFI84tmN2_XgeYrfDX08LSZeQlFyRjYjXqfrulzP5Tb9dOfNlQsk_hZ2hpAFjz03KRplV4KGb6LzI79eIIPbJLScq6K0AsEVLg3k00iE>
  58 X-ME-Proxy-Cause:
  59  gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddggedtucetufdoteggodetrfdotf
  60     fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
  61     uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
  62     cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptehnughr
  63     vghsucfhrhgvuhhnugcuoegrnhgurhgvshesrghnrghrrgiivghlrdguvgeqnecuggftrf
  64     grthhtvghrnhepleejgfdvfefhudektddtveegtdekieegffdtkeeljeetudevffeltdei
  65     feeugeeinecuffhomhgrihhnpehsohhurhgtvgifrghrvgdrohhrghdpkhgvrhhnvghlrd
  66     horhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhep
  67     rghnughrvghssegrnhgrrhgriigvlhdruggv
  68 X-ME-Proxy: <xmx:nC7nYjexRoccBT20fjUmTMeYQvxCeylZFMpJJBJMrRRHhZ4UlSJXjQ>
  69     <xmx:nC7nYsOiSGnoCK6IwZY1ny2xfv-qfpxSnq1CplbTK15ngQQf0LQD-g>
  70     <xmx:nC7nYlkb07xeJsRiPWTotNGlRRSjneDnI54P0Kg6duvSg7V-DZm13A>
  71     <xmx:nC7nYoCD4VAPDX5FULWlFvJSXC6bLN--zH3mLsUk10ouD3pXwjlnXg>
  72 Feedback-ID: id4a34324:Fastmail
  73 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun,
  74  31 Jul 2022 21:38:36 -0400 (EDT)
  75 From: Andres Freund <andres@anarazel.de>
  76 To: bpf@vger.kernel.org, linux-kernel@vger.kernel.org
  77 Cc: Alexei Starovoitov <ast@kernel.org>,
  78         Arnaldo Carvalho de Melo <acme@redhat.com>,
  79         Jiri Olsa <jolsa@kernel.org>,
  80         Sedat Dilek <sedat.dilek@gmail.com>,
  81         Quentin Monnet <quentin@isovalent.com>,
  82         Ben Hutchings <benh@debian.org>
  83 Subject: [PATCH v3 1/8] tools build: Add feature test for
  84  init_disassemble_info API changes
  85 Date: Sun, 31 Jul 2022 18:38:27 -0700
  86 Message-Id: <20220801013834.156015-2-andres@anarazel.de>
  87 X-Mailer: git-send-email 2.37.0.3.g30cc8d0f14
  88 In-Reply-To: <20220801013834.156015-1-andres@anarazel.de>
  89 References: <20220622231624.t63bkmkzphqvh3kx@alap3.anarazel.de>
  90  <20220801013834.156015-1-andres@anarazel.de>
  91 MIME-Version: 1.0
  92 Precedence: bulk
  93 List-ID: <bpf.vger.kernel.org>
  94 X-Mailing-List: bpf@vger.kernel.org
  95
  96 binutils changed the signature of init_disassemble_info(), which now causes
  97 compilation failures for tools/{perf,bpf}, e.g. on debian unstable.
  98 Relevant binutils commit:
  99 https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07
 100
 101 This commit adds a feature test to detect the new signature.  Subsequent
 102 commits will use it to fix the build failures.
 103
 104 Cc: Alexei Starovoitov <ast@kernel.org>
 105 Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
 106 Cc: Sedat Dilek <sedat.dilek@gmail.com>
 107 Cc: Quentin Monnet <quentin@isovalent.com>
 108 Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de
 109 Signed-off-by: Andres Freund <andres@anarazel.de>
 110 ---
 111  tools/build/Makefile.feature                        |  1 +
 112  tools/build/feature/Makefile                        |  4 ++++
 113  tools/build/feature/test-all.c                      |  4 ++++
 114  tools/build/feature/test-disassembler-init-styled.c | 13 +++++++++++++
 115  4 files changed, 22 insertions(+)
 116  create mode 100644 tools/build/feature/test-disassembler-init-styled.c
 117
 118 diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
 119 index 888a0421d43b..8f6578e4d324 100644
 120 --- a/tools/build/Makefile.feature
 121 +++ b/tools/build/Makefile.feature
 122 @@ -70,6 +70,7 @@ FEATURE_TESTS_BASIC :=                  \
 123          libaio                         \
 124          libzstd                                \
 125          disassembler-four-args         \
 126 +        disassembler-init-styled       \
 127          file-handle
 128
 129  # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list
 130 diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
 131 index 7c2a17e23c30..c3059739318a 100644
 132 --- a/tools/build/feature/Makefile
 133 +++ b/tools/build/feature/Makefile
 134 @@ -18,6 +18,7 @@ FILES=                                          \
 135           test-libbfd.bin                        \
 136           test-libbfd-buildid.bin               \
 137           test-disassembler-four-args.bin        \
 138 +         test-disassembler-init-styled.bin     \
 139           test-reallocarray.bin                 \
 140           test-libbfd-liberty.bin                \
 141           test-libbfd-liberty-z.bin              \
 142 @@ -248,6 +249,9 @@ $(OUTPUT)test-libbfd-buildid.bin:
 143  $(OUTPUT)test-disassembler-four-args.bin:
 144         $(BUILD) -DPACKAGE='"perf"' -lbfd -lopcodes
 145
 146 +$(OUTPUT)test-disassembler-init-styled.bin:
 147 +       $(BUILD) -DPACKAGE='"perf"' -lbfd -lopcodes
 148 +
 149  $(OUTPUT)test-reallocarray.bin:
 150         $(BUILD)
 151
 152 diff --git a/tools/build/feature/test-all.c b/tools/build/feature/test-all.c
 153 index 5ffafb967b6e..957c02c7b163 100644
 154 --- a/tools/build/feature/test-all.c
 155 +++ b/tools/build/feature/test-all.c
 156 @@ -166,6 +166,10 @@
 157  # include "test-disassembler-four-args.c"
 158  #undef main
 159
 160 +#define main main_test_disassembler_init_styled
 161 +# include "test-disassembler-init-styled.c"
 162 +#undef main
 163 +
 164  #define main main_test_libzstd
 165  # include "test-libzstd.c"
 166  #undef main
 167 diff --git a/tools/build/feature/test-disassembler-init-styled.c b/tools/build/feature/test-disassembler-init-styled.c
 168 new file mode 100644
 169 index 000000000000..f1ce0ec3bee9
 170 --- /dev/null
 171 +++ b/tools/build/feature/test-disassembler-init-styled.c
 172 @@ -0,0 +1,13 @@
 173 +// SPDX-License-Identifier: GPL-2.0
 174 +#include <stdio.h>
 175 +#include <dis-asm.h>
 176 +
 177 +int main(void)
 178 +{
 179 +       struct disassemble_info info;
 180 +
 181 +       init_disassemble_info(&info, stdout,
 182 +                             NULL, NULL);
 183 +
 184 +       return 0;
 185 +}
 186
 187 From patchwork Mon Aug  1 01:38:28 2022
 188 Content-Type: text/plain; charset="utf-8"
 189 MIME-Version: 1.0
 190 Content-Transfer-Encoding: 7bit
 191 X-Patchwork-Submitter: Andres Freund <andres@anarazel.de>
 192 X-Patchwork-Id: 12933314
 193 X-Patchwork-Delegate: bpf@iogearbox.net
 194 Return-Path: <bpf-owner@kernel.org>
 195 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
 196         aws-us-west-2-korg-lkml-1.web.codeaurora.org
 197 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
 198         by smtp.lore.kernel.org (Postfix) with ESMTP id C6F33C00140
 199         for <bpf@archiver.kernel.org>; Mon,  1 Aug 2022 01:38:46 +0000 (UTC)
 200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
 201         id S238800AbiHABio (ORCPT <rfc822;bpf@archiver.kernel.org>);
 202         Sun, 31 Jul 2022 21:38:44 -0400
 203 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48014 "EHLO
 204         lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
 205         with ESMTP id S238763AbiHABil (ORCPT <rfc822;bpf@vger.kernel.org>);
 206         Sun, 31 Jul 2022 21:38:41 -0400
 207 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com
 208  [64.147.123.24])
 209         by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 352FFD117;
 210         Sun, 31 Jul 2022 18:38:40 -0700 (PDT)
 211 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46])
 212         by mailout.west.internal (Postfix) with ESMTP id 89CD43200657;
 213         Sun, 31 Jul 2022 21:38:37 -0400 (EDT)
 214 Received: from mailfrontend1 ([10.202.2.162])
 215   by compute2.internal (MEProxy); Sun, 31 Jul 2022 21:38:38 -0400
 216 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anarazel.de; h=
 217         cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to
 218         :in-reply-to:message-id:mime-version:references:reply-to:sender
 219         :subject:subject:to:to; s=fm3; t=1659317916; x=1659404316; bh=dV
 220         c9P++/u7qpDN8YdVfqt3p7KluPysUuZhmsQzEDFw4=; b=foAdVuru3iETy4FWr2
 221         vCW7fzK5U2czaPK9CwCLTo0yDTjCjPqlgRDkD0+/2CLRa3AHDGDcx/kHE8zFnvr+
 222         DmS8VZA2WGj3pmWAQM524ACeQlW38CfkRi7Qt3tpmNpmVn1RhqwrH5cXLFcCUztK
 223         Ln718HRHlMWb+I4sCpcM0oxxh76oShGccsD2jXEnjYtvvByjYnaRCspZFFdhdUub
 224         IxBiJDCtruRwhrV2U6V3L5vAyi36Op9RKZBKBMZPRzLVY3oyWdUa82vaBbLAKHYU
 225         eyrSZJB1P/tfQtFhBx3Kn/T5Yk20QjhxYekGP9ceAwjWBPzi0HpodUn5Ic2VuQDu
 226         FJ+A==
 227 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 228         messagingengine.com; h=cc:cc:content-transfer-encoding:date:date
 229         :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to
 230         :message-id:mime-version:references:reply-to:sender:subject
 231         :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender
 232         :x-sasl-enc; s=fm3; t=1659317916; x=1659404316; bh=dVc9P++/u7qpD
 233         N8YdVfqt3p7KluPysUuZhmsQzEDFw4=; b=UVRAmjU0y2ASWjXq6mgqu1H+5uCag
 234         UHnfOps0MrFz7aSRMSX4rYBXFXRiueHV3n3Yj75s+sGAJG1MZvxCL3v+y5ZMyQ2m
 235         C19XSGHCuNBfTnOOHXbT1D5rfQNsrqXw+leLjBJ2enUuK5I6bSBgAXuKULIQpvZU
 236         D1xRKhLy28alRe8rJOa1H39xM18tdqvkT3R+8wCnGj9D2CZIeCOsQRvewEuOpx/F
 237         5cgpmBOUVdAK9CZpqcELGBhg+7pBYEAcosIlnQZ6ARcQCcUdo1JNbL6ZcDpLwtY0
 238         hclzScYCLEbkzdWLJeRQpDVbQqCGsqtUNk276eXOJT2W92JFeCeqNAz+g==
 239 X-ME-Sender: <xms:nC7nYnjYamhK0M0qJz9-UyuKGb3yLk9Um-NAYip_zO8D3N9W7U2YiA>
 240     <xme:nC7nYkAXkFpUaAlmQ6nHn7zjVFoMpnXbe3BqDD56vrR_-oUd7CwkLmDVXTCFpuLkh
 241     GdOMTGImYHCZNqmZg>
 242 X-ME-Received:
 243  <xmr:nC7nYnG-neouc1lhmU7NrRRb8C0aUnZyN3hQnxO_vIzBexsdQbakEAlkSkWcgZFnPvQIAALqHGKWs7zBkcn0dHQ4q-uLcGZQcTAhTTA50ZMsgPbyhzf5DJl1BC2P>
 244 X-ME-Proxy-Cause:
 245  gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddggedtucetufdoteggodetrfdotf
 246     fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
 247     uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
 248     cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptehnughr
 249     vghsucfhrhgvuhhnugcuoegrnhgurhgvshesrghnrghrrgiivghlrdguvgeqnecuggftrf
 250     grthhtvghrnhepueduhedvjeeigfejvdfhgffhhfetteetfeffieehtdehjeeglefgffdu
 251     udejfffhnecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucevlhhushhtvghrufhiii
 252     gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegrnhgurhgvshesrghnrghrrgiivghl
 253     rdguvg
 254 X-ME-Proxy: <xmx:nC7nYkQIU3FELKpzdbueN4mOzZZFWmV_h33ghPg5xeE75C2m8iDTug>
 255     <xmx:nC7nYkxhu6wnTw1XiH_7-OJKu5mXwy9OUO6qMEUllSrlachBYNXwnQ>
 256     <xmx:nC7nYq5RKQCSOovFLsgml1T7nKqa-_79nHOmcEa8bPr_ehc_32dDJw>
 257     <xmx:nC7nYrlLnxq3M8TG7dlQdnWmP6HvBxVWE_8HcxMotV_KbLVXH-OIQA>
 258 Feedback-ID: id4a34324:Fastmail
 259 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun,
 260  31 Jul 2022 21:38:36 -0400 (EDT)
 261 From: Andres Freund <andres@anarazel.de>
 262 To: bpf@vger.kernel.org, linux-kernel@vger.kernel.org
 263 Cc: Alexei Starovoitov <ast@kernel.org>,
 264         Arnaldo Carvalho de Melo <acme@redhat.com>,
 265         Jiri Olsa <jolsa@kernel.org>,
 266         Sedat Dilek <sedat.dilek@gmail.com>,
 267         Quentin Monnet <quentin@isovalent.com>,
 268         Ben Hutchings <benh@debian.org>
 269 Subject: [PATCH v3 2/8] tools build: Don't display disassembler-four-args
 270  feature test
 271 Date: Sun, 31 Jul 2022 18:38:28 -0700
 272 Message-Id: <20220801013834.156015-3-andres@anarazel.de>
 273 X-Mailer: git-send-email 2.37.0.3.g30cc8d0f14
 274 In-Reply-To: <20220801013834.156015-1-andres@anarazel.de>
 275 References: <20220622231624.t63bkmkzphqvh3kx@alap3.anarazel.de>
 276  <20220801013834.156015-1-andres@anarazel.de>
 277 MIME-Version: 1.0
 278 Precedence: bulk
 279 List-ID: <bpf.vger.kernel.org>
 280 X-Mailing-List: bpf@vger.kernel.org
 281
 282 The feature check does not seem important enough to display. Suggested by
 283 Jiri Olsa.
 284
 285 Cc: Jiri Olsa <jolsa@kernel.org>
 286 Cc: Alexei Starovoitov <ast@kernel.org>
 287 Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
 288 Cc: Sedat Dilek <sedat.dilek@gmail.com>
 289 Cc: Quentin Monnet <quentin@isovalent.com>
 290 Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de
 291 Signed-off-by: Andres Freund <andres@anarazel.de>
 292 ---
 293  tools/build/Makefile.feature | 3 +--
 294  1 file changed, 1 insertion(+), 2 deletions(-)
 295
 296 diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
 297 index 8f6578e4d324..fc6ce0b2535a 100644
 298 --- a/tools/build/Makefile.feature
 299 +++ b/tools/build/Makefile.feature
 300 @@ -135,8 +135,7 @@ FEATURE_DISPLAY ?=              \
 301           get_cpuid              \
 302           bpf                   \
 303           libaio                        \
 304 -         libzstd               \
 305 -         disassembler-four-args
 306 +         libzstd
 307
 308  # Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features.
 309  # If in the future we need per-feature checks/flags for features not
 310
 311 From patchwork Mon Aug  1 01:38:29 2022
 312 Content-Type: text/plain; charset="utf-8"
 313 MIME-Version: 1.0
 314 Content-Transfer-Encoding: 7bit
 315 X-Patchwork-Submitter: Andres Freund <andres@anarazel.de>
 316 X-Patchwork-Id: 12933312
 317 X-Patchwork-Delegate: bpf@iogearbox.net
 318 Return-Path: <bpf-owner@kernel.org>
 319 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
 320         aws-us-west-2-korg-lkml-1.web.codeaurora.org
 321 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
 322         by smtp.lore.kernel.org (Postfix) with ESMTP id 66A9CC19F2D
 323         for <bpf@archiver.kernel.org>; Mon,  1 Aug 2022 01:38:45 +0000 (UTC)
 324 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
 325         id S238799AbiHABio (ORCPT <rfc822;bpf@archiver.kernel.org>);
 326         Sun, 31 Jul 2022 21:38:44 -0400
 327 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48012 "EHLO
 328         lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
 329         with ESMTP id S238760AbiHABil (ORCPT <rfc822;bpf@vger.kernel.org>);
 330         Sun, 31 Jul 2022 21:38:41 -0400
 331 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com
 332  [64.147.123.24])
 333         by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E693D112;
 334         Sun, 31 Jul 2022 18:38:40 -0700 (PDT)
 335 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43])
 336         by mailout.west.internal (Postfix) with ESMTP id 408E13200495;
 337         Sun, 31 Jul 2022 21:38:37 -0400 (EDT)
 338 Received: from mailfrontend1 ([10.202.2.162])
 339   by compute3.internal (MEProxy); Sun, 31 Jul 2022 21:38:37 -0400
 340 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anarazel.de; h=
 341         cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to
 342         :in-reply-to:message-id:mime-version:references:reply-to:sender
 343         :subject:subject:to:to; s=fm3; t=1659317916; x=1659404316; bh=Gg
 344         2ebcjopr7kTW9xl9o9LrGHFKJ9hVi1E0tGPNFW3e4=; b=Fv6WyHQgrFf+9yUKXv
 345         VaX/YquwfAkVD62fU0rQLUAo47tOUmPm7QCP5Ux0d1U+I7Si27AL4AVI9wD+rytP
 346         y0JAARgXmMYXoBivV23A2B0y+XUUjno0H7SN3mW56IQPWsKK/wIsoybAsDS45TBL
 347         tXE4RczYeDijWDjHnzYKnpZcL9Vfhx4Slv3bFJ00qUWm1Xj9gN7P/127Y4paTBK5
 348         VDSNXjIxxIwMXLct9+s8GISaP1MUhNbO1cbwUbI5wLCJdjSsltBp1fS5tiaD00Fe
 349         cn4gu4DCQRNnsuj39Z4de1do57GibZDGsXFe+UQS0osMwKpCcutkuAHENTStEmAS
 350         vugA==
 351 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 352         messagingengine.com; h=cc:cc:content-transfer-encoding:date:date
 353         :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to
 354         :message-id:mime-version:references:reply-to:sender:subject
 355         :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender
 356         :x-sasl-enc; s=fm3; t=1659317916; x=1659404316; bh=Gg2ebcjopr7kT
 357         W9xl9o9LrGHFKJ9hVi1E0tGPNFW3e4=; b=rj5gGOrMINZYw8RO81Qc5SJMYJxnP
 358         w3qhIhrsNytKPsqoLtsv76GbyRo5KcriPMQUi/18aeW4y8Bs4QrsqTS5jSevN3xY
 359         ILPJe7jEQ72JinzFWOEEtFPEmufadII+MmCRoO0zQxjjz/X0lptWi0LrtTTCtx+k
 360         hd4rfESsyx83mbllm32nZ6fukZ6/dkHYPGeQ8B+r1O5l77i67HuB0+5HRyLcQl4J
 361         DTreyvKZQwFAVY+kGhD4VQQ+JZAKffqjt7k5dZKrRu4I3G+jRr3mG8XETDf5wvZz
 362         3P5k2QCVMitJEUivzGXsRvzmDGdBfRFjwyfdDPbG1jMsNPS6Lf1nVYMcw==
 363 X-ME-Sender: <xms:nC7nYojM8nFzM2gxRHny8JdyzSo-57IgdtrHNkXNMAIJKtiaNIVtrw>
 364     <xme:nC7nYhBieW1QeCr7JjRHwH7W_OZV1U_FP9snXZqf_SMHE_JS0Mh3aZy-U2YBh1Ej9
 365     NdDbAGjmvHilPnGqQ>
 366 X-ME-Received:
 367  <xmr:nC7nYgF56egf59VWh2Xef98p4wLNd80VAUFA85A7zdRtYSmIwu976UugAw8MyneOs16roQqEYbLnPhRUJ5baeNLnQ9wUFrXuVl2MT0FAq-F1jsl2wgbuu2ptatkq>
 368 X-ME-Proxy-Cause:
 369  gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddggedtucetufdoteggodetrfdotf
 370     fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
 371     uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
 372     cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptehnughr
 373     vghsucfhrhgvuhhnugcuoegrnhgurhgvshesrghnrghrrgiivghlrdguvgeqnecuggftrf
 374     grthhtvghrnhepleejgfdvfefhudektddtveegtdekieegffdtkeeljeetudevffeltdei
 375     feeugeeinecuffhomhgrihhnpehsohhurhgtvgifrghrvgdrohhrghdpkhgvrhhnvghlrd
 376     horhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhep
 377     rghnughrvghssegrnhgrrhgriigvlhdruggv
 378 X-ME-Proxy: <xmx:nC7nYpTX7p196SS-AOFPuKrMFgZ1s2H94nrcbHHxFoCQ5KjBcwo8EA>
 379     <xmx:nC7nYlyGFCXlpzot14gmJ2P2qCzd8sMQywuET6yp_dNacm34RWrv2Q>
 380     <xmx:nC7nYn55KmB2snJx-vjR247lTHWag-meEvalip2ZWuwwwVi3JzhFMQ>
 381     <xmx:nC7nYsljTC1kW88_DeUuQmQsVHtC_mDMPtsxSAjvCRD8UFScYCflRA>
 382 Feedback-ID: id4a34324:Fastmail
 383 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun,
 384  31 Jul 2022 21:38:36 -0400 (EDT)
 385 From: Andres Freund <andres@anarazel.de>
 386 To: bpf@vger.kernel.org, linux-kernel@vger.kernel.org
 387 Cc: Alexei Starovoitov <ast@kernel.org>,
 388         Arnaldo Carvalho de Melo <acme@redhat.com>,
 389         Jiri Olsa <jolsa@kernel.org>,
 390         Sedat Dilek <sedat.dilek@gmail.com>,
 391         Quentin Monnet <quentin@isovalent.com>,
 392         Ben Hutchings <benh@debian.org>
 393 Subject: [PATCH v3 3/8] tools include: add dis-asm-compat.h to handle version
 394  differences
 395 Date: Sun, 31 Jul 2022 18:38:29 -0700
 396 Message-Id: <20220801013834.156015-4-andres@anarazel.de>
 397 X-Mailer: git-send-email 2.37.0.3.g30cc8d0f14
 398 In-Reply-To: <20220801013834.156015-1-andres@anarazel.de>
 399 References: <20220622231624.t63bkmkzphqvh3kx@alap3.anarazel.de>
 400  <20220801013834.156015-1-andres@anarazel.de>
 401 MIME-Version: 1.0
 402 Precedence: bulk
 403 List-ID: <bpf.vger.kernel.org>
 404 X-Mailing-List: bpf@vger.kernel.org
 405
 406 binutils changed the signature of init_disassemble_info(), which now causes
 407 compilation failures for tools/{perf,bpf}, e.g. on debian unstable.
 408 Relevant binutils commit:
 409 https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07
 410
 411 This commit introduces a wrapper for init_disassemble_info(), to avoid
 412 spreading #ifdef DISASM_INIT_STYLED to a bunch of places. Subsequent
 413 commits will use it to fix the build failures.
 414
 415 It likely is worth adding a wrapper for disassember(), to avoid the already
 416 existing DISASM_FOUR_ARGS_SIGNATURE ifdefery.
 417
 418 Cc: Alexei Starovoitov <ast@kernel.org>
 419 Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
 420 Cc: Sedat Dilek <sedat.dilek@gmail.com>
 421 Cc: Quentin Monnet <quentin@isovalent.com>
 422 Cc: Ben Hutchings <benh@debian.org>
 423 Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de
 424 Signed-off-by: Andres Freund <andres@anarazel.de>
 425 Signed-off-by: Ben Hutchings <benh@debian.org>
 426 ---
 427  tools/include/tools/dis-asm-compat.h | 55 ++++++++++++++++++++++++++++
 428  1 file changed, 55 insertions(+)
 429  create mode 100644 tools/include/tools/dis-asm-compat.h
 430
 431 diff --git a/tools/include/tools/dis-asm-compat.h b/tools/include/tools/dis-asm-compat.h
 432 new file mode 100644
 433 index 000000000000..70f331e23ed3
 434 --- /dev/null
 435 +++ b/tools/include/tools/dis-asm-compat.h
 436 @@ -0,0 +1,55 @@
 437 +/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */
 438 +#ifndef _TOOLS_DIS_ASM_COMPAT_H
 439 +#define _TOOLS_DIS_ASM_COMPAT_H
 440 +
 441 +#include <stdio.h>
 442 +#include <dis-asm.h>
 443 +
 444 +/* define types for older binutils version, to centralize ifdef'ery a bit */
 445 +#ifndef DISASM_INIT_STYLED
 446 +enum disassembler_style {DISASSEMBLER_STYLE_NOT_EMPTY};
 447 +typedef int (*fprintf_styled_ftype) (void *, enum disassembler_style, const char*, ...);
 448 +#endif
 449 +
 450 +/*
 451 + * Trivial fprintf wrapper to be used as the fprintf_styled_func argument to
 452 + * init_disassemble_info_compat() when normal fprintf suffices.
 453 + */
 454 +static inline int fprintf_styled(void *out,
 455 +                                enum disassembler_style style,
 456 +                                const char *fmt, ...)
 457 +{
 458 +       va_list args;
 459 +       int r;
 460 +
 461 +       (void)style;
 462 +
 463 +       va_start(args, fmt);
 464 +       r = vfprintf(out, fmt, args);
 465 +       va_end(args);
 466 +
 467 +       return r;
 468 +}
 469 +
 470 +/*
 471 + * Wrapper for init_disassemble_info() that hides version
 472 + * differences. Depending on binutils version and architecture either
 473 + * fprintf_func or fprintf_styled_func will be called.
 474 + */
 475 +static inline void init_disassemble_info_compat(struct disassemble_info *info,
 476 +                                               void *stream,
 477 +                                               fprintf_ftype unstyled_func,
 478 +                                               fprintf_styled_ftype styled_func)
 479 +{
 480 +#ifdef DISASM_INIT_STYLED
 481 +       init_disassemble_info(info, stream,
 482 +                             unstyled_func,
 483 +                             styled_func);
 484 +#else
 485 +       (void)styled_func;
 486 +       init_disassemble_info(info, stream,
 487 +                             unstyled_func);
 488 +#endif
 489 +}
 490 +
 491 +#endif /* _TOOLS_DIS_ASM_COMPAT_H */
 492
 493 From patchwork Mon Aug  1 01:38:30 2022
 494 Content-Type: text/plain; charset="utf-8"
 495 MIME-Version: 1.0
 496 Content-Transfer-Encoding: 7bit
 497 X-Patchwork-Submitter: Andres Freund <andres@anarazel.de>
 498 X-Patchwork-Id: 12933311
 499 X-Patchwork-Delegate: bpf@iogearbox.net
 500 Return-Path: <bpf-owner@kernel.org>
 501 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
 502         aws-us-west-2-korg-lkml-1.web.codeaurora.org
 503 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
 504         by smtp.lore.kernel.org (Postfix) with ESMTP id 7EA44C19F2A
 505         for <bpf@archiver.kernel.org>; Mon,  1 Aug 2022 01:38:44 +0000 (UTC)
 506 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
 507         id S238783AbiHABim (ORCPT <rfc822;bpf@archiver.kernel.org>);
 508         Sun, 31 Jul 2022 21:38:42 -0400
 509 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48000 "EHLO
 510         lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
 511         with ESMTP id S238735AbiHABil (ORCPT <rfc822;bpf@vger.kernel.org>);
 512         Sun, 31 Jul 2022 21:38:41 -0400
 513 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com
 514  [64.147.123.24])
 515         by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27D59D10B;
 516         Sun, 31 Jul 2022 18:38:40 -0700 (PDT)
 517 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46])
 518         by mailout.west.internal (Postfix) with ESMTP id 18EF03200488;
 519         Sun, 31 Jul 2022 21:38:37 -0400 (EDT)
 520 Received: from mailfrontend2 ([10.202.2.163])
 521   by compute2.internal (MEProxy); Sun, 31 Jul 2022 21:38:37 -0400
 522 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anarazel.de; h=
 523         cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to
 524         :in-reply-to:message-id:mime-version:references:reply-to:sender
 525         :subject:subject:to:to; s=fm3; t=1659317916; x=1659404316; bh=Kw
 526         EB0XSuZowjFupqaLWGnwmCrXRrnoFcU7ypZIYPRKA=; b=ZICyB0JaiDwyMguye1
 527         XbE7GSE+iKm5DlkLYNqBmbA0R+9PM/7og1noZqhelyrKxdaexoIqIrH6TDGx9VCj
 528         zcUqJPuq5HC423CAXt8JCxhtdzwdQZeOeHDYNTAPj5BsriQsFQoKUKk2FoUYO/eR
 529         rBgsv+O6mTOrtwrVLh3vQt+eiudwdAp7RiVEte5VCcL4iP2H1Ozb5YfVmjyK5uBR
 530         CT9SSKl5gHLS8pmq6WJS/MnjZamKKIh9xODjb3P5JEFcvtnOIT+yHNvqqNLT39eL
 531         x24ijVEsadiKxmbyIbmuODzQ13991sQxkgKDDVbOMGEYyw9uzZ8+w8SiUgSP3WE5
 532         HLHw==
 533 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 534         messagingengine.com; h=cc:cc:content-transfer-encoding:date:date
 535         :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to
 536         :message-id:mime-version:references:reply-to:sender:subject
 537         :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender
 538         :x-sasl-enc; s=fm3; t=1659317916; x=1659404316; bh=KwEB0XSuZowjF
 539         upqaLWGnwmCrXRrnoFcU7ypZIYPRKA=; b=V/odDKolm4jQKEGcR6dsCavrAhH+x
 540         CKQgm5OKUsbmeKz1J+BHEOyGWBVSLYygUIseOD2Us6Dy14gLz2E41U1e5YijUiIv
 541         SG4Tlotk8kVtWzHv1Ctc8h7K74CpI6rbMEkFkp5sWZfGF7nNC3XAymJQhfgWwNYH
 542         tazyzNY6djvchFlFvIYQySu7hZDSrn6mD3QMDGzog9W+9BiVdlPOpBZ+juBRmhtd
 543         RulXzxqWkMHTh9q4n8ugvG5RcMFqwkS8BpdYjqCkGKIHDu4+bSx5LWByYqvPe6Vm
 544         ims7wvIlGA8uRzaXkIlaU/FD5QnNgOgD6ePMhKmkvzoqhdx2gzzSKh+sg==
 545 X-ME-Sender: <xms:nC7nYmmEpxogtZEqL3Sl7dhOE5bYAfEQ7E3pnKxR4ODPfSsFKAdcig>
 546     <xme:nC7nYt3SC0Ht1cSiAlLBsY4J79Vc17wfuijRJvjMP5GREO_B6pqmfhET9cwA0Othv
 547     g0So5Qo6tV7Kr77uw>
 548 X-ME-Received:
 549  <xmr:nC7nYkqul1J0vYVGSS1oy0xxSTgQKoTW7pB_lUcW7C1b4RXRE6-wqGI9IXCigj8IYLGedMsf5HwGLyAyLAWlGzqhTg9kNrINWkHHYxB2EGuMq89_3sOGii8MTWFS>
 550 X-ME-Proxy-Cause:
 551  gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddggedtucetufdoteggodetrfdotf
 552     fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
 553     uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
 554     cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptehnughr
 555     vghsucfhrhgvuhhnugcuoegrnhgurhgvshesrghnrghrrgiivghlrdguvgeqnecuggftrf
 556     grthhtvghrnhepleejgfdvfefhudektddtveegtdekieegffdtkeeljeetudevffeltdei
 557     feeugeeinecuffhomhgrihhnpehsohhurhgtvgifrghrvgdrohhrghdpkhgvrhhnvghlrd
 558     horhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhep
 559     rghnughrvghssegrnhgrrhgriigvlhdruggv
 560 X-ME-Proxy: <xmx:nC7nYqkdR44YPFzkL78jcVenUQARuVYi40bh1adCcJtYwNy5mH3_SQ>
 561     <xmx:nC7nYk07_Zo4_OQkTruSKmX0tmMrQZLH6gss3bd0i2BTmtVdsOfgsg>
 562     <xmx:nC7nYhsK_HIzWKXO39gKt6d9gz55nY3kA6Jj2M2mwSbqRY5uVp7xXA>
 563     <xmx:nC7nYurVkh5_GH29WNRhAN7myNEyNUD8OzWllHqRtgyoxzSGLLe1rg>
 564 Feedback-ID: id4a34324:Fastmail
 565 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun,
 566  31 Jul 2022 21:38:36 -0400 (EDT)
 567 From: Andres Freund <andres@anarazel.de>
 568 To: bpf@vger.kernel.org, linux-kernel@vger.kernel.org
 569 Cc: Alexei Starovoitov <ast@kernel.org>,
 570         Arnaldo Carvalho de Melo <acme@redhat.com>,
 571         Jiri Olsa <jolsa@kernel.org>,
 572         Sedat Dilek <sedat.dilek@gmail.com>,
 573         Quentin Monnet <quentin@isovalent.com>,
 574         Ben Hutchings <benh@debian.org>
 575 Subject: [PATCH v3 4/8] tools perf: Fix compilation error with new binutils
 576 Date: Sun, 31 Jul 2022 18:38:30 -0700
 577 Message-Id: <20220801013834.156015-5-andres@anarazel.de>
 578 X-Mailer: git-send-email 2.37.0.3.g30cc8d0f14
 579 In-Reply-To: <20220801013834.156015-1-andres@anarazel.de>
 580 References: <20220622231624.t63bkmkzphqvh3kx@alap3.anarazel.de>
 581  <20220801013834.156015-1-andres@anarazel.de>
 582 MIME-Version: 1.0
 583 Precedence: bulk
 584 List-ID: <bpf.vger.kernel.org>
 585 X-Mailing-List: bpf@vger.kernel.org
 586
 587 binutils changed the signature of init_disassemble_info(), which now causes
 588 compilation failures for tools/perf/util/annotate.c, e.g. on debian
 589 unstable. Relevant binutils commit:
 590 https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07
 591
 592 Wire up the feature test and switch to init_disassemble_info_compat(),
 593 which were introduced in prior commits, fixing the compilation failure.
 594
 595 I verified that perf can still disassemble bpf programs by using bpftrace
 596 under load, recording a perf trace, and then annotating the bpf "function"
 597 with and without the changes. With old binutils there's no change in output
 598 before/after this patch. When comparing the output from old binutils (2.35)
 599 to new bintuils with the patch (upstream snapshot) there are a few output
 600 differences, but they are unrelated to this patch. An example hunk is:
 601
 602      1.15 :   55:mov    %rbp,%rdx
 603      0.00 :   58:add    $0xfffffffffffffff8,%rdx
 604      0.00 :   5c:xor    %ecx,%ecx
 605 -    1.03 :   5e:callq  0xffffffffe12aca3c
 606 +    1.03 :   5e:call   0xffffffffe12aca3c
 607      0.00 :   63:xor    %eax,%eax
 608 -    2.18 :   65:leaveq
 609 -    2.82 :   66:retq
 610 +    2.18 :   65:leave
 611 +    2.82 :   66:ret
 612
 613 Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
 614 Cc: Sedat Dilek <sedat.dilek@gmail.com>
 615 Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de
 616 Signed-off-by: Andres Freund <andres@anarazel.de>
 617 ---
 618  tools/perf/Makefile.config | 8 ++++++++
 619  tools/perf/util/annotate.c | 7 ++++---
 620  2 files changed, 12 insertions(+), 3 deletions(-)
 621
 622 diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
 623 index 73e0762092fe..ee417c321adb 100644
 624 --- a/tools/perf/Makefile.config
 625 +++ b/tools/perf/Makefile.config
 626 @@ -298,6 +298,7 @@ FEATURE_CHECK_LDFLAGS-libpython := $(PYTHON_EMBED_LDOPTS)
 627  FEATURE_CHECK_LDFLAGS-libaio = -lrt
 628
 629  FEATURE_CHECK_LDFLAGS-disassembler-four-args = -lbfd -lopcodes -ldl
 630 +FEATURE_CHECK_LDFLAGS-disassembler-init-styled = -lbfd -lopcodes -ldl
 631
 632  CORE_CFLAGS += -fno-omit-frame-pointer
 633  CORE_CFLAGS += -ggdb3
 634 @@ -905,13 +906,16 @@ ifndef NO_LIBBFD
 635      ifeq ($(feature-libbfd-liberty), 1)
 636        EXTLIBS += -lbfd -lopcodes -liberty
 637        FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -ldl
 638 +      FEATURE_CHECK_LDFLAGS-disassembler-init-styled += -liberty -ldl
 639      else
 640        ifeq ($(feature-libbfd-liberty-z), 1)
 641          EXTLIBS += -lbfd -lopcodes -liberty -lz
 642          FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -lz -ldl
 643 +        FEATURE_CHECK_LDFLAGS-disassembler-init-styled += -liberty -lz -ldl
 644        endif
 645      endif
 646      $(call feature_check,disassembler-four-args)
 647 +    $(call feature_check,disassembler-init-styled)
 648    endif
 649
 650    ifeq ($(feature-libbfd-buildid), 1)
 651 @@ -1025,6 +1029,10 @@ ifeq ($(feature-disassembler-four-args), 1)
 652      CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE
 653  endif
 654
 655 +ifeq ($(feature-disassembler-init-styled), 1)
 656 +    CFLAGS += -DDISASM_INIT_STYLED
 657 +endif
 658 +
 659  ifeq (${IS_64_BIT}, 1)
 660    ifndef NO_PERF_READ_VDSO32
 661      $(call feature_check,compile-32)
 662 diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
 663 index 82cc396ef516..2c6a485c3de5 100644
 664 --- a/tools/perf/util/annotate.c
 665 +++ b/tools/perf/util/annotate.c
 666 @@ -1720,6 +1720,7 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil
 667  #include <bpf/btf.h>
 668  #include <bpf/libbpf.h>
 669  #include <linux/btf.h>
 670 +#include <tools/dis-asm-compat.h>
 671
 672  static int symbol__disassemble_bpf(struct symbol *sym,
 673                                    struct annotate_args *args)
 674 @@ -1762,9 +1763,9 @@ static int symbol__disassemble_bpf(struct symbol *sym,
 675                 ret = errno;
 676                 goto out;
 677         }
 678 -       init_disassemble_info(&info, s,
 679 -                             (fprintf_ftype) fprintf);
 680 -
 681 +       init_disassemble_info_compat(&info, s,
 682 +                                    (fprintf_ftype) fprintf,
 683 +                                    fprintf_styled);
 684         info.arch = bfd_get_arch(bfdf);
 685         info.mach = bfd_get_mach(bfdf);
 686
 687
 688 From patchwork Mon Aug  1 01:38:31 2022
 689 Content-Type: text/plain; charset="utf-8"
 690 MIME-Version: 1.0
 691 Content-Transfer-Encoding: 7bit
 692 X-Patchwork-Submitter: Andres Freund <andres@anarazel.de>
 693 X-Patchwork-Id: 12933317
 694 X-Patchwork-Delegate: bpf@iogearbox.net
 695 Return-Path: <bpf-owner@kernel.org>
 696 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
 697         aws-us-west-2-korg-lkml-1.web.codeaurora.org
 698 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
 699         by smtp.lore.kernel.org (Postfix) with ESMTP id C8AE6C00140
 700         for <bpf@archiver.kernel.org>; Mon,  1 Aug 2022 01:38:51 +0000 (UTC)
 701 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
 702         id S238834AbiHABit (ORCPT <rfc822;bpf@archiver.kernel.org>);
 703         Sun, 31 Jul 2022 21:38:49 -0400
 704 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48012 "EHLO
 705         lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
 706         with ESMTP id S238774AbiHABim (ORCPT <rfc822;bpf@vger.kernel.org>);
 707         Sun, 31 Jul 2022 21:38:42 -0400
 708 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com
 709  [64.147.123.24])
 710         by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7089ECE3C;
 711         Sun, 31 Jul 2022 18:38:41 -0700 (PDT)
 712 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44])
 713         by mailout.west.internal (Postfix) with ESMTP id 02136320076F;
 714         Sun, 31 Jul 2022 21:38:39 -0400 (EDT)
 715 Received: from mailfrontend2 ([10.202.2.163])
 716   by compute4.internal (MEProxy); Sun, 31 Jul 2022 21:38:40 -0400
 717 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anarazel.de; h=
 718         cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to
 719         :in-reply-to:message-id:mime-version:references:reply-to:sender
 720         :subject:subject:to:to; s=fm3; t=1659317919; x=1659404319; bh=HJ
 721         dDL6MBfDtps+1FT1nNKF79Ei+JMVz6uOUMAR+aJpk=; b=cQL9ePY+LFViB1DpCe
 722         cHvRZsGx14+Ndw/4yX38qdhWdgx2Ybv7SS1O20Q+qNbqORfZwTmmf15wiwhMjN5r
 723         F6kU4/7tjm6+nJ1KngqwrW3ifVHaH+fVHr/ZcWFfnDEWRl+HwYd7iKc5j6EUtc4M
 724         MW8ncj9nYQJMyV51Sj1NEZzMo4yuXinkemgB4VgfXA0uGdQxifx1b/ooqh0Eko3l
 725         WQT8J66kWz/YlPo+5MexQtZ/kR4kg9b4Y1bV7nGUjsVBjIDto0X0mbNHS1JPb3dk
 726         cRWeWYmLzYUxUt3WD4KWGhUxmAL1sssvcLxMJslJK/DHpw6LPbYVXtxpUxHX9gBo
 727         bHHw==
 728 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 729         messagingengine.com; h=cc:cc:content-transfer-encoding:date:date
 730         :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to
 731         :message-id:mime-version:references:reply-to:sender:subject
 732         :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender
 733         :x-sasl-enc; s=fm3; t=1659317919; x=1659404319; bh=HJdDL6MBfDtps
 734         +1FT1nNKF79Ei+JMVz6uOUMAR+aJpk=; b=BfuICqjjk9YC0N7sBU4Fv+/YpDRKC
 735         3ZO1GnJ6g1Y6efm0QwZHKwoFKlFWYUrbQ3Rt0SJzePN9VhIi0FXzSaM0O5ZYTWnb
 736         b3gSUn8AIcryQdtT5bpo7bg5ePfl4YJPfWU2HUCPio/AZppNXrDpxsznhLKcPWK3
 737         yd25XIq/P8I38IltjBRGo9OqA8+2UORHvlPMt6gO0RUHe48CxI6d/WT0Lo9Y+JjQ
 738         epih7hrv95N7p0jc/OWri0IyQ6zUBuv6G8PZuF4pCu87wz3YvOIcggvFGcR3jLn/
 739         7IZbDYc27RLyefW/oKAIa1h+73ryFcDPfgKtCwqy6n1qQfMq8VnxOSoMA==
 740 X-ME-Sender: <xms:ny7nYqOPZvE3xZZo801GAU-SLz5edfshWDkuxSkLm8NZpB7IvsTQlQ>
 741     <xme:ny7nYo-28fnY-F3THTxjk2Cpr9rqBSKgdx80RB9akJY48gwB166UDDiLoizXhb7Dj
 742     _7XrO8DiVABkrPg3A>
 743 X-ME-Received:
 744  <xmr:ny7nYhSNI9tPFFhUhm7lfIhw1OufFB4s9hcjbUgQpt7VAyEvQbExzqbCUgOkrgK1pzE7ryghNB7R1dCwgXgcwTjO80mE_ZgeWiJZvCdmEupB74RRGU1kG-yKxe3b>
 745 X-ME-Proxy-Cause:
 746  gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddggedtucetufdoteggodetrfdotf
 747     fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
 748     uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
 749     cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptehnughr
 750     vghsucfhrhgvuhhnugcuoegrnhgurhgvshesrghnrghrrgiivghlrdguvgeqnecuggftrf
 751     grthhtvghrnhepleejgfdvfefhudektddtveegtdekieegffdtkeeljeetudevffeltdei
 752     feeugeeinecuffhomhgrihhnpehsohhurhgtvgifrghrvgdrohhrghdpkhgvrhhnvghlrd
 753     horhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhep
 754     rghnughrvghssegrnhgrrhgriigvlhdruggv
 755 X-ME-Proxy: <xmx:ny7nYqt1NurZFreTjJMemfRdg13hp7R__Bfy3vLEYvc8GkhNRovU0w>
 756     <xmx:ny7nYieAz6Z_npzIl13ppcPfbsjHcMYExFdl2om5AhVJ1Sc8Shj99A>
 757     <xmx:ny7nYu02V-r_-k2c1pNaj1UNOtqQQqOMMQ_IggiTavBRrslK1A7TxQ>
 758     <xmx:ny7nYosCAqXfa-f6FW34iiTiaiQU_BgnLR8LlBAN8M7ZtmV8mEL8JA>
 759 Feedback-ID: id4a34324:Fastmail
 760 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun,
 761  31 Jul 2022 21:38:38 -0400 (EDT)
 762 From: Andres Freund <andres@anarazel.de>
 763 To: bpf@vger.kernel.org, linux-kernel@vger.kernel.org
 764 Cc: Alexei Starovoitov <ast@kernel.org>,
 765         Arnaldo Carvalho de Melo <acme@redhat.com>,
 766         Jiri Olsa <jolsa@kernel.org>,
 767         Sedat Dilek <sedat.dilek@gmail.com>,
 768         Quentin Monnet <quentin@isovalent.com>,
 769         Ben Hutchings <benh@debian.org>,
 770         Daniel Borkmann <daniel@iogearbox.net>
 771 Subject: [PATCH v3 5/8] tools bpf_jit_disasm: Fix compilation error with new
 772  binutils
 773 Date: Sun, 31 Jul 2022 18:38:31 -0700
 774 Message-Id: <20220801013834.156015-6-andres@anarazel.de>
 775 X-Mailer: git-send-email 2.37.0.3.g30cc8d0f14
 776 In-Reply-To: <20220801013834.156015-1-andres@anarazel.de>
 777 References: <20220622231624.t63bkmkzphqvh3kx@alap3.anarazel.de>
 778  <20220801013834.156015-1-andres@anarazel.de>
 779 MIME-Version: 1.0
 780 Precedence: bulk
 781 List-ID: <bpf.vger.kernel.org>
 782 X-Mailing-List: bpf@vger.kernel.org
 783 X-Patchwork-Delegate: bpf@iogearbox.net
 784
 785 binutils changed the signature of init_disassemble_info(), which now causes
 786 compilation to fail for tools/bpf/bpf_jit_disasm.c, e.g. on debian
 787 unstable. Relevant binutils commit:
 788 https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07
 789
 790 Wire up the feature test and switch to init_disassemble_info_compat(),
 791 which were introduced in prior commits, fixing the compilation failure.
 792
 793 I verified that bpf_jit_disasm can still disassemble bpf programs, both
 794 with the old and new dis-asm.h API. With old binutils there's no change in
 795 output before/after this patch. When comparing the output from old
 796 binutils (2.35) to new bintuils with the patch (upstream snapshot) there
 797 are a few output differences, but they are unrelated to this patch. An
 798 example hunk is:
 799    f4:  mov    %r14,%rsi
 800    f7:  mov    %r15,%rdx
 801    fa:  mov    $0x2a,%ecx
 802 -  ff:  callq  0xffffffffea8c4988
 803 +  ff:  call   0xffffffffea8c4988
 804   104:  test   %rax,%rax
 805   107:  jge    0x0000000000000110
 806   109:  xor    %eax,%eax
 807 - 10b:  jmpq   0x0000000000000073
 808 + 10b:  jmp    0x0000000000000073
 809   110:  cmp    $0x16,%rax
 810
 811 However, I had to use an older kernel to generate the bpf_jit_enabled = 2
 812 output, as that has been broken since 5.18 / 1022a5498f6f:
 813 https://lore.kernel.org/20220703030210.pmjft7qc2eajzi6c@alap3.anarazel.de
 814
 815 Cc: Alexei Starovoitov <ast@kernel.org>
 816 Cc: Daniel Borkmann <daniel@iogearbox.net>
 817 Cc: Sedat Dilek <sedat.dilek@gmail.com>
 818 Cc: Quentin Monnet <quentin@isovalent.com>
 819 Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de
 820 Signed-off-by: Andres Freund <andres@anarazel.de>
 821 ---
 822  tools/bpf/Makefile         | 5 ++++-
 823  tools/bpf/bpf_jit_disasm.c | 5 ++++-
 824  2 files changed, 8 insertions(+), 2 deletions(-)
 825
 826 diff --git a/tools/bpf/Makefile b/tools/bpf/Makefile
 827 index b11cfc86a3d0..664601ab1705 100644
 828 --- a/tools/bpf/Makefile
 829 +++ b/tools/bpf/Makefile
 830 @@ -34,7 +34,7 @@ else
 831  endif
 832
 833  FEATURE_USER = .bpf
 834 -FEATURE_TESTS = libbfd disassembler-four-args
 835 +FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled
 836  FEATURE_DISPLAY = libbfd disassembler-four-args
 837
 838  check_feat := 1
 839 @@ -56,6 +56,9 @@ endif
 840  ifeq ($(feature-disassembler-four-args), 1)
 841  CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE
 842  endif
 843 +ifeq ($(feature-disassembler-init-styled), 1)
 844 +CFLAGS += -DDISASM_INIT_STYLED
 845 +endif
 846
 847  $(OUTPUT)%.yacc.c: $(srctree)/tools/bpf/%.y
 848         $(QUIET_BISON)$(YACC) -o $@ -d $<
 849 diff --git a/tools/bpf/bpf_jit_disasm.c b/tools/bpf/bpf_jit_disasm.c
 850 index c8ae95804728..a90a5d110f92 100644
 851 --- a/tools/bpf/bpf_jit_disasm.c
 852 +++ b/tools/bpf/bpf_jit_disasm.c
 853 @@ -28,6 +28,7 @@
 854  #include <sys/types.h>
 855  #include <sys/stat.h>
 856  #include <limits.h>
 857 +#include <tools/dis-asm-compat.h>
 858
 859  #define CMD_ACTION_SIZE_BUFFER         10
 860  #define CMD_ACTION_READ_ALL            3
 861 @@ -64,7 +65,9 @@ static void get_asm_insns(uint8_t *image, size_t len, int opcodes)
 862         assert(bfdf);
 863         assert(bfd_check_format(bfdf, bfd_object));
 864
 865 -       init_disassemble_info(&info, stdout, (fprintf_ftype) fprintf);
 866 +       init_disassemble_info_compat(&info, stdout,
 867 +                                    (fprintf_ftype) fprintf,
 868 +                                    fprintf_styled);
 869         info.arch = bfd_get_arch(bfdf);
 870         info.mach = bfd_get_mach(bfdf);
 871         info.buffer = image;
 872
 873 From patchwork Mon Aug  1 01:38:32 2022
 874 Content-Type: text/plain; charset="utf-8"
 875 MIME-Version: 1.0
 876 Content-Transfer-Encoding: 7bit
 877 X-Patchwork-Submitter: Andres Freund <andres@anarazel.de>
 878 X-Patchwork-Id: 12933315
 879 X-Patchwork-Delegate: bpf@iogearbox.net
 880 Return-Path: <bpf-owner@kernel.org>
 881 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
 882         aws-us-west-2-korg-lkml-1.web.codeaurora.org
 883 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
 884         by smtp.lore.kernel.org (Postfix) with ESMTP id 96658C19F2A
 885         for <bpf@archiver.kernel.org>; Mon,  1 Aug 2022 01:38:48 +0000 (UTC)
 886 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
 887         id S238807AbiHABip (ORCPT <rfc822;bpf@archiver.kernel.org>);
 888         Sun, 31 Jul 2022 21:38:45 -0400
 889 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48024 "EHLO
 890         lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
 891         with ESMTP id S238765AbiHABil (ORCPT <rfc822;bpf@vger.kernel.org>);
 892         Sun, 31 Jul 2022 21:38:41 -0400
 893 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com
 894  [64.147.123.24])
 895         by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C16BD118;
 896         Sun, 31 Jul 2022 18:38:41 -0700 (PDT)
 897 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44])
 898         by mailout.west.internal (Postfix) with ESMTP id 0FD61320077A;
 899         Sun, 31 Jul 2022 21:38:39 -0400 (EDT)
 900 Received: from mailfrontend1 ([10.202.2.162])
 901   by compute4.internal (MEProxy); Sun, 31 Jul 2022 21:38:40 -0400
 902 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anarazel.de; h=
 903         cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to
 904         :in-reply-to:message-id:mime-version:references:reply-to:sender
 905         :subject:subject:to:to; s=fm3; t=1659317919; x=1659404319; bh=rD
 906         7/11Zj88Bzau+Vwi4eZX1L45MuyWwCwsxlNl9bPbo=; b=O9dsZiya22K/CCej90
 907         Cq8/IEDMFgPUag4IhOP3cDes6/uEl4K5BaC2oNvcNw4ONIDXI76k7C9Xv6fL/PhC
 908         v2vOXHvAv8l8NSvjgRkk1YV9H0RuiR/CL4P92rHj1faQuH2oqULZBG9zIadd3rjI
 909         t0C2ZtA/t6zAWaSVNyixIaZgS7s6OCYVVgHxo6797VvSAcCQESkC8nk8dbpR1LBY
 910         1+IbXDLqvdZ1XtCu0yKqWhkpC5mUHt4axk43VeGXqySZi/diVNkZ1LZt34ftA/5k
 911         E90HQiLOwVWPWJNmc6Z0f9WOrGa4RgiOnCfulQCvV3y4FyTPdzNL7Q3mcUV7QMyU
 912         B9UQ==
 913 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 914         messagingengine.com; h=cc:cc:content-transfer-encoding:date:date
 915         :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to
 916         :message-id:mime-version:references:reply-to:sender:subject
 917         :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender
 918         :x-sasl-enc; s=fm3; t=1659317919; x=1659404319; bh=rD7/11Zj88Bza
 919         u+Vwi4eZX1L45MuyWwCwsxlNl9bPbo=; b=sp1Z2nGdxv4sx0AYKoO8u8M0Cio12
 920         tAasnqd1WoQ67MyQ2hABZz85PZAhwEzmiqeIx+HH4IKZ4RG4DFLA9SHDQw0PhqaR
 921         27DtggW/j9xkDL60xELIbwmJDgQzTsdyJ/2o9s5nYvka2qXjvOH4y+F/sa26fV92
 922         E61uzA2MXqvMqXmVy7bdPRub+m1DWT7TWzFQ/QSVfFksrDZqY30KE/TqwZjFQ9FP
 923         0V9ERXC03ArPHe4yGIn2LPqFtNWwr7AkaflE0VZ7L5kA8uziToVTbJHU1nxtRJB+
 924         7MpqCo6j5JHP7AaViTKuas9ILeVYBeCLstKVwqebveLCX3ihW/58O3fdw==
 925 X-ME-Sender: <xms:ny7nYsQWO4InSOu46Eo-byMlNJzwqyBFOC8th9-3GnFfAzWHboBAGA>
 926     <xme:ny7nYpzlQsYwJNu43DEmGJKlEXmGHAAQK28niWHHHnC9-uUEwZw_FTcL1Exv0gEMJ
 927     FDTeBsoWYNETA6-AQ>
 928 X-ME-Received:
 929  <xmr:ny7nYp1D9m9A7HQMvMC0XwLJxA6zqo6GbZHOJS7XUDTEmfAnF6Lt13b0sb5hTtnwxAAIIXrSwpC7VXAQwMbjQGrLCloZ6XZ83GNF07IdRJ9Yr3h1JkA89TmLUD9O>
 930 X-ME-Proxy-Cause:
 931  gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddggedtucetufdoteggodetrfdotf
 932     fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
 933     uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
 934     cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptehnughr
 935     vghsucfhrhgvuhhnugcuoegrnhgurhgvshesrghnrghrrgiivghlrdguvgeqnecuggftrf
 936     grthhtvghrnhepueduhedvjeeigfejvdfhgffhhfetteetfeffieehtdehjeeglefgffdu
 937     udejfffhnecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucevlhhushhtvghrufhiii
 938     gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegrnhgurhgvshesrghnrghrrgiivghl
 939     rdguvg
 940 X-ME-Proxy: <xmx:ny7nYgBEOawl65or0wqzvaIbzjurzR5AEYVdOoQ1ZSSWbIG8T2mb0w>
 941     <xmx:ny7nYli4vbP_OG6LIFIctqMfr3VshxKblmTSevqZbsxC6ApPH3nV3g>
 942     <xmx:ny7nYsopbb3KR8wIEG7M2bV1YQBDDYtASqNKkSGjx1Vd1SPyx8bd2Q>
 943     <xmx:ny7nYtgO4VlMiFWArA1elH-h2wDG_LUL10wCvsgxFZA2blFrVb7MyA>
 944 Feedback-ID: id4a34324:Fastmail
 945 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun,
 946  31 Jul 2022 21:38:38 -0400 (EDT)
 947 From: Andres Freund <andres@anarazel.de>
 948 To: bpf@vger.kernel.org, linux-kernel@vger.kernel.org
 949 Cc: Alexei Starovoitov <ast@kernel.org>,
 950         Arnaldo Carvalho de Melo <acme@redhat.com>,
 951         Jiri Olsa <jolsa@kernel.org>,
 952         Sedat Dilek <sedat.dilek@gmail.com>,
 953         Quentin Monnet <quentin@isovalent.com>,
 954         Ben Hutchings <benh@debian.org>,
 955         Daniel Borkmann <daniel@iogearbox.net>
 956 Subject: [PATCH v3 6/8] tools bpf_jit_disasm: Don't display
 957  disassembler-four-args feature test
 958 Date: Sun, 31 Jul 2022 18:38:32 -0700
 959 Message-Id: <20220801013834.156015-7-andres@anarazel.de>
 960 X-Mailer: git-send-email 2.37.0.3.g30cc8d0f14
 961 In-Reply-To: <20220801013834.156015-1-andres@anarazel.de>
 962 References: <20220622231624.t63bkmkzphqvh3kx@alap3.anarazel.de>
 963  <20220801013834.156015-1-andres@anarazel.de>
 964 MIME-Version: 1.0
 965 Precedence: bulk
 966 List-ID: <bpf.vger.kernel.org>
 967 X-Mailing-List: bpf@vger.kernel.org
 968 X-Patchwork-Delegate: bpf@iogearbox.net
 969
 970 The feature check does not seem important enough to display. Suggested by
 971 Jiri Olsa.
 972
 973 Cc: Jiri Olsa <jolsa@kernel.org>
 974 Cc: Alexei Starovoitov <ast@kernel.org>
 975 Cc: Daniel Borkmann <daniel@iogearbox.net>
 976 Cc: Sedat Dilek <sedat.dilek@gmail.com>
 977 Cc: Quentin Monnet <quentin@isovalent.com>
 978 Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de
 979 Signed-off-by: Andres Freund <andres@anarazel.de>
 980 ---
 981  tools/bpf/Makefile | 2 +-
 982  1 file changed, 1 insertion(+), 1 deletion(-)
 983
 984 diff --git a/tools/bpf/Makefile b/tools/bpf/Makefile
 985 index 664601ab1705..243b79f2b451 100644
 986 --- a/tools/bpf/Makefile
 987 +++ b/tools/bpf/Makefile
 988 @@ -35,7 +35,7 @@ endif
 989
 990  FEATURE_USER = .bpf
 991  FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled
 992 -FEATURE_DISPLAY = libbfd disassembler-four-args
 993 +FEATURE_DISPLAY = libbfd
 994
 995  check_feat := 1
 996  NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean resolve_btfids_clean
 997
 998 From patchwork Mon Aug  1 01:38:33 2022
 999 Content-Type: text/plain; charset="utf-8"
1000 MIME-Version: 1.0
1001 Content-Transfer-Encoding: 7bit
1002 X-Patchwork-Submitter: Andres Freund <andres@anarazel.de>
1003 X-Patchwork-Id: 12933318
1004 X-Patchwork-Delegate: bpf@iogearbox.net
1005 Return-Path: <bpf-owner@kernel.org>
1006 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
1007         aws-us-west-2-korg-lkml-1.web.codeaurora.org
1008 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
1009         by smtp.lore.kernel.org (Postfix) with ESMTP id E29C6C19F2D
1010         for <bpf@archiver.kernel.org>; Mon,  1 Aug 2022 01:38:52 +0000 (UTC)
1011 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
1012         id S238819AbiHABiu (ORCPT <rfc822;bpf@archiver.kernel.org>);
1013         Sun, 31 Jul 2022 21:38:50 -0400
1014 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48032 "EHLO
1015         lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
1016         with ESMTP id S238779AbiHABim (ORCPT <rfc822;bpf@vger.kernel.org>);
1017         Sun, 31 Jul 2022 21:38:42 -0400
1018 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com
1019  [64.147.123.24])
1020         by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7FB711C04;
1021         Sun, 31 Jul 2022 18:38:41 -0700 (PDT)
1022 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44])
1023         by mailout.west.internal (Postfix) with ESMTP id 02122320070D;
1024         Sun, 31 Jul 2022 21:38:39 -0400 (EDT)
1025 Received: from mailfrontend2 ([10.202.2.163])
1026   by compute4.internal (MEProxy); Sun, 31 Jul 2022 21:38:41 -0400
1027 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anarazel.de; h=
1028         cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to
1029         :in-reply-to:message-id:mime-version:references:reply-to:sender
1030         :subject:subject:to:to; s=fm3; t=1659317919; x=1659404319; bh=oS
1031         FTQojBZ/1qGNcUG/xxkjgz71sl82f+LgDJhWiGZqU=; b=pb3sFrip5okyDi1vzq
1032         rFD56uavUvzVIs2skzmLy270uvhJbpu8kGI8xaZFis9UFlbRjZ15f+ujPF0aYjxA
1033         QhoHz+3AZ1jypYhhAFkwi+Ehl/yD8MYbbugWaddPh+D60NVPw9sErWA0tdD6o9Oy
1034         bUUrK+2j7QESs+gMuu+C4V/72OrkVGkTOu3edZ3WGF8x4fq/4JIVU6EGIsoVqUcH
1035         cvI/3MeJcXCLXS/oxP5HsJBErzGAsUwsCrUO2EapCztBV89x7Up187hYKoVnF7Cg
1036         uOaUhTX4LDe9z+UvOqHRj9eYAiqek1CuO6PUc6TCGCCpsfwWrzVjC0Xpq9vyZtMN
1037         4cMQ==
1038 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
1039         messagingengine.com; h=cc:cc:content-transfer-encoding:date:date
1040         :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to
1041         :message-id:mime-version:references:reply-to:sender:subject
1042         :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender
1043         :x-sasl-enc; s=fm3; t=1659317919; x=1659404319; bh=oSFTQojBZ/1qG
1044         NcUG/xxkjgz71sl82f+LgDJhWiGZqU=; b=zXtAJJoKRiKCzdoRvahlX09cNLdj9
1045         SPFFWVl01J8A83cBneacsWx+EV3Qaczjh5UuGMkVlUaS8Qqrpbrkyj7LGvSRklgM
1046         qFzkZUAJg8apv+mcpyOX8qqCrBg6zXa8CWnHHdqVxhpUqjnE71/DuS7tQhjnlWUn
1047         2vZHfgHaxvRasp7G1DZnc+dpXcCwXk95xlo9pqeQM74HMQ1svHMFAdPxt8SidoBV
1048         N+9vnJwonnuPUFU0kYkLe5RNSzwDf+czjX1gvAaMHrGJNmip/hjDmoAuJ1oPyFgJ
1049         crNabezgQGJLVnOl1rV0Hf0/h5bpYhgcs4f6bYJP5Dne5CcMJuEDp18XA==
1050 X-ME-Sender: <xms:ny7nYtYpP2i9r921-iEyEYC7DjKFBeE8SXvzPt8i--MeiyZ3-vXYRg>
1051     <xme:ny7nYkYwuY_bwAXY8PIkAjgc4-rLF3fphdI2aLNqCEbq7B3sZhTFizs_iX-lCfqfD
1052     hAl8NH9djwLtSOoxg>
1053 X-ME-Received:
1054  <xmr:ny7nYv_JIL9nZxrouzuSxipdhhLD71__jGIOcdBTFw5wGxSMTH9MArqzRsmWjHG1q-_MRjGHClnYzkUuCbQ2y79xg7yZFK2GRbaa8m2b2R33jUMM4gXlYJY8Ibfw>
1055 X-ME-Proxy-Cause:
1056  gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddggedtucetufdoteggodetrfdotf
1057     fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
1058     uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
1059     cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptehnughr
1060     vghsucfhrhgvuhhnugcuoegrnhgurhgvshesrghnrghrrgiivghlrdguvgeqnecuggftrf
1061     grthhtvghrnhepleejgfdvfefhudektddtveegtdekieegffdtkeeljeetudevffeltdei
1062     feeugeeinecuffhomhgrihhnpehsohhurhgtvgifrghrvgdrohhrghdpkhgvrhhnvghlrd
1063     horhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhep
1064     rghnughrvghssegrnhgrrhgriigvlhdruggv
1065 X-ME-Proxy: <xmx:ny7nYrqHaHSR4UCJJ_IPf3e82HvCe8BCmDvMHuyjB675Z3_kA2MUqQ>
1066     <xmx:ny7nYoqqLiIeoNfkE0ee6WXg4RGwNav9ct1fnL-h1kNk7geOoTnwKA>
1067     <xmx:ny7nYhQ1Nd9nNO6TjGAicgjmHVTN37P1Z3PIXPT0__5xwvmVf4CNcg>
1068     <xmx:ny7nYpewwtahoNWuoeYXhRwKkDbLLawAEdMjRVYzlyYizYN0Pa-Zig>
1069 Feedback-ID: id4a34324:Fastmail
1070 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun,
1071  31 Jul 2022 21:38:38 -0400 (EDT)
1072 From: Andres Freund <andres@anarazel.de>
1073 To: bpf@vger.kernel.org, linux-kernel@vger.kernel.org
1074 Cc: Alexei Starovoitov <ast@kernel.org>,
1075         Arnaldo Carvalho de Melo <acme@redhat.com>,
1076         Jiri Olsa <jolsa@kernel.org>,
1077         Sedat Dilek <sedat.dilek@gmail.com>,
1078         Quentin Monnet <quentin@isovalent.com>,
1079         Ben Hutchings <benh@debian.org>
1080 Subject: [PATCH v3 7/8] tools bpftool: Fix compilation error with new binutils
1081 Date: Sun, 31 Jul 2022 18:38:33 -0700
1082 Message-Id: <20220801013834.156015-8-andres@anarazel.de>
1083 X-Mailer: git-send-email 2.37.0.3.g30cc8d0f14
1084 In-Reply-To: <20220801013834.156015-1-andres@anarazel.de>
1085 References: <20220622231624.t63bkmkzphqvh3kx@alap3.anarazel.de>
1086  <20220801013834.156015-1-andres@anarazel.de>
1087 MIME-Version: 1.0
1088 Precedence: bulk
1089 List-ID: <bpf.vger.kernel.org>
1090 X-Mailing-List: bpf@vger.kernel.org
1091 X-Patchwork-Delegate: bpf@iogearbox.net
1092
1093 binutils changed the signature of init_disassemble_info(), which now causes
1094 compilation to fail for tools/bpf/bpftool/jit_disasm.c, e.g. on debian
1095 unstable. Relevant binutils commit:
1096 https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07
1097
1098 Wire up the feature test and switch to init_disassemble_info_compat(),
1099 which were introduced in prior commits, fixing the compilation failure.
1100
1101 I verified that bpftool can still disassemble bpf programs, both with an
1102 old and new dis-asm.h API. There are no output changes for plain and json
1103 formats. When comparing the output from old binutils (2.35)
1104 to new bintuils with the patch (upstream snapshot) there are a few output
1105 differences, but they are unrelated to this patch. An example hunk is:
1106    2f:  pop    %r14
1107    31:  pop    %r13
1108    33:  pop    %rbx
1109 -  34:  leaveq
1110 -  35:  retq
1111 +  34:  leave
1112 +  35:  ret
1113
1114 Cc: Alexei Starovoitov <ast@kernel.org>
1115 Cc: Sedat Dilek <sedat.dilek@gmail.com>
1116 Cc: Quentin Monnet <quentin@isovalent.com>
1117 Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de
1118 Signed-off-by: Andres Freund <andres@anarazel.de>
1119 ---
1120  tools/bpf/bpftool/Makefile     |  5 +++-
1121  tools/bpf/bpftool/jit_disasm.c | 42 +++++++++++++++++++++++++++-------
1122  2 files changed, 38 insertions(+), 9 deletions(-)
1123
1124 diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
1125 index c6d2c77d0252..436e671b2657 100644
1126 --- a/tools/bpf/bpftool/Makefile
1127 +++ b/tools/bpf/bpftool/Makefile
1128 @@ -93,7 +93,7 @@ INSTALL ?= install
1129  RM ?= rm -f
1130
1131  FEATURE_USER = .bpftool
1132 -FEATURE_TESTS = libbfd disassembler-four-args zlib libcap \
1133 +FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled zlib libcap \
1134         clang-bpf-co-re
1135  FEATURE_DISPLAY = libbfd disassembler-four-args zlib libcap \
1136         clang-bpf-co-re
1137 @@ -117,6 +117,9 @@ endif
1138  ifeq ($(feature-disassembler-four-args), 1)
1139  CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE
1140  endif
1141 +ifeq ($(feature-disassembler-init-styled), 1)
1142 +    CFLAGS += -DDISASM_INIT_STYLED
1143 +endif
1144
1145  LIBS = $(LIBBPF) -lelf -lz
1146  LIBS_BOOTSTRAP = $(LIBBPF_BOOTSTRAP) -lelf -lz
1147 diff --git a/tools/bpf/bpftool/jit_disasm.c b/tools/bpf/bpftool/jit_disasm.c
1148 index 24734f2249d6..aaf99a0168c9 100644
1149 --- a/tools/bpf/bpftool/jit_disasm.c
1150 +++ b/tools/bpf/bpftool/jit_disasm.c
1151 @@ -24,6 +24,7 @@
1152  #include <sys/stat.h>
1153  #include <limits.h>
1154  #include <bpf/libbpf.h>
1155 +#include <tools/dis-asm-compat.h>
1156
1157  #include "json_writer.h"
1158  #include "main.h"
1159 @@ -39,15 +40,12 @@ static void get_exec_path(char *tpath, size_t size)
1160  }
1161
1162  static int oper_count;
1163 -static int fprintf_json(void *out, const char *fmt, ...)
1164 +static int printf_json(void *out, const char *fmt, va_list ap)
1165  {
1166 -       va_list ap;
1167         char *s;
1168         int err;
1169
1170 -       va_start(ap, fmt);
1171         err = vasprintf(&s, fmt, ap);
1172 -       va_end(ap);
1173         if (err < 0)
1174                 return -1;
1175
1176 @@ -73,6 +71,32 @@ static int fprintf_json(void *out, const char *fmt, ...)
1177         return 0;
1178  }
1179
1180 +static int fprintf_json(void *out, const char *fmt, ...)
1181 +{
1182 +       va_list ap;
1183 +       int r;
1184 +
1185 +       va_start(ap, fmt);
1186 +       r = printf_json(out, fmt, ap);
1187 +       va_end(ap);
1188 +
1189 +       return r;
1190 +}
1191 +
1192 +static int fprintf_json_styled(void *out,
1193 +                              enum disassembler_style style __maybe_unused,
1194 +                              const char *fmt, ...)
1195 +{
1196 +       va_list ap;
1197 +       int r;
1198 +
1199 +       va_start(ap, fmt);
1200 +       r = printf_json(out, fmt, ap);
1201 +       va_end(ap);
1202 +
1203 +       return r;
1204 +}
1205 +
1206  void disasm_print_insn(unsigned char *image, ssize_t len, int opcodes,
1207                        const char *arch, const char *disassembler_options,
1208                        const struct btf *btf,
1209 @@ -99,11 +123,13 @@ void disasm_print_insn(unsigned char *image, ssize_t len, int opcodes,
1210         assert(bfd_check_format(bfdf, bfd_object));
1211
1212         if (json_output)
1213 -               init_disassemble_info(&info, stdout,
1214 -                                     (fprintf_ftype) fprintf_json);
1215 +               init_disassemble_info_compat(&info, stdout,
1216 +                                            (fprintf_ftype) fprintf_json,
1217 +                                            fprintf_json_styled);
1218         else
1219 -               init_disassemble_info(&info, stdout,
1220 -                                     (fprintf_ftype) fprintf);
1221 +               init_disassemble_info_compat(&info, stdout,
1222 +                                            (fprintf_ftype) fprintf,
1223 +                                            fprintf_styled);
1224
1225         /* Update architecture info for offload. */
1226         if (arch) {
1227
1228 From patchwork Mon Aug  1 01:38:34 2022
1229 Content-Type: text/plain; charset="utf-8"
1230 MIME-Version: 1.0
1231 Content-Transfer-Encoding: 7bit
1232 X-Patchwork-Submitter: Andres Freund <andres@anarazel.de>
1233 X-Patchwork-Id: 12933316
1234 X-Patchwork-Delegate: bpf@iogearbox.net
1235 Return-Path: <bpf-owner@kernel.org>
1236 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
1237         aws-us-west-2-korg-lkml-1.web.codeaurora.org
1238 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
1239         by smtp.lore.kernel.org (Postfix) with ESMTP id A8B94C00140
1240         for <bpf@archiver.kernel.org>; Mon,  1 Aug 2022 01:38:49 +0000 (UTC)
1241 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
1242         id S238562AbiHABir (ORCPT <rfc822;bpf@archiver.kernel.org>);
1243         Sun, 31 Jul 2022 21:38:47 -0400
1244 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48014 "EHLO
1245         lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
1246         with ESMTP id S238770AbiHABim (ORCPT <rfc822;bpf@vger.kernel.org>);
1247         Sun, 31 Jul 2022 21:38:42 -0400
1248 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com
1249  [64.147.123.24])
1250         by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A08FA11A08;
1251         Sun, 31 Jul 2022 18:38:41 -0700 (PDT)
1252 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43])
1253         by mailout.west.internal (Postfix) with ESMTP id 021123200754;
1254         Sun, 31 Jul 2022 21:38:39 -0400 (EDT)
1255 Received: from mailfrontend1 ([10.202.2.162])
1256   by compute3.internal (MEProxy); Sun, 31 Jul 2022 21:38:41 -0400
1257 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anarazel.de; h=
1258         cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to
1259         :in-reply-to:message-id:mime-version:references:reply-to:sender
1260         :subject:subject:to:to; s=fm3; t=1659317919; x=1659404319; bh=6n
1261         KfbW0v7Y4ArSpwOn82/9CJJgLYAvDqGhJ+A2bxllE=; b=S80hUbKnDlCs5USsr8
1262         Hf4qml0BxyECU/jxcok4qIV6+PVzahIaoVATXlFrQuXOSgfJ0QZMofbGz6i+Rsic
1263         ugcgY/w4vA3ChjlTSOCCaHZmzgH4crleqNvXInS28ShnrCCM2gsKT6MmV1QPNugb
1264         g6Ewv/xz9EFtHglHoBc1se92piDaurQYi9So113BVIcAtyfXHAyWEzeIZa+YuNLj
1265         /LA4pvEvP45u0yAgTs0R+2oJTP9zXkWC0oOeIGJyWU0k7wluIeEWBVoigLdNDXOx
1266         YqWmG9xBwHHL/0G5VN1ClTicFCPTkUXi1UgACaP4NUYoKI2PRPskdCX1lmLhQPOg
1267         yilg==
1268 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
1269         messagingengine.com; h=cc:cc:content-transfer-encoding:date:date
1270         :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to
1271         :message-id:mime-version:references:reply-to:sender:subject
1272         :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender
1273         :x-sasl-enc; s=fm3; t=1659317919; x=1659404319; bh=6nKfbW0v7Y4Ar
1274         SpwOn82/9CJJgLYAvDqGhJ+A2bxllE=; b=KmbnfcWyoxtdB7bJz/kToIkcS///6
1275         P9n5Rs1Tev189tItvn3Rx0nI+dKkiaIcQ6tiB0rU7ngEGAhCtu8SCT0KbqY/yiq9
1276         XojJREcelboZn1M7abcAxJIijljyapu/iZKhOmJndX3034SSogYIcmJqkK4eq+pi
1277         N2g0cfI6HSjJtIlktrqBhBY8RZtrh0UmtQhBEyYSoQvC6kL0ou4F6m61FxIdbchQ
1278         vnPoVt272g9oPLoVrf1s8T106mnUyg1ulPqMvjepuO2sbLQ2czfLkrL0MAJVYPKU
1279         LRxTqnpmSloeZn1Gg/4EEGkg0pEZRCGoUXK2ejezRWirHsWxgz+98pUKQ==
1280 X-ME-Sender: <xms:ny7nYkE385Ry_XV-uRF8k1W674TW0l-Xp-dezVU6nMSPUjYydP6swQ>
1281     <xme:ny7nYtUIFYU008T8abL63s8nIWdJ-hIjVi5mxEe2Lj2KcYNbTjXj_5yy5SzDk4xKs
1282     yaVqQSFucMEn3Fpag>
1283 X-ME-Received:
1284  <xmr:ny7nYuJ4oGElVijAPonH8aiD6hy6TIaa580ZnywTdpdiF7ttwI7LSrLoP94waaE80z7G2MuPFplfELI5yvRZf_aaR926cV1b9ojVy7xdhDxC2sR2Uyd6tBGd0xfk>
1285 X-ME-Proxy-Cause:
1286  gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddggedtucetufdoteggodetrfdotf
1287     fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
1288     uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
1289     cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptehnughr
1290     vghsucfhrhgvuhhnugcuoegrnhgurhgvshesrghnrghrrgiivghlrdguvgeqnecuggftrf
1291     grthhtvghrnhepueduhedvjeeigfejvdfhgffhhfetteetfeffieehtdehjeeglefgffdu
1292     udejfffhnecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucevlhhushhtvghrufhiii
1293     gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegrnhgurhgvshesrghnrghrrgiivghl
1294     rdguvg
1295 X-ME-Proxy: <xmx:ny7nYmHwKW-4AjNeIo9IvDJaC4pvGTX6ZLAaznu_S0OlKJnzRi0tHw>
1296     <xmx:ny7nYqVDgvYoM7lH6GVmEf4K2YMH9ocqa3lXx2nEV7hOSDp4kSzadg>
1297     <xmx:ny7nYpOnP_Ed98_nzSuZoUWRgkzsafVstw8NDa98JEK6N-U68Um8eg>
1298     <xmx:ny7nYsLuEM3pl97nq-iaYUAYItzc2mRPALeoBgpzq2jR9i56zNS8JQ>
1299 Feedback-ID: id4a34324:Fastmail
1300 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun,
1301  31 Jul 2022 21:38:38 -0400 (EDT)
1302 From: Andres Freund <andres@anarazel.de>
1303 To: bpf@vger.kernel.org, linux-kernel@vger.kernel.org
1304 Cc: Alexei Starovoitov <ast@kernel.org>,
1305         Arnaldo Carvalho de Melo <acme@redhat.com>,
1306         Jiri Olsa <jolsa@kernel.org>,
1307         Sedat Dilek <sedat.dilek@gmail.com>,
1308         Quentin Monnet <quentin@isovalent.com>,
1309         Ben Hutchings <benh@debian.org>
1310 Subject: [PATCH v3 8/8] tools bpftool: Don't display disassembler-four-args
1311  feature test
1312 Date: Sun, 31 Jul 2022 18:38:34 -0700
1313 Message-Id: <20220801013834.156015-9-andres@anarazel.de>
1314 X-Mailer: git-send-email 2.37.0.3.g30cc8d0f14
1315 In-Reply-To: <20220801013834.156015-1-andres@anarazel.de>
1316 References: <20220622231624.t63bkmkzphqvh3kx@alap3.anarazel.de>
1317  <20220801013834.156015-1-andres@anarazel.de>
1318 MIME-Version: 1.0
1319 Precedence: bulk
1320 List-ID: <bpf.vger.kernel.org>
1321 X-Mailing-List: bpf@vger.kernel.org
1322 X-Patchwork-Delegate: bpf@iogearbox.net
1323
1324 The feature check does not seem important enough to display. Requested by
1325 Jiri Olsa.
1326
1327 Cc: Jiri Olsa <jolsa@kernel.org>
1328 Cc: Alexei Starovoitov <ast@kernel.org>
1329 Cc: Sedat Dilek <sedat.dilek@gmail.com>
1330 Cc: Quentin Monnet <quentin@isovalent.com>
1331 Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de
1332 Signed-off-by: Andres Freund <andres@anarazel.de>
1333 ---
1334  tools/bpf/bpftool/Makefile | 3 +--
1335  1 file changed, 1 insertion(+), 2 deletions(-)
1336
1337 diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
1338 index 436e671b2657..517df016d54a 100644
1339 --- a/tools/bpf/bpftool/Makefile
1340 +++ b/tools/bpf/bpftool/Makefile
1341 @@ -95,8 +95,7 @@ RM ?= rm -f
1342  FEATURE_USER = .bpftool
1343  FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled zlib libcap \
1344         clang-bpf-co-re
1345 -FEATURE_DISPLAY = libbfd disassembler-four-args zlib libcap \
1346 -       clang-bpf-co-re
1347 +FEATURE_DISPLAY = libbfd zlib libcap clang-bpf-co-re
1348
1349  check_feat := 1
1350  NON_CHECK_FEAT_TARGETS := clean uninstall doc doc-clean doc-install doc-uninstall