From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 87582A0583 for ; Thu, 19 Mar 2020 15:56:24 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 51978CF3; Thu, 19 Mar 2020 15:56:24 +0100 (CET) Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [63.128.21.74]) by dpdk.org (Postfix) with ESMTP id D687ACF3 for ; Thu, 19 Mar 2020 15:56:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584629782; 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=rdhwpajfjOpcxWBpExCC8jsMyMd0/kQyU9cVMrDy9Js=; b=iCEo4GfSB7OQefOYPfNQ9MS5gn60NLXMPdlEykey8KMI9kw1Cot1Q7LJLC+n03G2S9cKXN oMfSXA0CYfVyu4aONlMDZGaJvvcjM7SX7eN61sI/lWtxPSgWSbfZStpGY0D0N4jNCpMZNj abDzOwNG1AQJfsmG3qkjaRyw+kKt0jU= Received: from mail-ua1-f69.google.com (mail-ua1-f69.google.com [209.85.222.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-494-dr-K5qHnN-OmkeyIHANYmw-1; Thu, 19 Mar 2020 10:56:15 -0400 X-MC-Unique: dr-K5qHnN-OmkeyIHANYmw-1 Received: by mail-ua1-f69.google.com with SMTP id v21so676248uam.15 for ; Thu, 19 Mar 2020 07:56:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=V02pDmbWY5GYKTdYsqxzhJ5wx2VUphMu+QNRY2Z102c=; b=i4HC4IopRRISycVwp3J6YF34Z8aaG2knQOA79QJ3xrf0TgjxBGdk97SmbQR3DwqvdV WmYE/i1Ur5HG54+h+GmLXIAfwmimzvSd7dcLP5AOzHvN5zc6y2g7fUgCroJQfd0QmF8I 7INtP6c4vGGOd3j6eT9HzbKnikxJNSVbMXAwwlV1tyrsz2i4D45586twYMs9elhLOuGi 3oZ//vzwVEMTx4fPBEuPNF//NXJ2og+EiinJxV9NyQuWqJLTNNx857cv1NFS/YBBYUoT DR+5q0OTqeqX4wSL2xmbvpJRHy0tAy8Qis3OJrOMAMUOBH2NMAbeKRDFZPuKk/MXpjIN /ATA== X-Gm-Message-State: ANhLgQ3G1RLH/6gpcNilD+sO8uO8+sDN1veNNlDevXGuoxKW6uhPATxh 68q+ib2BMDZiYo+cNmyhojRLOtdK+lIYT/GLhVBUgmIc49PUWo642AtjpIaQQq5xkzKrB6QdKDi yqdusaUZndO0bNV6yy9hAipQ= X-Received: by 2002:ab0:49e4:: with SMTP id f33mr2024420uad.86.1584629775177; Thu, 19 Mar 2020 07:56:15 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvIky1i4WxPwGWNbgw+pvI2obxasrHb/ODJRmXgOOxJPQDnkj2jwtDspOspwn5nHOQir0Qn18jIR8evBDqtSGc= X-Received: by 2002:ab0:49e4:: with SMTP id f33mr2024402uad.86.1584629774893; Thu, 19 Mar 2020 07:56:14 -0700 (PDT) MIME-Version: 1.0 References: <20200319144418.15661-1-ndabilpuram@marvell.com> In-Reply-To: <20200319144418.15661-1-ndabilpuram@marvell.com> From: David Marchand Date: Thu, 19 Mar 2020 15:56:03 +0100 Message-ID: To: Neil Horman Cc: Thomas Monjalon , dev , Jerin Jacob Kollanukkaran , Nithin Dabilpuram , dpdk stable , bingz@mellanox.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [dpdk-stable] [PATCH] devtools: fix check symbol change script 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" On Thu, Mar 19, 2020 at 3:44 PM Nithin Dabilpuram wrote: > > Fix check symbol change script to detect new diff file when > it is in between "--- /dev/null" to "b/lib/...". > Current awk line expects line to start with "a/..." > which is not always true for all diffs. > As a result if in_map was '1' earlier, it will not be changed > to '0' and we get check patch errors which are not true as the non > version.map files get interpreted as version map file. > > Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition") > Cc: nhorman@tuxdriver.com > Cc: stable@dpdk.org There was a previous attempt at fixing this that did not get a review. http://patchwork.dpdk.org/patch/56303/ I prefer the last submitted patch as it is simpler, but maybe I missed something in Bing patch. Neil, wdyt? --=20 David Marchand > > Signed-off-by: Nithin Dabilpuram > --- > Note: We have two examples where checkpatch errors are because of this > because the version.map file change comes earlier in the diff. Because of > this bug, any new file change that comes after version.map file diff > as "/dev/null" to "b/.." gets misdetected as version.map file. > * http://patches.dpdk.org/patch/66878/ > * https://patchwork.dpdk.org/patch/66900/ > devtools/check-symbol-change.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-chan= ge.sh > index c5434f3..19ce82f 100755 > --- a/devtools/check-symbol-change.sh > +++ b/devtools/check-symbol-change.sh > @@ -17,13 +17,13 @@ build_map_changes() > # map files are altered, and all section/symbol names > # appearing between a triggering of this rule and the > # next trigger of this rule are associated with this file > - /[-+] a\/.*\.map/ {map=3D$2; in_map=3D1} > + /[-+] [ab]\/.*\.map/ {map=3D$2; in_map=3D1} > > # Same pattern as above, only it matches on anything that > # does not end in 'map', indicating we have left the map = chunk. > # When we hit this, turn off the in_map variable, which > # supresses the subordonate rules below > - /[-+] a\/.*\.[^map]/ {in_map=3D0} > + /[-+] [ab]\/.*\.[^map]/ {in_map=3D0} > > # Triggering this rule, which starts a line and ends it > # with a { identifies a versioned section. The section n= ame is > -- > 2.8.4 >