From 105f3039c78991d3b28847f3bb059bc33be5300b Mon Sep 17 00:00:00 2001 From: Ray Kinsella Date: Thu, 30 Apr 2020 11:27:26 +0100 Subject: [PATCH] version: reference next ABI 21 for recent additions Change references to ABI 20.0.1 to use ABI v21, see https://doc.dpdk.org/guides/contributing/abi_policy.html#general-guidelines "Major ABI versions are declared no more frequently than yearly. Compatibility with the major ABI version is mandatory in subsequent releases until a new major ABI version is declared." Combined ABI policy and versioning in maintainers, add map files to the filter to more closely monitor future ABI changes. Signed-off-by: Ray Kinsella --- MAINTAINERS | 10 +++++----- devtools/libabigail.abignore | 6 ++++++ drivers/common/iavf/rte_common_iavf_version.map | 2 +- drivers/common/mlx5/rte_common_mlx5_version.map | 2 +- .../common/octeontx2/rte_common_octeontx2_version.map | 2 +- drivers/net/igc/rte_pmd_igc_version.map | 2 +- drivers/net/ionic/rte_pmd_ionic_version.map | 2 +- .../octeontx2_ep/rte_rawdev_octeontx2_ep_version.map | 2 +- drivers/vdpa/mlx5/rte_pmd_mlx5_vdpa_version.map | 2 +- lib/librte_meter/rte_meter_version.map | 2 +- 10 files changed, 19 insertions(+), 13 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index e05c805044..9b11c6f32a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -83,10 +83,6 @@ M: Marko Kovacevic F: README F: doc/ -ABI Policy -M: Ray Kinsella -F: doc/guides/contributing/abi_*.rst - Developers and Maintainers Tools M: Thomas Monjalon F: MAINTAINERS @@ -140,10 +136,12 @@ M: Michael Santana F: .travis.yml F: .ci/ -ABI versioning +ABI Policy & Versioning +M: Ray Kinsella M: Neil Horman F: lib/librte_eal/include/rte_compat.h F: lib/librte_eal/include/rte_function_versioning.h +F: doc/guides/contributing/abi_*.rst F: doc/guides/rel_notes/deprecation.rst F: devtools/check-abi.sh F: devtools/check-abi-version.sh @@ -155,6 +153,8 @@ F: devtools/update_version_map_abi.py F: devtools/validate-abi.sh F: buildtools/check-symbols.sh F: buildtools/map-list-symbol.sh +F: drivers/*/*/*.map +F: lib/*/*.map Driver information M: Neil Horman diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore index 986a527715..03266622f5 100644 --- a/devtools/libabigail.abignore +++ b/devtools/libabigail.abignore @@ -8,6 +8,12 @@ [suppress_variable] symbol_version = INTERNAL +; Ignore ABI 20.0.1 replaced with ABI 21 +[suppress_function] + symbol_version = DPDK_20.0.1 +[suppress_variable] + symbol_version = DPDK_20.0.1 + ; Explicit ignore for driver-only ABI [suppress_type] name = rte_cryptodev_ops diff --git a/drivers/common/iavf/rte_common_iavf_version.map b/drivers/common/iavf/rte_common_iavf_version.map index 2f11d67c0c..92ceac108d 100644 --- a/drivers/common/iavf/rte_common_iavf_version.map +++ b/drivers/common/iavf/rte_common_iavf_version.map @@ -1,4 +1,4 @@ -DPDK_20.0.1 { +DPDK_21 { global: iavf_init_adminq; diff --git a/drivers/common/mlx5/rte_common_mlx5_version.map b/drivers/common/mlx5/rte_common_mlx5_version.map index b58a378278..564a9a7fb3 100644 --- a/drivers/common/mlx5/rte_common_mlx5_version.map +++ b/drivers/common/mlx5/rte_common_mlx5_version.map @@ -1,4 +1,4 @@ -DPDK_20.0.1 { +DPDK_21 { global: mlx5_class_get; diff --git a/drivers/common/octeontx2/rte_common_octeontx2_version.map b/drivers/common/octeontx2/rte_common_octeontx2_version.map index 8f2404bd92..01279c3390 100644 --- a/drivers/common/octeontx2/rte_common_octeontx2_version.map +++ b/drivers/common/octeontx2/rte_common_octeontx2_version.map @@ -34,7 +34,7 @@ DPDK_20.0 { local: *; }; -DPDK_20.0.1 { +DPDK_21 { global: otx2_eth_dev_is_sec_capable; diff --git a/drivers/net/igc/rte_pmd_igc_version.map b/drivers/net/igc/rte_pmd_igc_version.map index 0a58b9db0e..4a76d1d52d 100644 --- a/drivers/net/igc/rte_pmd_igc_version.map +++ b/drivers/net/igc/rte_pmd_igc_version.map @@ -1,3 +1,3 @@ -DPDK_20.0.2 { +DPDK_21 { local: *; }; diff --git a/drivers/net/ionic/rte_pmd_ionic_version.map b/drivers/net/ionic/rte_pmd_ionic_version.map index bc8fd6d4db..acdaf587d2 100644 --- a/drivers/net/ionic/rte_pmd_ionic_version.map +++ b/drivers/net/ionic/rte_pmd_ionic_version.map @@ -1,4 +1,4 @@ -DPDK_20.0.1 { +DPDK_21 { local: *; }; diff --git a/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map b/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map index bc8fd6d4db..acdaf587d2 100644 --- a/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map +++ b/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map @@ -1,4 +1,4 @@ -DPDK_20.0.1 { +DPDK_21 { local: *; }; diff --git a/drivers/vdpa/mlx5/rte_pmd_mlx5_vdpa_version.map b/drivers/vdpa/mlx5/rte_pmd_mlx5_vdpa_version.map index 179f7f1ae6..4a76d1d52d 100644 --- a/drivers/vdpa/mlx5/rte_pmd_mlx5_vdpa_version.map +++ b/drivers/vdpa/mlx5/rte_pmd_mlx5_vdpa_version.map @@ -1,3 +1,3 @@ -DPDK_20.0.1 { +DPDK_21 { local: *; }; diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/rte_meter_version.map index fc12cc0bf8..2c7dadbcac 100644 --- a/lib/librte_meter/rte_meter_version.map +++ b/lib/librte_meter/rte_meter_version.map @@ -13,7 +13,7 @@ DPDK_20.0 { local: *; }; -DPDK_20.0.1 { +DPDK_21 { global: rte_meter_trtcm_rfc4115_color_aware_check; -- 2.20.1