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 2D5D7A0350; Fri, 26 Jun 2020 10:38:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7479A1B952; Fri, 26 Jun 2020 10:38:19 +0200 (CEST) Received: from dal3relay210.mxroute.com (dal3relay210.mxroute.com [64.40.27.210]) by dpdk.org (Postfix) with ESMTP id 5E0B81B94F for ; Fri, 26 Jun 2020 10:38:17 +0200 (CEST) Received: from filter003.mxroute.com ([168.235.111.26] 168-235-111-26.cloud.ramnode.com) (Authenticated sender: mN4UYu2MZsgR) by dal3relay210.mxroute.com (ZoneMTA) with ESMTPSA id 172efc6f6720001663.002 for (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256); Fri, 26 Jun 2020 08:38:13 +0000 X-Zone-Loop: fd492a335351cf1ec2b6df4fa6761ed53b4e6af9048f X-Originating-IP: [168.235.111.26] Received: from echo.mxrouting.net (echo.mxrouting.net [116.202.222.109]) by filter003.mxroute.com (Postfix) with ESMTPS id BEA8560067; Fri, 26 Jun 2020 08:38:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ashroe.eu; s=x; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date: Message-ID:From:References:Cc:To:Subject:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=+tzrTi3yDVOesty4ca8SqBKjWMtiVnxI+NDxkuEUrfk=; b=mldt+dn9qz++XmmdkGg8WgNnfS h1xafFV4wI8X6goDSm2cnTcqIrFqPi5qYsYcRdtQh0Ubm8zeSKvn5JH0hMGH0/U2ymTEJ85hmPRfb Q0PMRUoh5KZhBNL+LHvljirt5kSF9blOITeje3pjZR5Wp4zIXeYB4YVValEaIeiQBV9XN4t+F6IfP HhAL6jLsleSjCnfFSX63YNX1ADKVa5FVo3iQyqdnS0k6cbZURNzn2+e4isYgWo7/RObExLnn9AFTO ts4QT5X0FC2tSD2IKK5ID1cR262fxhvg8YvPnv2ZJPUhvx0evgVd6uI9OPuBcciJSnYTIk2UwOaWr H0I3/ttA==; To: David Marchand , dev@dpdk.org Cc: thomas@monjalon.net, honnappa.nagarahalli@arm.com, techboard@dpdk.org, Neil Horman , John McNamara , Marko Kovacevic References: <20200522065855.31056-1-david.marchand@redhat.com> <20200626081638.29890-1-david.marchand@redhat.com> <20200626081638.29890-2-david.marchand@redhat.com> From: "Kinsella, Ray" Autocrypt: addr=mdr@ashroe.eu; keydata= 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 Message-ID: <9a1a04e1-6461-f00f-d76b-c6c9a17fd9f1@ashroe.eu> Date: Fri, 26 Jun 2020 09:38:08 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <20200626081638.29890-2-david.marchand@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-AuthUser: mdr@ashroe.eu Subject: Re: [dpdk-dev] [PATCH v3 1/3] build: remove special versioning for non stable libraries 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" On 26/06/2020 09:16, David Marchand wrote: > Having a special versioning for experimental/internal libraries put a > additional maintenance cost while this status is already announced in > MAINTAINERS and the library headers/documentation. > Following discussions and vote at 05/20 TB meeting [1], use a single > versioning for all libraries in DPDK. > > Note: for the ABI check, an exception [2] had been added when tweaking > this special versioning [3]. > Prefer explicit libabigail rules (which will be dropped in 20.11). > > 1: https://mails.dpdk.org/archives/dev/2020-May/168450.html > 2: https://git.dpdk.org/dpdk/commit/?id=23d7ad5db41c > 3: https://git.dpdk.org/dpdk/commit/?id=ec2b8cd7ed69 > > Signed-off-by: David Marchand > --- > Changes since v2: > - added exceptions for librte_graph and librte_node missed post 20.05, > > Changes since v1: > - removed mention of special handling in ABI docs, > > --- > buildtools/meson.build | 3 --- > config/meson.build | 16 +++++------- > devtools/check-abi.sh | 5 ---- > devtools/libabigail.abignore | 29 ++++++++++++++++++++-- > doc/guides/contributing/abi_policy.rst | 6 +---- > doc/guides/contributing/abi_versioning.rst | 3 +-- > drivers/meson.build | 17 +------------ > lib/meson.build | 16 +----------- > mk/rte.lib.mk | 5 ---- > 9 files changed, 37 insertions(+), 63 deletions(-) > > diff --git a/buildtools/meson.build b/buildtools/meson.build > index d5f8291beb..79703b6f93 100644 > --- a/buildtools/meson.build > +++ b/buildtools/meson.build > @@ -18,6 +18,3 @@ else > endif > map_to_def_cmd = py3 + files('map_to_def.py') > sphinx_wrapper = py3 + files('call-sphinx-build.py') > - > -# stable ABI always starts with "DPDK_" > -is_stable_cmd = [find_program('grep', 'findstr'), '^DPDK_'] > diff --git a/config/meson.build b/config/meson.build > index 351e268c1f..d6d3f5271d 100644 > --- a/config/meson.build > +++ b/config/meson.build > @@ -25,18 +25,14 @@ major_version = '@0@.@1@'.format(pver.get(0), pver.get(1)) > abi_version = run_command(find_program('cat', 'more'), > abi_version_file).stdout().strip() > > -# Regular libraries have the abi_version as the filename extension > +# Libraries have the abi_version as the filename extension > # and have the soname be all but the final part of the abi_version. > -# Experimental libraries have soname with '0.major' > -# and the filename suffix as 0.majorminor versions, > -# e.g. v20.1 => librte_stable.so.20.1, librte_experimental.so.0.201 > -# sonames => librte_stable.so.20, librte_experimental.so.0.20 > -# e.g. v20.0.1 => librte_stable.so.20.0.1, librte_experimental.so.0.2001 > -# sonames => librte_stable.so.20.0, librte_experimental.so.0.200 > +# e.g. v20.1 => librte_foo.so.20.1 > +# sonames => librte_foo.so.20 > +# e.g. v20.0.1 => librte_foo.so.20.0.1 > +# sonames => librte_foo.so.20.0 > abi_va = abi_version.split('.') > -stable_so_version = abi_va.length() == 2 ? abi_va[0] : abi_va[0] + '.' + abi_va[1] > -experimental_abi_version = '0.' + abi_va[0] + abi_va[1] + '.' + abi_va[2] > -experimental_so_version = experimental_abi_version > +so_version = abi_va.length() == 2 ? abi_va[0] : abi_va[0] + '.' + abi_va[1] > > # extract all version information into the build configuration > dpdk_conf.set('RTE_VER_YEAR', pver.get(0).to_int()) > diff --git a/devtools/check-abi.sh b/devtools/check-abi.sh > index dd9120e69e..e17fedbd9f 100755 > --- a/devtools/check-abi.sh > +++ b/devtools/check-abi.sh > @@ -44,11 +44,6 @@ for dump in $(find $refdir -name "*.dump"); do > echo "Skipped glue library $name." > continue > fi > - # skip experimental libraries, with a sover starting with 0. > - if grep -qE "\ - echo "Skipped experimental library $name." > - continue > - fi > dump2=$(find $newdir -name $name) > if [ -z "$dump2" ] || [ ! -e "$dump2" ]; then > echo "Error: can't find $name in $newdir" > diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore > index becbf842a5..0133f757d0 100644 > --- a/devtools/libabigail.abignore > +++ b/devtools/libabigail.abignore > @@ -50,9 +50,9 @@ > name = rte_crypto_aead_algorithm_strings > > ;;;;;;;;;;;;;;;;;;;;;; > -; Temporary exceptions for new __rte_internal marking till DPDK 20.11 > +; Temporary exceptions till DPDK 20.11 > ;;;;;;;;;;;;;;;;;;;;;; > -; Ignore moving OCTEONTX2 stable functions to INTERNAL tag > +; Ignore moving OCTEONTX2 stable functions to INTERNAL > [suppress_file] > file_name_regexp = ^librte_common_octeontx2\. > [suppress_file] > @@ -77,3 +77,28 @@ > name = rte_dpaa2_mbuf_alloc_bulk > [suppress_function] > name_regexp = ^dpaa2?_.*tach$ > +; Ignore soname changes for experimental libraries > +[suppress_file] > + file_name_regexp = ^librte_bbdev\. > +[suppress_file] > + file_name_regexp = ^librte_bpf\. > +[suppress_file] > + file_name_regexp = ^librte_compressdev\. > +[suppress_file] > + file_name_regexp = ^librte_fib\. > +[suppress_file] > + file_name_regexp = ^librte_flow_classify\. > +[suppress_file] > + file_name_regexp = ^librte_graph\. > +[suppress_file] > + file_name_regexp = ^librte_ipsec\. > +[suppress_file] > + file_name_regexp = ^librte_node\. > +[suppress_file] > + file_name_regexp = ^librte_rcu\. > +[suppress_file] > + file_name_regexp = ^librte_rib\. > +[suppress_file] > + file_name_regexp = ^librte_telemetry\. > +[suppress_file] > + file_name_regexp = ^librte_stack\. Can't help feeling on this, that are swapping one headache for another. We are adding the cost of maintaining a bloated libabigail.abignore. I still maintain, that if we marked libraries as "experimental" in the filename. It serve both as obvious reminder, and simpifies this maintenance - no bloated libabigail.abiignore. I agree that there is no need for special versioning. > diff --git a/doc/guides/contributing/abi_policy.rst b/doc/guides/contributing/abi_policy.rst > index ee17ccb200..1b2fa27865 100644 > --- a/doc/guides/contributing/abi_policy.rst > +++ b/doc/guides/contributing/abi_policy.rst > @@ -28,7 +28,6 @@ General Guidelines > once approved these will form part of the next ABI version. > #. Libraries or APIs marked as :ref:`experimental ` may > change without constraint, as they are not considered part of an ABI version. > - Experimental libraries have the major ABI version ``0``. > #. Updates to the :ref:`minimum hardware requirements `, which drop > support for hardware which was previously supported, should be treated as an > ABI change. > @@ -331,7 +330,4 @@ Libraries > ~~~~~~~~~ > > Libraries marked as ``experimental`` are entirely not considered part of an ABI > -version, and may change without warning at any time. Experimental libraries > -always have a major ABI version of ``0`` to indicate they exist outside of > -:ref:`abi_versioning` , with the minor version incremented with each ABI change > -to library. > +version, and may change without warning at any time. > diff --git a/doc/guides/contributing/abi_versioning.rst b/doc/guides/contributing/abi_versioning.rst > index e96fde340f..31a9205572 100644 > --- a/doc/guides/contributing/abi_versioning.rst > +++ b/doc/guides/contributing/abi_versioning.rst > @@ -112,8 +112,7 @@ how this may be done. > > At the same time, the major ABI version is changed atomically across all > libraries by incrementing the major version in the ABI_VERSION file. This is > -done globally for all libraries that declare a stable ABI. For libraries marked > -as EXPERIMENTAL, their major ABI version is always set to 0. > +done globally for all libraries. Documentation changes are 100% OK. Acked-by: Ray Kinsella > Minor ABI versions > ~~~~~~~~~~~~~~~~~~ > diff --git a/drivers/meson.build b/drivers/meson.build > index cfb6a833c9..d1b59a4bac 100644 > --- a/drivers/meson.build > +++ b/drivers/meson.build > @@ -124,21 +124,6 @@ foreach class:dpdk_driver_classes > output: out_filename, > depends: [pmdinfogen, tmp_lib]) > > - version_map = '@0@/@1@/@2@_version.map'.format( > - meson.current_source_dir(), > - drv_path, lib_name) > - > - is_stable = run_command(is_stable_cmd, > - files(version_map)).returncode() == 0 > - > - if is_stable > - lib_version = abi_version > - so_version = stable_so_version > - else > - lib_version = experimental_abi_version > - so_version = experimental_so_version > - endif > - > # now build the static driver > static_lib = static_library(lib_name, > sources, > @@ -183,7 +168,7 @@ foreach class:dpdk_driver_classes > c_args: cflags, > link_args: lk_args, > link_depends: lk_deps, > - version: lib_version, > + version: abi_version, > soversion: so_version, > install: true, > install_dir: driver_install_path) > diff --git a/lib/meson.build b/lib/meson.build > index d190d84eff..d646f33e07 100644 > --- a/lib/meson.build > +++ b/lib/meson.build > @@ -107,20 +107,6 @@ foreach l:libraries > cflags += '-DRTE_USE_FUNCTION_VERSIONING' > endif > > - version_map = '@0@/@1@/rte_@2@_version.map'.format( > - meson.current_source_dir(), dir_name, name) > - > - is_stable = run_command(is_stable_cmd, > - files(version_map)).returncode() == 0 > - > - if is_stable > - lib_version = abi_version > - so_version = stable_so_version > - else > - lib_version = experimental_abi_version > - so_version = experimental_so_version > - endif > - > # first build static lib > static_lib = static_library(libname, > sources, > @@ -179,7 +165,7 @@ foreach l:libraries > include_directories: includes, > link_args: lk_args, > link_depends: lk_deps, > - version: lib_version, > + version: abi_version, > soversion: so_version, > install: true) > shared_dep = declare_dependency(link_with: shared_lib, > diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk > index 682b590dba..229ae16814 100644 > --- a/mk/rte.lib.mk > +++ b/mk/rte.lib.mk > @@ -13,11 +13,6 @@ VPATH += $(SRCDIR) > > LIBABIVER ?= $(shell cat $(RTE_SRCDIR)/ABI_VERSION) > SOVER := $(basename $(LIBABIVER)) > -ifeq ($(shell grep -s "^DPDK_" $(SRCDIR)/$(EXPORT_MAP)),) > -# EXPERIMENTAL ABI is versioned as 0.major+minor, e.g. 0.201 for 20.1 ABI > -LIBABIVER := 0.$(shell echo $(LIBABIVER) | awk 'BEGIN { FS="." }; { print $$1$$2"."$$3 }') > -SOVER := $(LIBABIVER) > -endif > > ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) > SONAME := $(patsubst %.a,%.so.$(SOVER),$(LIB)) >