From patchwork Thu Feb 28 03:04:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1049248 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="rRCRy+nJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 448y864FK7z9s4Z for ; Thu, 28 Feb 2019 14:04:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730648AbfB1DEh (ORCPT ); Wed, 27 Feb 2019 22:04:37 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:39814 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730630AbfB1DEf (ORCPT ); Wed, 27 Feb 2019 22:04:35 -0500 Received: by mail-qt1-f196.google.com with SMTP id o6so21898140qtk.6 for ; Wed, 27 Feb 2019 19:04:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X0m+toNvhcpuE9D1eqkmyxgis6Re4yBVKuiek6I61BA=; b=rRCRy+nJMhbhmPraxiId04rMDtndxHutD/icD/6MQD1NmflGmmgXb5P84VcNz8qFdH nNguQ0Eo5TC62whISbRAsZV8+cD2Sc1Z5CKvV0epNGf4ZTnc3B/5JHAyJgdvu3zAQSBu scXyLHDM9ulTlhPscQbaNHkpsI134spGo4koGVz69xsD8GaSiu1Lhj1L/8oz7mCosITE DW6Jvk2ivCpcyr5AaexGnsvWt6Dg4fzBGFpWpZ/e1dYnQejlRG/h7P7uKL6FSCudjDZL dbinImg7wAwPqCSrSgxlhPLmfNpA7cZkwobggV0iKaS8AWMlv0MUEnr6OGHAh7iXVOdN Ec0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X0m+toNvhcpuE9D1eqkmyxgis6Re4yBVKuiek6I61BA=; b=LnlXKeh8zJ5goQm+rEULyUAhseyh3jiccaTPqvQ7oWAtnyIQ4S0+sIhl0Q6X4AWSwc E8iBwRXKTQNRq3GYRuh3h9AWFnvU35/T/r2BBYxmkiZ/8VtlUZeyNogcaZNg1liWAxb4 2k6AdPMruecqIlOKrhjHuU+kz9SvoNbyNEzkFofqVBG8taN13tpwPByM7tFdQd8uqvKn kOUxl5K3jAERShNWFMMywc970xJMCWs86GU454jx4GG/p95QCJwKy7mcbE/R9MPEwGue LxyaFe+UaYp/UIkAX3/Nxt52FUrfUL1XQhwRDTaULpyojBnCsORAvfkuASF+4vmrpCY7 kNGQ== X-Gm-Message-State: APjAAAUbnGSiYzM7dzXxy+46JoTR0u3ZxXXXR6XYHMzbkkB0/TXpWfbn FsjX+hvXRHyXxUgLx7BtmHDX5g== X-Google-Smtp-Source: APXvYqyZ4b/MkeOhwgiTnjRKRa2Q+F1jfhE+Nz+5rKhv35PAq8RXTRA+mfqsIkQeW4TLLOQUoRsJ8w== X-Received: by 2002:a0c:d251:: with SMTP id o17mr4610481qvh.207.1551323074029; Wed, 27 Feb 2019 19:04:34 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id r44sm11242066qtb.53.2019.02.27.19.04.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Feb 2019 19:04:33 -0800 (PST) From: Jakub Kicinski To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH bpf-next v2 5/5] tools: libbpf: make sure readelf shows full names in build checks Date: Wed, 27 Feb 2019 19:04:14 -0800 Message-Id: <20190228030414.18973-6-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190228030414.18973-1-jakub.kicinski@netronome.com> References: <20190228030414.18973-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org readelf truncates its output by default to attempt to make it more readable. This can lead to function names getting aliased if they differ late in the string. Use --wide parameter to avoid truncation. Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet Acked-by: Andrii Nakryiko --- tools/lib/bpf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 761691bd72ad..a05c43468bd0 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -132,9 +132,9 @@ BPF_IN := $(OUTPUT)libbpf-in.o LIB_FILE := $(addprefix $(OUTPUT),$(LIB_FILE)) VERSION_SCRIPT := libbpf.map -GLOBAL_SYM_COUNT = $(shell readelf -s $(BPF_IN) | \ +GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN) | \ awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {s++} END{print s}') -VERSIONED_SYM_COUNT = $(shell readelf -s $(OUTPUT)libbpf.so | \ +VERSIONED_SYM_COUNT = $(shell readelf -s --wide $(OUTPUT)libbpf.so | \ grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) CMD_TARGETS = $(LIB_FILE)