From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id EAEDCA00E6 for ; Tue, 14 May 2019 16:45:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DE3745F24; Tue, 14 May 2019 16:45:11 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id E20775F51 for ; Tue, 14 May 2019 16:45:08 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5158F3147DC2; Tue, 14 May 2019 14:45:03 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-124.ams2.redhat.com [10.36.116.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FF48608A7; Tue, 14 May 2019 14:45:00 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Neil Horman , dpdk stable Date: Tue, 14 May 2019 15:44:00 +0100 Message-Id: <20190514144406.7526-16-ktraynor@redhat.com> In-Reply-To: <20190514144406.7526-1-ktraynor@redhat.com> References: <20190514144406.7526-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 14 May 2019 14:45:08 +0000 (UTC) Subject: [dpdk-stable] patch 'devtools: accept experimental symbol promotion' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/20/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/81673cbe5baf20c81890155a68181d4fc6915acd Thanks. Kevin Traynor --- >From 81673cbe5baf20c81890155a68181d4fc6915acd Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 5 Apr 2019 10:17:47 +0200 Subject: [PATCH] devtools: accept experimental symbol promotion [ upstream commit 3630757803ab2f914ab36bb0285b662b3cff50db ] Currently, when symbols get promoted from the EXPERIMENTAL section to a stable ABI section, the script complains they should go to the EXPERIMENTAL section. Example: ERROR: symbol rte_devargs_add is added in the DPDK_19.05 section, but is expected to be added in the EXPERIMENTAL section of the version map This is legit. Moving from a stable ABI to another is also allowed, but must have gone through the proper process. Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition") Signed-off-by: David Marchand Acked-by: Neil Horman --- devtools/check-symbol-change.sh | 43 +++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh index 9fe8a5229..cd59b8b5d 100755 --- a/devtools/check-symbol-change.sh +++ b/devtools/check-symbol-change.sh @@ -106,24 +106,35 @@ check_for_rule_violations() fi - if [ "$secname" != "EXPERIMENTAL" ] + oldsecname=$(sed -n \ + "s#$mname $symname \(.*\) del#\1#p" "$mapdb") + + # A symbol can not enter a non experimental + # section directly + if [ $? -ne 0 ] && [ "$secname" != 'EXPERIMENTAL' ] then - # Symbols that are getting added in a section - # other than the experimental section - # to be moving from an already supported - # section or its a violation - grep -q \ - "$mname $symname [^EXPERIMENTAL] del" "$mapdb" - if [ $? -ne 0 ] - then - echo -n "ERROR: symbol $symname " - echo -n "is added in a section " - echo -n "other than the EXPERIMENTAL " - echo "section of the version map" - ret=1 - fi + echo -n "ERROR: symbol $symname " + echo -n "is added in the $secname " + echo -n "section, but is expected to " + echo -n "be added in the EXPERIMENTAL " + echo "section of the version map" + ret=1 + continue + fi + + # This symbol is moving between two sections (the + # original section is not experimental). + # This can be legit, just warn. + if [ "$oldsecname" != 'EXPERIMENTAL' ] + then + echo -n "INFO: symbol $symname is being " + echo -n "moved from $oldsecname to $secname. " + echo -n "Ensure that it has gone through the " + echo "deprecation process" + continue fi else - if [ "$secname" != "EXPERIMENTAL" ] + if ! grep -q "$mname $symname .* add" "$mapdb" && \ + [ "$secname" != "EXPERIMENTAL" ] then # Just inform users that non-experimenal -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-14 15:39:08.075559129 +0100 +++ 0016-devtools-accept-experimental-symbol-promotion.patch 2019-05-14 15:39:07.313558811 +0100 @@ -1 +1 @@ -From 3630757803ab2f914ab36bb0285b662b3cff50db Mon Sep 17 00:00:00 2001 +From 81673cbe5baf20c81890155a68181d4fc6915acd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3630757803ab2f914ab36bb0285b662b3cff50db ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -24,2 +25,2 @@ - devtools/check-symbol-change.sh | 44 ++++++++++++++++++++------------- - 1 file changed, 27 insertions(+), 17 deletions(-) + devtools/check-symbol-change.sh | 43 +++++++++++++++++++++------------ + 1 file changed, 27 insertions(+), 16 deletions(-) @@ -28 +29 @@ -index 020da7ed0..40eb95322 100755 +index 9fe8a5229..cd59b8b5d 100755 @@ -31 +32 @@ -@@ -106,25 +106,35 @@ check_for_rule_violations() +@@ -106,24 +106,35 @@ check_for_rule_violations() @@ -51,3 +52,2 @@ -- echo -n "is added in the $secname " -- echo -n "section, but is expected to " -- echo -n "be added in the EXPERIMENTAL " +- echo -n "is added in a section " +- echo -n "other than the EXPERIMENTAL "