From patchwork Thu Apr 30 05:46:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Haiyue" X-Patchwork-Id: 69569 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 6CBF7A00C5; Thu, 30 Apr 2020 07:54:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F3EB91D92C; Thu, 30 Apr 2020 07:54:37 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 8F7311D92B for ; Thu, 30 Apr 2020 07:54:36 +0200 (CEST) IronPort-SDR: g7HsaMegvUkiDjSnzvHUbomD6nljvncit8r5IRu1pXG0r8spvpuCUeGSl+nmui3CKXsLGtJeWi xPADgdAs8wZw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2020 22:54:35 -0700 IronPort-SDR: F9bzTPTT1i9SfPHPfZiMqi/PwwploTTsJRlPr3d2X6jkFTPnarj2G+yIkfr+rMZ60Xl/qbOZAS iIzcv6mrchsQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,334,1583222400"; d="scan'208";a="261661237" Received: from npg-dpdk-haiyue-1.sh.intel.com ([10.67.119.213]) by orsmga006.jf.intel.com with ESMTP; 29 Apr 2020 22:54:32 -0700 From: Haiyue Wang To: dev@dpdk.org, thomas@monjalon.net, david.marchand@redhat.com, bruce.richardson@intel.com, anatoly.burakov@intel.com, nhorman@tuxdriver.com, mdr@ashroe.eu Cc: Haiyue Wang Date: Thu, 30 Apr 2020 13:46:05 +0800 Message-Id: <20200430054606.92715-1-haiyue.wang@intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v1 1/2] devtools: add internal ABI version check 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" INTERNAL is new introduced version, update the shell script that checks whether built libraries are versioned with expected ABI (current ABI, current ABI + 1, EXPERIMENTAL, or INTERNAL). Signed-off-by: Haiyue Wang Acked-by: David Marchand --- devtools/check-abi-version.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/devtools/check-abi-version.sh b/devtools/check-abi-version.sh index 9a3d13546..f0cca42a9 100755 --- a/devtools/check-abi-version.sh +++ b/devtools/check-abi-version.sh @@ -4,7 +4,7 @@ # Check whether library symbols have correct # version (provided ABI number or provided ABI -# number + 1 or EXPERIMENTAL). +# number + 1 or EXPERIMENTAL or INTERNAL). # Args: # $1: path of the library .so file # $2: ABI major version number to check @@ -12,7 +12,7 @@ if [ -z "$1" ]; then echo "Script checks whether library symbols have" - echo "correct version (ABI_VER/ABI_VER+1/EXPERIMENTAL)" + echo "correct version (ABI_VER/ABI_VER+1/EXPERIMENTAL/INTERNAL)" echo "Usage:" echo " $0 SO_FILE_PATH [ABI_VER]" exit 1 @@ -41,11 +41,11 @@ for SYM in $(echo "${OBJ_DUMP_OUTPUT}" | awk '{print $(NF-1) "-" $NF}') do version=$(echo $SYM | cut -d'-' -f 1) symbol=$(echo $SYM | cut -d'-' -f 2) - case $version in (*"$ABIVER"*|*"$NEXT_ABIVER"*|"EXPERIMENTAL") + case $version in (*"$ABIVER"*|*"$NEXT_ABIVER"*|"EXPERIMENTAL"|"INTERNAL") ;; (*) echo "Warning: symbol $symbol ($version) should be annotated " \ - "as ABI version $ABIVER / $NEXT_ABIVER, or EXPERIMENTAL." + "as ABI version $ABIVER / $NEXT_ABIVER, EXPERIMENTAL, or INTERNAL." ret=1 ;; esac From patchwork Thu Apr 30 05:46:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Haiyue" X-Patchwork-Id: 69570 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 3B022A00C5; Thu, 30 Apr 2020 07:54:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 530061D93A; Thu, 30 Apr 2020 07:54:42 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 31B791D931 for ; Thu, 30 Apr 2020 07:54:38 +0200 (CEST) IronPort-SDR: xbnxqfOu65Gy25hov93jST2qfLsDrBCJmSARWBztEhzcoa5d3uZ7bAW5PQbMOZiWYUUel27oEj MQvq5OW18leg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2020 22:54:37 -0700 IronPort-SDR: aHXKtSa1pKZ8XddO+BStZz5pmNwmKuM96w9sxcFBMzXD9pPBBdUBDQTHXxqjjVgJoX0QRN/tEu jrS9FX4eje0g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,334,1583222400"; d="scan'208";a="261661251" Received: from npg-dpdk-haiyue-1.sh.intel.com ([10.67.119.213]) by orsmga006.jf.intel.com with ESMTP; 29 Apr 2020 22:54:35 -0700 From: Haiyue Wang To: dev@dpdk.org, thomas@monjalon.net, david.marchand@redhat.com, bruce.richardson@intel.com, anatoly.burakov@intel.com, nhorman@tuxdriver.com, mdr@ashroe.eu Cc: Haiyue Wang Date: Thu, 30 Apr 2020 13:46:06 +0800 Message-Id: <20200430054606.92715-2-haiyue.wang@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200430054606.92715-1-haiyue.wang@intel.com> References: <20200430054606.92715-1-haiyue.wang@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v1 2/2] devtools: updating internal symbols ABI version 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" INTERNAL is new introduced version, update the script that automatically leaving internal section exactly as it is. Signed-off-by: Haiyue Wang Acked-by: David Marchand --- devtools/update_version_map_abi.py | 37 +++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/devtools/update_version_map_abi.py b/devtools/update_version_map_abi.py index 616412a1c..e2104e61e 100755 --- a/devtools/update_version_map_abi.py +++ b/devtools/update_version_map_abi.py @@ -50,7 +50,10 @@ def __parse_map_file(f_in): stable_lines = set() # copy experimental section as is experimental_lines = [] + # copy internal section as is + internal_lines = [] in_experimental = False + in_internal = False has_stable = False # gather all functions @@ -63,6 +66,7 @@ def __parse_map_file(f_in): if match: # whatever section this was, it's not active any more in_experimental = False + in_internal = False continue # if we're in the middle of experimental section, we need to copy @@ -71,6 +75,12 @@ def __parse_map_file(f_in): experimental_lines += [line] continue + # if we're in the middle of internal section, we need to copy + # the section verbatim, so just add the line + if in_internal: + internal_lines += [line] + continue + # skip empty lines if not line: continue @@ -81,7 +91,9 @@ def __parse_map_file(f_in): cur_section = match.group("version") # is it experimental? in_experimental = cur_section == "EXPERIMENTAL" - if not in_experimental: + # is it internal? + in_internal = cur_section == "INTERNAL" + if not in_experimental and not in_internal: has_stable = True continue @@ -90,7 +102,7 @@ def __parse_map_file(f_in): if match: stable_lines.add(match.group("func")) - return has_stable, stable_lines, experimental_lines + return has_stable, stable_lines, experimental_lines, internal_lines def __generate_stable_abi(f_out, abi_version, lines): @@ -132,6 +144,20 @@ def __generate_experimental_abi(f_out, lines): # end section print("};", file=f_out) +def __generate_internal_abi(f_out, lines): + # start internal section + print("INTERNAL {", file=f_out) + + # print all internal lines as they were + for line in lines: + # don't print empty whitespace + if not line: + print("", file=f_out) + else: + print("\t{}".format(line), file=f_out) + + # end section + print("};", file=f_out) def __main(): arg_parser = argparse.ArgumentParser( @@ -158,7 +184,7 @@ def __main(): sys.exit(1) with open(parsed.map_file) as f_in: - has_stable, stable_lines, experimental_lines = __parse_map_file(f_in) + has_stable, stable_lines, experimental_lines, internal_lines = __parse_map_file(f_in) with open(parsed.map_file, 'w') as f_out: need_newline = has_stable and experimental_lines @@ -169,6 +195,11 @@ def __main(): print(file=f_out) if experimental_lines: __generate_experimental_abi(f_out, experimental_lines) + if internal_lines: + if has_stable or experimental_lines: + # separate sections with a newline + print(file=f_out) + __generate_internal_abi(f_out, internal_lines) if __name__ == "__main__":