From patchwork Thu Jan 16 23:16:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 233830 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55873C33CAF for ; Thu, 16 Jan 2020 23:22:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 23DA22087E for ; Thu, 16 Jan 2020 23:22:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579216942; bh=q8KLLowO5RVKGE68CuPMLPClTKRrKOm0YR/NZpURnGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QKCJywnc8GEz5rKp/LTp91gaorRozrCzYWip6Dyum9vpd7qEZpRVYSTptfyMeFIYV GNBlfS0UEazLmWl6IRJUM8uuMRs7u+mZkbGJIDKm/9Pw+ufxVElJBWN57h9RpIYjcD iTF6xIDfsYAm7N4s/mvIr/uAWZ0AmO3QaOz3Dmm0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390913AbgAPXWU (ORCPT ); Thu, 16 Jan 2020 18:22:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:50072 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389386AbgAPXWR (ORCPT ); Thu, 16 Jan 2020 18:22:17 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EB74C206D9; Thu, 16 Jan 2020 23:22:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579216937; bh=q8KLLowO5RVKGE68CuPMLPClTKRrKOm0YR/NZpURnGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y4dZNLNF3v0GjyYEtq96i63CtJeiQC75mrBAVwRGoTS9G4rupqE03E1ZIodz0zdrv uKQOQE2uoid6ifpHKN2NW54ow8zKv2bKrI0OZZQglQh/YDFzyFOTz6dg5ZHcp4FIy7 FfXEQ9pPipmmMF4eYu9YoPqa4LoXCRU6Uqf+c1Tg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrii Nakryiko , Daniel Borkmann , Yonghong Song Subject: [PATCH 5.4 081/203] libbpf: Fix Makefile libbpf symbol mismatch diagnostic Date: Fri, 17 Jan 2020 00:16:38 +0100 Message-Id: <20200116231751.972748677@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200116231745.218684830@linuxfoundation.org> References: <20200116231745.218684830@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andrii Nakryiko commit b568405856906ee4d9ba6284fd36f2928653a623 upstream. Fix Makefile's diagnostic diff output when there is LIBBPF_API-versioned symbols mismatch. Fixes: 1bd63524593b ("libbpf: handle symbol versioning properly for libbpf.a") Signed-off-by: Andrii Nakryiko Signed-off-by: Daniel Borkmann Acked-by: Yonghong Song Link: https://lore.kernel.org/bpf/20191127200134.1360660-1-andriin@fb.com Signed-off-by: Greg Kroah-Hartman --- tools/lib/bpf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -215,7 +215,7 @@ check_abi: $(OUTPUT)libbpf.so "versioned symbols in $^ ($(VERSIONED_SYM_COUNT))." \ "Please make sure all LIBBPF_API symbols are" \ "versioned in $(VERSION_SCRIPT)." >&2; \ - readelf -s --wide $(OUTPUT)libbpf-in.o | \ + readelf -s --wide $(BPF_IN_SHARED) | \ cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}'| \ sort -u > $(OUTPUT)libbpf_global_syms.tmp; \