[PATCH 1/2] eal: remove deprecated function returning mbuf pool ops name

[PATCH 1/2] eal: remove deprecated function returning mbuf pool ops name

[Olivier Matz]

rte_eal_mbuf_default_mempool_ops() is replaced by
rte_mbuf_best_mempool_ops().

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
 doc/guides/rel_notes/deprecation.rst    |  9 ---------
 lib/librte_eal/bsdapp/eal/eal.c         | 10 ----------
 lib/librte_eal/common/include/rte_eal.h | 11 -----------
 lib/librte_eal/linuxapp/eal/eal.c       | 10 ----------
 lib/librte_eal/rte_eal_version.map      |  2 --
 5 files changed, 42 deletions(-)

diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 1ce692eac..5bf680515 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -37,15 +37,6 @@ Deprecation Notices
   - ``eal_parse_pci_DomBDF`` replaced by ``rte_pci_addr_parse``
   - ``rte_eal_compare_pci_addr`` replaced by ``rte_pci_addr_cmp``
 
-* eal: a new set of mbuf mempool ops name APIs for user, platform and best
-  mempool names have been defined in ``rte_mbuf`` in v18.02. The uses of
-  ``rte_eal_mbuf_default_mempool_ops`` shall be replaced by
-  ``rte_mbuf_best_mempool_ops``.
-  The following function is deprecated since 18.05, and will be removed
-  in 18.08:
-
-  - ``rte_eal_mbuf_default_mempool_ops``
-
 * mbuf: The opaque ``mbuf->hash.sched`` field will be updated to support generic
   definition in line with the ethdev TM and MTR APIs. Currently, this field
   is defined in librte_sched in a non-generic way. The new generic format
diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index dc279542d..f7cced725 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -153,16 +153,6 @@ rte_eal_mbuf_user_pool_ops(void)
 	return internal_config.user_mbuf_pool_ops_name;
 }
 
-/* Return mbuf pool ops name */
-const char *
-rte_eal_mbuf_default_mempool_ops(void)
-{
-	if (internal_config.user_mbuf_pool_ops_name == NULL)
-		return RTE_MBUF_DEFAULT_MEMPOOL_OPS;
-
-	return internal_config.user_mbuf_pool_ops_name;
-}
-
 /* Return a pointer to the configuration structure */
 struct rte_config *
 rte_eal_get_configuration(void)
diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
index 8de5d69e8..0c9c3f13b 100644
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -501,17 +501,6 @@ enum rte_iova_mode rte_eal_iova_mode(void);
 const char * __rte_experimental
 rte_eal_mbuf_user_pool_ops(void);
 
-/**
- * @deprecated
- * Get default pool ops name for mbuf
- *
- * @return
- *   returns default pool ops name.
- */
-__rte_deprecated
-const char *
-rte_eal_mbuf_default_mempool_ops(void);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 8655b8691..cf2a8082b 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -161,16 +161,6 @@ rte_eal_mbuf_user_pool_ops(void)
 	return internal_config.user_mbuf_pool_ops_name;
 }
 
-/* Return mbuf pool ops name */
-const char *
-rte_eal_mbuf_default_mempool_ops(void)
-{
-	if (internal_config.user_mbuf_pool_ops_name == NULL)
-		return RTE_MBUF_DEFAULT_MEMPOOL_OPS;
-
-	return internal_config.user_mbuf_pool_ops_name;
-}
-
 /* Return a pointer to the configuration structure */
 struct rte_config *
 rte_eal_get_configuration(void)
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index f7dd0e7bc..3d4a9d3bb 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -181,7 +181,6 @@ DPDK_17.11 {
 	rte_bus_get_iommu_class;
 	rte_eal_has_pci;
 	rte_eal_iova_mode;
-	rte_eal_mbuf_default_mempool_ops;
 	rte_eal_using_phys_addrs;
 	rte_eal_vfio_intr_mode;
 	rte_lcore_has_role;
@@ -259,7 +258,6 @@ EXPERIMENTAL {
 	rte_eal_cleanup;
 	rte_eal_hotplug_add;
 	rte_eal_hotplug_remove;
-	rte_eal_mbuf_user_pool_ops;
 	rte_fbarray_attach;
 	rte_fbarray_destroy;
 	rte_fbarray_detach;
-- 
2.11.0

[PATCH 2/2] eal: remove experimental tag from user mbuf pool ops func

[Olivier Matz]

Remove experimental tag from rte_eal_mbuf_user_pool_ops().

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
 lib/librte_eal/bsdapp/eal/eal.c         | 2 +-
 lib/librte_eal/common/include/rte_eal.h | 5 +----
 lib/librte_eal/linuxapp/eal/eal.c       | 2 +-
 lib/librte_eal/rte_eal_version.map      | 6 ++++++
 lib/librte_mbuf/Makefile                | 1 -
 lib/librte_mbuf/meson.build             | 1 -
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index f7cced725..98c689b16 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -147,7 +147,7 @@ eal_get_runtime_dir(void)
 }
 
 /* Return user provided mbuf pool ops name */
-const char * __rte_experimental
+const char *
 rte_eal_mbuf_user_pool_ops(void)
 {
 	return internal_config.user_mbuf_pool_ops_name;
diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
index 0c9c3f13b..e114dcbdc 100644
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -490,15 +490,12 @@ static inline int rte_gettid(void)
 enum rte_iova_mode rte_eal_iova_mode(void);
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
  * Get user provided pool ops name for mbuf
  *
  * @return
  *   returns user provided pool ops name.
  */
-const char * __rte_experimental
+const char *
 rte_eal_mbuf_user_pool_ops(void);
 
 #ifdef __cplusplus
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index cf2a8082b..71ec2be9f 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -155,7 +155,7 @@ eal_get_runtime_dir(void)
 }
 
 /* Return user provided mbuf pool ops name */
-const char * __rte_experimental
+const char *
 rte_eal_mbuf_user_pool_ops(void)
 {
 	return internal_config.user_mbuf_pool_ops_name;
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index 3d4a9d3bb..c151c8454 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -240,6 +240,12 @@ DPDK_18.05 {
 
 } DPDK_18.02;
 
+DPDK_18.08 {
+	global:
+
+	rte_eal_mbuf_user_pool_ops;
+} DPDK_18.05;
+
 EXPERIMENTAL {
 	global:
 
diff --git a/lib/librte_mbuf/Makefile b/lib/librte_mbuf/Makefile
index 8749a00fe..e2b98a254 100644
--- a/lib/librte_mbuf/Makefile
+++ b/lib/librte_mbuf/Makefile
@@ -6,7 +6,6 @@ include $(RTE_SDK)/mk/rte.vars.mk
 # library name
 LIB = librte_mbuf.a
 
-CFLAGS += -DALLOW_EXPERIMENTAL_API
 CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
 LDLIBS += -lrte_eal -lrte_mempool
 
diff --git a/lib/librte_mbuf/meson.build b/lib/librte_mbuf/meson.build
index 869c17c1c..45ffb0db5 100644
--- a/lib/librte_mbuf/meson.build
+++ b/lib/librte_mbuf/meson.build
@@ -2,7 +2,6 @@
 # Copyright(c) 2017 Intel Corporation
 
 version = 3
-allow_experimental_apis = true
 sources = files('rte_mbuf.c', 'rte_mbuf_ptype.c', 'rte_mbuf_pool_ops.c')
 headers = files('rte_mbuf.h', 'rte_mbuf_ptype.h', 'rte_mbuf_pool_ops.h')
 deps += ['mempool']
-- 
2.11.0

Re: [PATCH 1/2] eal: remove deprecated function returning mbuf pool ops name

[Olivier Matz]

On Tue, Jun 26, 2018 at 11:12:35AM +0200, Olivier Matz wrote:
> rte_eal_mbuf_default_mempool_ops() is replaced by
> rte_mbuf_best_mempool_ops().
> 
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>

Self nack, rebase issue between these 2 patches.
Thanks Thomas for spotting it.

Will send a v2.

[PATCH v2 1/2] eal: remove deprecated function returning mbuf pool ops name

[Olivier Matz]

rte_eal_mbuf_default_mempool_ops() is replaced by
rte_mbuf_best_mempool_ops().

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---

v2:
* remove rte_eal_mbuf_user_pool_ops from .map in next patch instead of this

 doc/guides/rel_notes/deprecation.rst    |  9 ---------
 lib/librte_eal/bsdapp/eal/eal.c         | 10 ----------
 lib/librte_eal/common/include/rte_eal.h | 11 -----------
 lib/librte_eal/linuxapp/eal/eal.c       | 10 ----------
 lib/librte_eal/rte_eal_version.map      |  1 -
 5 files changed, 41 deletions(-)

diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 1ce692eac..5bf680515 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -37,15 +37,6 @@ Deprecation Notices
   - ``eal_parse_pci_DomBDF`` replaced by ``rte_pci_addr_parse``
   - ``rte_eal_compare_pci_addr`` replaced by ``rte_pci_addr_cmp``
 
-* eal: a new set of mbuf mempool ops name APIs for user, platform and best
-  mempool names have been defined in ``rte_mbuf`` in v18.02. The uses of
-  ``rte_eal_mbuf_default_mempool_ops`` shall be replaced by
-  ``rte_mbuf_best_mempool_ops``.
-  The following function is deprecated since 18.05, and will be removed
-  in 18.08:
-
-  - ``rte_eal_mbuf_default_mempool_ops``
-
 * mbuf: The opaque ``mbuf->hash.sched`` field will be updated to support generic
   definition in line with the ethdev TM and MTR APIs. Currently, this field
   is defined in librte_sched in a non-generic way. The new generic format
diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index dc279542d..f7cced725 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -153,16 +153,6 @@ rte_eal_mbuf_user_pool_ops(void)
 	return internal_config.user_mbuf_pool_ops_name;
 }
 
-/* Return mbuf pool ops name */
-const char *
-rte_eal_mbuf_default_mempool_ops(void)
-{
-	if (internal_config.user_mbuf_pool_ops_name == NULL)
-		return RTE_MBUF_DEFAULT_MEMPOOL_OPS;
-
-	return internal_config.user_mbuf_pool_ops_name;
-}
-
 /* Return a pointer to the configuration structure */
 struct rte_config *
 rte_eal_get_configuration(void)
diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
index 8de5d69e8..0c9c3f13b 100644
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -501,17 +501,6 @@ enum rte_iova_mode rte_eal_iova_mode(void);
 const char * __rte_experimental
 rte_eal_mbuf_user_pool_ops(void);
 
-/**
- * @deprecated
- * Get default pool ops name for mbuf
- *
- * @return
- *   returns default pool ops name.
- */
-__rte_deprecated
-const char *
-rte_eal_mbuf_default_mempool_ops(void);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 8655b8691..cf2a8082b 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -161,16 +161,6 @@ rte_eal_mbuf_user_pool_ops(void)
 	return internal_config.user_mbuf_pool_ops_name;
 }
 
-/* Return mbuf pool ops name */
-const char *
-rte_eal_mbuf_default_mempool_ops(void)
-{
-	if (internal_config.user_mbuf_pool_ops_name == NULL)
-		return RTE_MBUF_DEFAULT_MEMPOOL_OPS;
-
-	return internal_config.user_mbuf_pool_ops_name;
-}
-
 /* Return a pointer to the configuration structure */
 struct rte_config *
 rte_eal_get_configuration(void)
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index f7dd0e7bc..d0564d11f 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -181,7 +181,6 @@ DPDK_17.11 {
 	rte_bus_get_iommu_class;
 	rte_eal_has_pci;
 	rte_eal_iova_mode;
-	rte_eal_mbuf_default_mempool_ops;
 	rte_eal_using_phys_addrs;
 	rte_eal_vfio_intr_mode;
 	rte_lcore_has_role;
-- 
2.11.0

[PATCH v2 2/2] eal: remove experimental tag from user mbuf pool ops func

[Olivier Matz]

Remove experimental tag from rte_eal_mbuf_user_pool_ops().

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---

v2:
* remove rte_eal_mbuf_user_pool_ops from .map in this patch instead of previous one

 lib/librte_eal/bsdapp/eal/eal.c         | 2 +-
 lib/librte_eal/common/include/rte_eal.h | 5 +----
 lib/librte_eal/linuxapp/eal/eal.c       | 2 +-
 lib/librte_eal/rte_eal_version.map      | 7 ++++++-
 lib/librte_mbuf/Makefile                | 1 -
 lib/librte_mbuf/meson.build             | 1 -
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index f7cced725..98c689b16 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -147,7 +147,7 @@ eal_get_runtime_dir(void)
 }
 
 /* Return user provided mbuf pool ops name */
-const char * __rte_experimental
+const char *
 rte_eal_mbuf_user_pool_ops(void)
 {
 	return internal_config.user_mbuf_pool_ops_name;
diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
index 0c9c3f13b..e114dcbdc 100644
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -490,15 +490,12 @@ static inline int rte_gettid(void)
 enum rte_iova_mode rte_eal_iova_mode(void);
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
  * Get user provided pool ops name for mbuf
  *
  * @return
  *   returns user provided pool ops name.
  */
-const char * __rte_experimental
+const char *
 rte_eal_mbuf_user_pool_ops(void);
 
 #ifdef __cplusplus
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index cf2a8082b..71ec2be9f 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -155,7 +155,7 @@ eal_get_runtime_dir(void)
 }
 
 /* Return user provided mbuf pool ops name */
-const char * __rte_experimental
+const char *
 rte_eal_mbuf_user_pool_ops(void)
 {
 	return internal_config.user_mbuf_pool_ops_name;
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index d0564d11f..c151c8454 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -240,6 +240,12 @@ DPDK_18.05 {
 
 } DPDK_18.02;
 
+DPDK_18.08 {
+	global:
+
+	rte_eal_mbuf_user_pool_ops;
+} DPDK_18.05;
+
 EXPERIMENTAL {
 	global:
 
@@ -258,7 +264,6 @@ EXPERIMENTAL {
 	rte_eal_cleanup;
 	rte_eal_hotplug_add;
 	rte_eal_hotplug_remove;
-	rte_eal_mbuf_user_pool_ops;
 	rte_fbarray_attach;
 	rte_fbarray_destroy;
 	rte_fbarray_detach;
diff --git a/lib/librte_mbuf/Makefile b/lib/librte_mbuf/Makefile
index 8749a00fe..e2b98a254 100644
--- a/lib/librte_mbuf/Makefile
+++ b/lib/librte_mbuf/Makefile
@@ -6,7 +6,6 @@ include $(RTE_SDK)/mk/rte.vars.mk
 # library name
 LIB = librte_mbuf.a
 
-CFLAGS += -DALLOW_EXPERIMENTAL_API
 CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
 LDLIBS += -lrte_eal -lrte_mempool
 
diff --git a/lib/librte_mbuf/meson.build b/lib/librte_mbuf/meson.build
index 869c17c1c..45ffb0db5 100644
--- a/lib/librte_mbuf/meson.build
+++ b/lib/librte_mbuf/meson.build
@@ -2,7 +2,6 @@
 # Copyright(c) 2017 Intel Corporation
 
 version = 3
-allow_experimental_apis = true
 sources = files('rte_mbuf.c', 'rte_mbuf_ptype.c', 'rte_mbuf_pool_ops.c')
 headers = files('rte_mbuf.h', 'rte_mbuf_ptype.h', 'rte_mbuf_pool_ops.h')
 deps += ['mempool']
-- 
2.11.0

Re: [PATCH v2 1/2] eal: remove deprecated function returning mbuf pool ops name

[Burakov, Anatoly]

On 26-Jun-18 10:56 AM, Olivier Matz wrote:
> rte_eal_mbuf_default_mempool_ops() is replaced by
> rte_mbuf_best_mempool_ops().
> 
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> ---
> 

Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com>

-- 
Thanks,
Anatoly

Re: [PATCH v2 2/2] eal: remove experimental tag from user mbuf pool ops func

[santosh]

On Tuesday 26 June 2018 03:26 PM, Olivier Matz wrote:
> External Email
>
> Remove experimental tag from rte_eal_mbuf_user_pool_ops().
>
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> ---

Acked-by: Santosh Shukla <santosh.shukla@caviumnetworks.com>

Re: [PATCH v2 1/2] eal: remove deprecated function returning mbuf pool ops name

[santosh]

On Tuesday 26 June 2018 03:26 PM, Olivier Matz wrote:
> External Email
>
> rte_eal_mbuf_default_mempool_ops() is replaced by
> rte_mbuf_best_mempool_ops().
>
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> ---

Acked-by: Santosh Shukla <santosh.shukla@caviumnetworks.com>

Re: [PATCH v2 1/2] eal: remove deprecated function returning mbuf pool ops name

[Thomas Monjalon]

26/06/2018 11:56, Olivier Matz:
> rte_eal_mbuf_default_mempool_ops() is replaced by
> rte_mbuf_best_mempool_ops().
> 
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> ---
> 
> v2:
> * remove rte_eal_mbuf_user_pool_ops from .map in next patch instead of this
> 
>  doc/guides/rel_notes/deprecation.rst    |  9 ---------
>  lib/librte_eal/bsdapp/eal/eal.c         | 10 ----------
>  lib/librte_eal/common/include/rte_eal.h | 11 -----------
>  lib/librte_eal/linuxapp/eal/eal.c       | 10 ----------
>  lib/librte_eal/rte_eal_version.map      |  1 -
>  5 files changed, 41 deletions(-)

Please bump ABI version and update the release notes.
Thanks

Re: [PATCH v2 1/2] eal: remove deprecated function returning mbuf pool ops name

[Thomas Monjalon]

26/07/2018 23:42, Thomas Monjalon:
> 26/06/2018 11:56, Olivier Matz:
> > rte_eal_mbuf_default_mempool_ops() is replaced by
> > rte_mbuf_best_mempool_ops().
> > 
> > Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> > ---
> > 
> > v2:
> > * remove rte_eal_mbuf_user_pool_ops from .map in next patch instead of this
> > 
> >  doc/guides/rel_notes/deprecation.rst    |  9 ---------
> >  lib/librte_eal/bsdapp/eal/eal.c         | 10 ----------
> >  lib/librte_eal/common/include/rte_eal.h | 11 -----------
> >  lib/librte_eal/linuxapp/eal/eal.c       | 10 ----------
> >  lib/librte_eal/rte_eal_version.map      |  1 -
> >  5 files changed, 41 deletions(-)
> 
> Please bump ABI version and update the release notes.
> Thanks

Olivier, ping!

[PATCH v3 1/2] eal: remove deprecated function returning mbuf pool ops name

[Olivier Matz]

From: Olivier Matz <olivier.matz@6wind.com>

rte_eal_mbuf_default_mempool_ops() is replaced by
rte_mbuf_best_mempool_ops().

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com>
Acked-by: Santosh Shukla <santosh.shukla@caviumnetworks.com>
---

v3:
* bump ABI version and update the release notes
v2:
* remove rte_eal_mbuf_user_pool_ops from .map in next patch instead of this

 doc/guides/rel_notes/deprecation.rst    |  9 ---------
 doc/guides/rel_notes/release_18_08.rst  |  6 +++++-
 lib/librte_eal/bsdapp/eal/Makefile      |  2 +-
 lib/librte_eal/bsdapp/eal/eal.c         | 10 ----------
 lib/librte_eal/common/include/rte_eal.h | 11 -----------
 lib/librte_eal/linuxapp/eal/Makefile    |  2 +-
 lib/librte_eal/linuxapp/eal/eal.c       | 10 ----------
 lib/librte_eal/meson.build              |  2 +-
 lib/librte_eal/rte_eal_version.map      |  1 -
 9 files changed, 8 insertions(+), 45 deletions(-)

diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index bade1e4c4..118f962d9 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -42,15 +42,6 @@ Deprecation Notices
   - ``eal_parse_pci_DomBDF`` replaced by ``rte_pci_addr_parse``
   - ``rte_eal_compare_pci_addr`` replaced by ``rte_pci_addr_cmp``
 
-* eal: a new set of mbuf mempool ops name APIs for user, platform and best
-  mempool names have been defined in ``rte_mbuf`` in v18.02. The uses of
-  ``rte_eal_mbuf_default_mempool_ops`` shall be replaced by
-  ``rte_mbuf_best_mempool_ops``.
-  The following function is deprecated since 18.05, and will be removed
-  in 18.08:
-
-  - ``rte_eal_mbuf_default_mempool_ops``
-
 * mbuf: The opaque ``mbuf->hash.sched`` field will be updated to support generic
   definition in line with the ethdev TM and MTR APIs. Currently, this field
   is defined in librte_sched in a non-generic way. The new generic format
diff --git a/doc/guides/rel_notes/release_18_08.rst b/doc/guides/rel_notes/release_18_08.rst
index 9849fec7d..06cc38e85 100644
--- a/doc/guides/rel_notes/release_18_08.rst
+++ b/doc/guides/rel_notes/release_18_08.rst
@@ -181,6 +181,10 @@ API Changes
   - ``RTE_COMP_FF_OOP_SGL_IN_LB_OUT``
   - ``RTE_COMP_FF_OOP_LB_IN_SGL_OUT``
 
+* eal: The function ``rte_eal_mbuf_default_mempool_ops`` was deprecated
+  and is removed in 18.08. It shall be replaced by
+  ``rte_mbuf_best_mempool_ops``.
+
 
 ABI Changes
 -----------
@@ -242,7 +246,7 @@ The libraries prepended with a plus sign were incremented in this version.
      librte_compressdev.so.1
    + librte_cryptodev.so.5
      librte_distributor.so.1
-     librte_eal.so.7
+   + librte_eal.so.8
      librte_ethdev.so.9
      librte_eventdev.so.4
      librte_flow_classify.so.1
diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile
index be684072e..d27da3d15 100644
--- a/lib/librte_eal/bsdapp/eal/Makefile
+++ b/lib/librte_eal/bsdapp/eal/Makefile
@@ -22,7 +22,7 @@ LDLIBS += -lrte_kvargs
 
 EXPORT_MAP := ../../rte_eal_version.map
 
-LIBABIVER := 7
+LIBABIVER := 8
 
 # specific to bsdapp exec-env
 SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) := eal.c
diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index 6a6dd5e85..89e8110a2 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -153,16 +153,6 @@ rte_eal_mbuf_user_pool_ops(void)
 	return internal_config.user_mbuf_pool_ops_name;
 }
 
-/* Return mbuf pool ops name */
-const char *
-rte_eal_mbuf_default_mempool_ops(void)
-{
-	if (internal_config.user_mbuf_pool_ops_name == NULL)
-		return RTE_MBUF_DEFAULT_MEMPOOL_OPS;
-
-	return internal_config.user_mbuf_pool_ops_name;
-}
-
 /* Return a pointer to the configuration structure */
 struct rte_config *
 rte_eal_get_configuration(void)
diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
index 8de5d69e8..0c9c3f13b 100644
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -501,17 +501,6 @@ enum rte_iova_mode rte_eal_iova_mode(void);
 const char * __rte_experimental
 rte_eal_mbuf_user_pool_ops(void);
 
-/**
- * @deprecated
- * Get default pool ops name for mbuf
- *
- * @return
- *   returns default pool ops name.
- */
-__rte_deprecated
-const char *
-rte_eal_mbuf_default_mempool_ops(void);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile
index b48352825..fd92c75c2 100644
--- a/lib/librte_eal/linuxapp/eal/Makefile
+++ b/lib/librte_eal/linuxapp/eal/Makefile
@@ -10,7 +10,7 @@ ARCH_DIR ?= $(RTE_ARCH)
 EXPORT_MAP := ../../rte_eal_version.map
 VPATH += $(RTE_SDK)/lib/librte_eal/common/arch/$(ARCH_DIR)
 
-LIBABIVER := 7
+LIBABIVER := 8
 
 VPATH += $(RTE_SDK)/lib/librte_eal/common
 
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index d2d5aae80..511eb062f 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -161,16 +161,6 @@ rte_eal_mbuf_user_pool_ops(void)
 	return internal_config.user_mbuf_pool_ops_name;
 }
 
-/* Return mbuf pool ops name */
-const char *
-rte_eal_mbuf_default_mempool_ops(void)
-{
-	if (internal_config.user_mbuf_pool_ops_name == NULL)
-		return RTE_MBUF_DEFAULT_MEMPOOL_OPS;
-
-	return internal_config.user_mbuf_pool_ops_name;
-}
-
 /* Return a pointer to the configuration structure */
 struct rte_config *
 rte_eal_get_configuration(void)
diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build
index 98174476c..e1fde15d1 100644
--- a/lib/librte_eal/meson.build
+++ b/lib/librte_eal/meson.build
@@ -21,7 +21,7 @@ else
 	error('unsupported system type "@0@"'.format(host_machine.system()))
 endif
 
-version = 7  # the version of the EAL API
+version = 8  # the version of the EAL API
 allow_experimental_apis = true
 deps += 'compat'
 deps += 'kvargs'
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index f18387137..de9abc812 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -181,7 +181,6 @@ DPDK_17.11 {
 	rte_bus_get_iommu_class;
 	rte_eal_has_pci;
 	rte_eal_iova_mode;
-	rte_eal_mbuf_default_mempool_ops;
 	rte_eal_using_phys_addrs;
 	rte_eal_vfio_intr_mode;
 	rte_lcore_has_role;
-- 
2.11.0

[PATCH v3 2/2] eal: remove experimental tag from user mbuf pool ops func

[Olivier Matz]

From: Olivier Matz <olivier.matz@6wind.com>

Remove experimental tag from rte_eal_mbuf_user_pool_ops().

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
Acked-by: Santosh Shukla <santosh.shukla@caviumnetworks.com>
---

v3:
* nothing
v2:
* remove rte_eal_mbuf_user_pool_ops from .map in this patch instead of previous one

 lib/librte_eal/bsdapp/eal/eal.c         | 2 +-
 lib/librte_eal/common/include/rte_eal.h | 5 +----
 lib/librte_eal/linuxapp/eal/eal.c       | 2 +-
 lib/librte_eal/rte_eal_version.map      | 7 ++++++-
 lib/librte_mbuf/Makefile                | 1 -
 lib/librte_mbuf/meson.build             | 1 -
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index 89e8110a2..d7ae9d686 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -147,7 +147,7 @@ eal_get_runtime_dir(void)
 }
 
 /* Return user provided mbuf pool ops name */
-const char * __rte_experimental
+const char *
 rte_eal_mbuf_user_pool_ops(void)
 {
 	return internal_config.user_mbuf_pool_ops_name;
diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
index 0c9c3f13b..e114dcbdc 100644
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -490,15 +490,12 @@ static inline int rte_gettid(void)
 enum rte_iova_mode rte_eal_iova_mode(void);
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
  * Get user provided pool ops name for mbuf
  *
  * @return
  *   returns user provided pool ops name.
  */
-const char * __rte_experimental
+const char *
 rte_eal_mbuf_user_pool_ops(void);
 
 #ifdef __cplusplus
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 511eb062f..e59ac6577 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -155,7 +155,7 @@ eal_get_runtime_dir(void)
 }
 
 /* Return user provided mbuf pool ops name */
-const char * __rte_experimental
+const char *
 rte_eal_mbuf_user_pool_ops(void)
 {
 	return internal_config.user_mbuf_pool_ops_name;
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index de9abc812..67a89e6a6 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -261,6 +261,12 @@ DPDK_18.08 {
 
 } DPDK_18.05;
 
+DPDK_18.08 {
+	global:
+
+	rte_eal_mbuf_user_pool_ops;
+} DPDK_18.05;
+
 EXPERIMENTAL {
 	global:
 
@@ -286,7 +292,6 @@ EXPERIMENTAL {
 	rte_eal_cleanup;
 	rte_eal_hotplug_add;
 	rte_eal_hotplug_remove;
-	rte_eal_mbuf_user_pool_ops;
 	rte_fbarray_attach;
 	rte_fbarray_destroy;
 	rte_fbarray_detach;
diff --git a/lib/librte_mbuf/Makefile b/lib/librte_mbuf/Makefile
index 8749a00fe..e2b98a254 100644
--- a/lib/librte_mbuf/Makefile
+++ b/lib/librte_mbuf/Makefile
@@ -6,7 +6,6 @@ include $(RTE_SDK)/mk/rte.vars.mk
 # library name
 LIB = librte_mbuf.a
 
-CFLAGS += -DALLOW_EXPERIMENTAL_API
 CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
 LDLIBS += -lrte_eal -lrte_mempool
 
diff --git a/lib/librte_mbuf/meson.build b/lib/librte_mbuf/meson.build
index 869c17c1c..45ffb0db5 100644
--- a/lib/librte_mbuf/meson.build
+++ b/lib/librte_mbuf/meson.build
@@ -2,7 +2,6 @@
 # Copyright(c) 2017 Intel Corporation
 
 version = 3
-allow_experimental_apis = true
 sources = files('rte_mbuf.c', 'rte_mbuf_ptype.c', 'rte_mbuf_pool_ops.c')
 headers = files('rte_mbuf.h', 'rte_mbuf_ptype.h', 'rte_mbuf_pool_ops.h')
 deps += ['mempool']
-- 
2.11.0

Re: [PATCH v3 1/2] eal: remove deprecated function returning mbuf pool ops name

[Hemant]

On 8/8/2018 3:04 AM, Olivier Matz wrote:
> From: Olivier Matz <olivier.matz@6wind.com>
>
> rte_eal_mbuf_default_mempool_ops() is replaced by
> rte_mbuf_best_mempool_ops().
>
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com>
> Acked-by: Santosh Shukla <santosh.shukla@caviumnetworks.com>
> ---
   Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>

Re: [PATCH v3 2/2] eal: remove experimental tag from user mbuf pool ops func

[Hemant]

On 8/8/2018 3:04 AM, Olivier Matz wrote:
> From: Olivier Matz <olivier.matz@6wind.com>
>
> Remove experimental tag from rte_eal_mbuf_user_pool_ops().
>
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> Acked-by: Santosh Shukla <santosh.shukla@caviumnetworks.com>
> ---
   Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>

Re: [PATCH v3 2/2] eal: remove experimental tag from user mbuf pool ops func

[Thomas Monjalon]

07/08/2018 23:34, Olivier Matz:
> From: Olivier Matz <olivier.matz@6wind.com>
> 
> Remove experimental tag from rte_eal_mbuf_user_pool_ops().
> 
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> Acked-by: Santosh Shukla <santosh.shukla@caviumnetworks.com>
> ---
> --- a/lib/librte_eal/rte_eal_version.map
> +++ b/lib/librte_eal/rte_eal_version.map
> @@ -261,6 +261,12 @@ DPDK_18.08 {
>  
>  } DPDK_18.05;
>  
> +DPDK_18.08 {
> +	global:
> +
> +	rte_eal_mbuf_user_pool_ops;
> +} DPDK_18.05;
> +

There is already a section DPDK_18.08 so I moved the function there.

Series applied with above fix, thanks