Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752465AbdL0TFD (ORCPT ); Wed, 27 Dec 2017 14:05:03 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:33094 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752024AbdL0TFA (ORCPT ); Wed, 27 Dec 2017 14:05:00 -0500 Date: Wed, 27 Dec 2017 19:04:24 +0000 From: Roman Gushchin To: Alexei Starovoitov CC: Quentin Monnet , , , , Jakub Kicinski , Alexei Starovoitov , Daniel Borkmann Subject: Re: [PATCH v2 bpf-next 2/2] tools/bpftool: fix bpftool build with bintutils >= 2.8 Message-ID: <20171227190417.GA2361@castle> References: <20171222161152.24715-1-guro@fb.com> <20171222161152.24715-2-guro@fb.com> <20171227023204.eulgkbg7epj7nl76@ast-mbp> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20171227023204.eulgkbg7epj7nl76@ast-mbp> User-Agent: Mutt/1.9.1 (2017-09-22) X-Originating-IP: [2620:10d:c092:180::1:bb81] X-ClientProxiedBy: DB6PR07CA0086.eurprd07.prod.outlook.com (2603:10a6:6:2b::24) To BL2PR15MB1075.namprd15.prod.outlook.com (2603:10b6:201:17::9) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b49aac9c-ff24-4989-5869-08d54d5cabc6 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060);SRVR:BL2PR15MB1075; X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1075;3:9DdTkK0rhrYS3HYCKY9r2TavyF/4rwEFYRBk7h+qgRK9zn5reGuv184/lus5FTgc8QqbgNrYzHoQ5kA6IUzx1O7m+3FgRS+2eGty6QZ74yxBOoP7K130TRte7QQsk+7wlvut3OZyJ7FwshxumyuVLDIIo8Wh5UPkktfvYJWTUsDoqVLVCQ3LEedUG+jawnkQUsk1nWc5/DtWuoyVeaw5AQLpbWknEJHBD9kT2kihGzJDK55S8eM6f8OcXAdr/Trk;25:qQBduZ6gKobF7SApftTj9SNEkdP9EahZQXI7RS0iBz+Q9PaCyWk+6mrJggY8UD6b6pSF90aF8bFZ+u78L9hyGhn7T+4Aq/GUl1/kxx/87nlcbH1uBIyEvEws8F4QH62/uSJJmx2wOx9Aqq6Ts0a7hEaT6Uqb5jirYtPPHAes8GtN+x3g36GMP3WBZjOOR/K79OBX7PnmtKKt0E2Z/8dWcUV8SsSqNKWkFPeKUbVIT39SJRnB4MleFT0u7etLa7ZpcqKshqUhjMJiLSKW/ODRAGd3u83gPYYyDzC+bHbrHWjskx0Mxd2mru5Y4jzBCZRbtThjugywJsm3Vk3cGj2jkQ==;31:JQ3wkDqtasJP4UmZ93hTB9Tvob4S1uftlGtww9W4pBaivhHauKpGHzhNoe9c8pxBX7JQacTAyosGncT8E5iFfyj6ekCg3/jl/AwtTqgkp1LOih5JjAnzB+UNxz3sqrY/hVwKtoJxxniG+TF+fN6B8pDhxoPhwXTML1qDnQiZNOsjuXx8OpjIcLqUse5X+RtvM7wwtmyOlc9s6rlaHrOpuKSqxQLCdfwVeqT+ltfmJWg= X-MS-TrafficTypeDiagnostic: BL2PR15MB1075: X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1075;20:HR68+488j8xANqlEjNTm/IEdPR/Z4IZyNEFBXOaSanewbZ2FwSed0whtm2AjormLw89x4goQeco5z7292l5wExZenD6NScSxMBGSlfeIEB5sqDLEBlDmClTgeNi8HJXIAFAacKRP6OTFOWrsD3gV8UMf+le5Rg+d/+EToVsAXx6r038J1SiUUs/oXCJdzph+kW6b5fk6/HvQZlc9CNAtQmFT4qLq+wJmAjo9n2Sr+DRITpcmRgbf2wfRINRCncaEWljSZIhJN9ohFnKKLqUgPeAiqrBXLyICDg180WTwUs3yVJDSRR5VhaRkS8QxoSJz2jvJUBtAMMDB8wWxXdaCXp6IHFlUrXgq7DIGaAHZ0OMc/BZas/Lt4qbzcELFujGFJT6dr+SWpXrVw+IS1Hxc6WE9oGrKohD/M+aQ4tx2xqyVqDTe686jTzyvwnfUt9lyS/nHAk7RTYDjUwruKYJsyivsZMJrRJK6BfjqYdx1z4pulJxT4RSi30tSIjPkdQtW;4:jH3ELDCqcRDqyraj2auUV6jaKWUApkQ6Kpd5NzXw/OaOzKMa70XIh7Bux0TNExFWoTGuWgKskUVMObrP/SHBrEO+n0RNb7Y7Uyo1Ek2IBnlri0Ag4aummE3hEE6KVqfRlwDHM7ang3LoQFsktSyVlberbPe9xINfQQ4RBaLCi7aC5L0Ot0fIunmx766wuZJK3mcf/BwL87WV4cnvaRtmGY1IVhYXqx1fN/TCctlX+8MLodlw4vEyRXfiKsAvaNqPyJxy8NqwbWGrJPX4onWXuGQkbk1LlO67Vv/PpZgnMxxk91DrH+LGLo+SI1cjFDOH X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(67672495146484); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040470)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231023)(11241501184)(944501075)(3002001)(10201501046)(6041268)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011);SRVR:BL2PR15MB1075;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:BL2PR15MB1075; X-Forefront-PRVS: 0534947130 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(376002)(39860400002)(346002)(39380400002)(366004)(396003)(24454002)(199004)(189003)(377424004)(6916009)(6666003)(2950100002)(305945005)(7736002)(83506002)(6496006)(6246003)(52396003)(39060400002)(386003)(59450400001)(33896004)(52116002)(76176011)(316002)(81166006)(47776003)(68736007)(58126008)(54906003)(8676002)(105586002)(5660300001)(81156014)(16586007)(8936002)(6116002)(2906002)(23726003)(1076002)(50466002)(575784001)(93886005)(106356001)(33656002)(53936002)(97736004)(86362001)(55016002)(4001150100001)(229853002)(4326008)(33716001)(25786009)(9686003)(478600001)(18370500001)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:BL2PR15MB1075;H:castle;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR15MB1075;23:7exvUH5RtHqMfidqInyB2zI82On1ObO0IvG6LnwVY?= =?us-ascii?Q?RuMgOwuNrHeAjVYmtbCk4YHy/O7Tz5v3adxz2DpL8IvlYq5zFLcAMJqI3dtl?= =?us-ascii?Q?hQmdx8tV4/lAKZCWKHCmBkHaXn7FmYleVCItNqOqu/HRkCX4M2GKdfWIYOyG?= =?us-ascii?Q?UPKl1WDMKxbyDL8XA1ghGlaWyUhoKEDCojlqz7BSVrDDhZWDPRooQAPL81Vz?= =?us-ascii?Q?c8VUZXwifXMVOWsHEwPMGf/afu7gz7YUPrdzbW2yau1gqYmaP4Jx4RPLmIQ1?= =?us-ascii?Q?WpIpJk/RNdTTJPiAxarY3ymUPwfbUFm3ZkAKddk5LSNDr8sQUktIzBHBNpLy?= =?us-ascii?Q?Mk9YfAXQ+o1LH0cgQy+LwuvTDhZokb7ENDR4+Ps/YnhGgaiTI4E66OJGtk+s?= =?us-ascii?Q?r6IHhYUgPPYGKy8xngzF3it9Wgq3eb2P79hX5gXzpkyEyawh9eXhGOE8hBVh?= =?us-ascii?Q?zMlCFnceufoAtY7aJ1Kdw6WnnshY+0nwWbTELGW5R7kzQbEjb+uVAZqm13OV?= =?us-ascii?Q?i8wBF3yiLHy3sWcKQQ1gW/YzNUGe6DGHKotw102rvX15YY/t5qo6VSdK+ozw?= =?us-ascii?Q?PBQmn+OBJrzTbil/0tNG+ngIT0BCqRPZ+bOGXsIkhgEuA2fH1meN27cG9UfM?= =?us-ascii?Q?erL6QdL95e+C1SVYc4LZ/KzXtZbjKIN5jSot6h0rE9QLcWALw5yB8oo4X0Jz?= =?us-ascii?Q?qX0elVFbghyBNX9sk7l2cnSbBfXgkdN++aJR/9kUiMW9RhT2syChZh0onIhZ?= =?us-ascii?Q?KhMcodkwA3YQc7ju+lnF0iELrQUXOcn0BOIjjOWunxAcky+cxQYUC4cdSp/F?= =?us-ascii?Q?frWpM2ARByqlYcq7edSpERtkDkrMo6uL3GM4D3iUiOOsvlFtOKEDShh/L0xe?= =?us-ascii?Q?wbYQo5Gt1Mk7fAHQ43unJM666QG6AhDdezDJjRL0itZvySirJSJL4qm75ShF?= =?us-ascii?Q?+oJMa8dcnQh4JJpn5QxMgKCd+QSkZtCgGSzASJ1s4a1xQ9I6wcE9yH/oQDyB?= =?us-ascii?Q?CmypUukvetOUUfCMUqX63VTGzqCFrp/9UaXMSZY/lnChguc93gHpvP9gjZWl?= =?us-ascii?Q?oSXvhR+rtt5WOzGQS0MMsrujkNm6kmvVysvDsnzvKyBCgxjbOkqk4HILkLEQ?= =?us-ascii?Q?RfHNV0sMCjbaFnCd9KyjUjz15sbR7vjiPUoLBGvbrJUO1b5JW8lLbL3K/dtJ?= =?us-ascii?Q?q0ZFhHs1PH3VdKeHeXIY8mFoMftVwDJaG7XO4XO08YCc/fNeU6vy9Obuq3bz?= =?us-ascii?Q?bUiE0DzH3DSI/lj3WoGfSTty82VEH5Ym2aIOvv8GGTuMdFblT6eqPYUdlWVq?= =?us-ascii?Q?MoLsws+c75I4b4U0JfYUt3bGaZnOnMEHx9cjCEDkaBn4tmkj3s8A6ZWLsfn8?= =?us-ascii?Q?jJ/YSrgGLWywK3vwfcHBsuycMY=3D?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1075;6:mXMie25P7EGbiDtaSTgL+hDcNtuTuHUUJW2HJHhiOb7IV7gsJqjVyJ4zNai2GhSzz8fjsNw7vvqecQb2jJey+mmOIsG8kB+kMd2ABqHtw83sogdWutv+NWHzO980uHE9WPSsjmhRoILg5iAt6C+8OaDjbvgn7OcEaYdsdC36tsYGcj4vn65buuXIB9a3hJjfpDNL3Suouy0K2p8X2tHBG1wY9rbsugFyzSDaWZwrpJvVMAhzq919mKlwGJN4HmITiJgQLgjjdtDiBwS4H2BjC2tZ/h/cO3MGtBc9Lsu+yXtuFd+0ZohmWY54cU1YszzUs2tJmveBybE1j2YaHMRAMzRO5CIMo2sN+cIYJ4Rolq8=;5:fdnExL3SheFB2O4vIx5FZg5WtQGZ2Td/DpxUKNaZ+LR1vAtRPUQQmsqAdHEtiVol75hVqjHnkT4jbidMjK7NogLf6WNIf54/WV70xs6OberDoAAMupWbBsbb+33CVpx7jiWoNUwc3b2iqwFVeR2Nydvhyf1JCh19PURaiBk1IVY=;24:3zUxSJVZNJMIeZ/xY9abEgWsylnERbnXmdWdBC1Dvm7Q3ByLXVrbGaTMQ0PcRQiXYvCR0SqiUzNH6w5BrHmYQ6TWry7QN5BCbO8Lf1rF17k=;7:t4Uy+uIe23XvBscZTDfm2Bs7zBPZ6yKW9hAQKz8fYQsJimlydI6FYrcvoN6X3rL0Bl8gNZDZ8R4FPJEc4+vp/rz044SXeNK3APplbFZjndRmLFf/XcmL78edYePjYqPlFoSfyldLjZ6E6CzZ2f31Fw5ZghRYqPX2FPRosbSKX5Yv34YRZkdJd8yoiJtuXAy57nDwSGp/NIe4ZZ4ocjesrXy4fumnZTyxzV/1/DMDFMIQoUKR+dsoRB1TphXDlA93 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1075;20:tEU31XgSW79DdMi0vAxIznt7KSR/pNi+ZO2gw9YDf1ydCt/sTwH6nW2/Daj0cjHTuuTp4atIQqMKLsfLK/6Q4hiHjUdRHJmUvjpRKkbrHYk4a4N/iZTfSCcsIZ0jis2umR1mOYCVpFL5U2+JbmhGrJd4pLLBLDzi49/0U9CuiFU= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Dec 2017 19:04:34.0775 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b49aac9c-ff24-4989-5869-08d54d5cabc6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR15MB1075 X-OriginatorOrg: fb.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-12-27_12:,, signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3779 Lines: 87 On Tue, Dec 26, 2017 at 06:32:05PM -0800, Alexei Starovoitov wrote: > On Fri, Dec 22, 2017 at 06:50:01PM +0000, Quentin Monnet wrote: > > Hi Roman, > > > > 2017-12-22 16:11 UTC+0000 ~ Roman Gushchin > > > Bpftool build is broken with binutils version 2.28 and later. > > > > Could you check the binutils version? I believe it changed in 2.29 > > instead of 2.28. Could you update your commit log and subject > > accordingly, please? Yes, you're right. Thanks! > > > > > The cause is commit 003ca0fd2286 ("Refactor disassembler selection") > > > in the binutils repo, which changed the disassembler() function > > > signature. > > > > > > Fix this by adding a new "feature" to the tools/build/features > > > infrastructure and make it responsible for decision which > > > disassembler() function signature to use. > > > > > > Signed-off-by: Roman Gushchin > > > Cc: Jakub Kicinski > > > Cc: Alexei Starovoitov > > > Cc: Daniel Borkmann > > > --- > > > tools/bpf/Makefile | 29 +++++++++++++++++++++++ > > > tools/bpf/bpf_jit_disasm.c | 7 ++++++ > > > tools/bpf/bpftool/Makefile | 24 +++++++++++++++++++ > > > tools/bpf/bpftool/jit_disasm.c | 7 ++++++ > > > tools/build/feature/Makefile | 4 ++++ > > > tools/build/feature/test-disassembler-four-args.c | 15 ++++++++++++ > > > 6 files changed, 86 insertions(+) > > > create mode 100644 tools/build/feature/test-disassembler-four-args.c > > > > > > diff --git a/tools/bpf/Makefile b/tools/bpf/Makefile > > > index 07a6697466ef..c8ec0ae16bf0 100644 > > > --- a/tools/bpf/Makefile > > > +++ b/tools/bpf/Makefile > > > @@ -9,6 +9,35 @@ MAKE = make > > > CFLAGS += -Wall -O2 > > > CFLAGS += -D__EXPORTED_HEADERS__ -I../../include/uapi -I../../include > > > > > > +ifeq ($(srctree),) > > > +srctree := $(patsubst %/,%,$(dir $(CURDIR))) > > > +srctree := $(patsubst %/,%,$(dir $(srctree))) > > > +endif > > > + > > > +FEATURE_USER = .bpf > > > +FEATURE_TESTS = libbfd disassembler-four-args > > > +FEATURE_DISPLAY = libbfd disassembler-four-args > > > > Thanks for adding libbfd as I requested. However, you do not use it in > > the Makefile to prevent compilation if the feature is not detected (see > > "bpfdep" or "elfdep" in tools/lib/bpf/Makefile. Sorry, I should have > > pointed it in my previous review. > > > > But actually, I have another issue related to the libbfd feature: since > > commit 280e7c48c3b8 ("perf tools: fix BFD detection on opensuse") it > > requires libiberty so that libbfd is correctly detected, but libiberty > > is not needed on all distros (at least Ubuntu can have libbfd without > > libiberty). Typically, detection fails on my setup, although I do have > > libbfd installed. So forcing libbfd feature here may eventually force > > users to install libraries they do not need to compile bpftool, which is > > not what we want. > > > > I do not have a clean work around to suggest. Maybe have one > > "libbfd-something" feature that tries to compile without libiberty, then > > another one that tries with it, and compile the tools if at least one of > > them succeeds. But it's probably for another patch series. In the > > meantime, would you please simply remove libbfd detection here and > > accept my apologies for suggesting to add it in the previous review? > > I think since libbfd is already used by bpftool it's a good thing > to add feature detection. Even if it's not perfect on some setups. Agree, we can enhance it later. > > Roman, > I think you still need to do one more respin to address commit log nit? > Sure, will send soon-ish. Thanks!