From patchwork Mon Nov 25 08:10:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 63262 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6E6C1A04C2; Mon, 25 Nov 2019 09:10:25 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 071504C74; Mon, 25 Nov 2019 09:10:25 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 408B737A2 for ; Mon, 25 Nov 2019 09:10:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574669422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lzMLYZggCuNxc9USTnsSMeOcWNnZApfBhG2HO1qj97M=; b=BxF+idRULPcBuhaRnlq74sdI5S+ZuUJ957DkzK1tF5XJwlCY3RR3bjKUvaJgOR0uWh2Yqm 8r0jIBWN6iDcpTX6/Yzy+OlrEePKO52NRJ6AtzUEEgVv7doErW1fMpBjH/G8kiqx3nZnxn jMJMDw1givSUyOSribyISXXfzoogtT4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-254-R39hahsdOZC66KAH1g2D1g-1; Mon, 25 Nov 2019 03:10:19 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 13054800EBA; Mon, 25 Nov 2019 08:10:18 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-70.brq.redhat.com [10.40.204.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id F388260C63; Mon, 25 Nov 2019 08:10:14 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, arybchenko@solarflare.com, stable@dpdk.org, Neil Horman Date: Mon, 25 Nov 2019 09:10:06 +0100 Message-Id: <20191125081007.12396-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: R39hahsdOZC66KAH1g2D1g-1 X-Mimecast-Spam-Score: 0 Subject: [dpdk-dev] [PATCH 1/2] buildtools: fix experimental symbols listing X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The map-list-symbol.sh script displays the filename, section and symbol names of map files. Example: $ buildtools/map-list-symbol.sh -S EXPERIMENTAL \ lib/librte_ethdev/rte_ethdev_version.map |grep rte_mtr_create lib/librte_ethdev/rte_ethdev_version.map EXPERIMENTAL rte_mtr_create The experimental symbol check should only consider the symbol name. Fixes: 3290ac14eb94 ("buildtools: detect discrepancies for experimental symbols") Cc: stable@dpdk.org Signed-off-by: David Marchand Tested-by: Andrew Rybchenko Acked-by: Neil Horman Tested-by: Andrew Rybchenko --- buildtools/check-experimental-syms.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildtools/check-experimental-syms.sh b/buildtools/check-experimental-syms.sh index 145dd70ebf..abebb89f12 100755 --- a/buildtools/check-experimental-syms.sh +++ b/buildtools/check-experimental-syms.sh @@ -23,7 +23,7 @@ trap 'rm -f "$DUMPFILE"' EXIT objdump -t $OBJFILE >$DUMPFILE ret=0 -for SYM in `$LIST_SYMBOL -S EXPERIMENTAL $MAPFILE` +for SYM in `$LIST_SYMBOL -S EXPERIMENTAL $MAPFILE |cut -d ' ' -f 3` do if grep -q "\.text.*$SYM$" $DUMPFILE && ! grep -q "\.text\.experimental.*$SYM$" $DUMPFILE From patchwork Mon Nov 25 08:10:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 63263 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9DFF2A04C2; Mon, 25 Nov 2019 09:10:32 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CF1865596; Mon, 25 Nov 2019 09:10:28 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 3212A4CA6 for ; Mon, 25 Nov 2019 09:10:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574669426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cGb43gjI1KKafb6uamCXYxzmgnNvFWSZzrGQuK7WvuI=; b=RtQiNQQrsV1y2auomVXJsMeF9kiQZBibd+8KezyQtQsR97F3F/uMIqZEignwuZIOfyhyRY uywQzigpjXcnCVmsg0KymlWv/TV8OIrUgV9brdeHe5bQFLsq40Gxq6zWvhkrGFgZEVYHH3 GzPb2d6ymix1igY1lXTTkygHM8hWPqo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-273-ueMNFm-RMlyyG3MHyUQ89A-1; Mon, 25 Nov 2019 03:10:23 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3CDFD1005509; Mon, 25 Nov 2019 08:10:21 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-70.brq.redhat.com [10.40.204.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 127FC60F8A; Mon, 25 Nov 2019 08:10:18 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, arybchenko@solarflare.com, stable@dpdk.org, Neil Horman Date: Mon, 25 Nov 2019 09:10:07 +0100 Message-Id: <20191125081007.12396-2-david.marchand@redhat.com> In-Reply-To: <20191125081007.12396-1-david.marchand@redhat.com> References: <20191125081007.12396-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: ueMNFm-RMlyyG3MHyUQ89A-1 X-Mimecast-Spam-Score: 0 Subject: [dpdk-dev] [PATCH 2/2] buildtools: fix build with coverage enabled X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" A compiler can reuse a variable name and prefix it when instrumenting with coverage. Example: $ make defconfig T=x86_64-native-linux-gcc O=master $ make EXTRA_CFLAGS='--coverage' O=master [...] CC rte_flow.o rte_flow_dynf_metadata_offs is not flagged as experimental but is listed in version map Please add __rte_experimental to the definition of rte_flow_dynf_metadata_offs $ objdump -t master/build/lib/librte_ethdev/rte_flow.o |grep _offs$ 0000000000000000 l F .text.startup 000000000000000a _GLOBAL__sub_I_65535_0_rte_flow_dynf_metadata_offs 0000000000000620 g O .data 0000000000000004 rte_flow_dynf_metadata_offs Protect against this by adding a space character in the pattern. Fixes: a4bcd61de82d ("buildtools: add script to check experimental API exports") Cc: stable@dpdk.org Reported-by: Andrew Rybchenko Signed-off-by: David Marchand Tested-by: Andrew Rybchenko --- buildtools/check-experimental-syms.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/check-experimental-syms.sh b/buildtools/check-experimental-syms.sh index abebb89f12..f3603e5bac 100755 --- a/buildtools/check-experimental-syms.sh +++ b/buildtools/check-experimental-syms.sh @@ -25,8 +25,8 @@ objdump -t $OBJFILE >$DUMPFILE ret=0 for SYM in `$LIST_SYMBOL -S EXPERIMENTAL $MAPFILE |cut -d ' ' -f 3` do - if grep -q "\.text.*$SYM$" $DUMPFILE && - ! grep -q "\.text\.experimental.*$SYM$" $DUMPFILE + if grep -q "\.text.*[[:space:]]$SYM$" $DUMPFILE && + ! grep -q "\.text\.experimental.*[[:space:]]$SYM$" $DUMPFILE then cat >&2 <<- END_OF_MESSAGE $SYM is not flagged as experimental