[PATCH 0/3] mempool: apply deprecations

[PATCH 0/3] mempool: apply deprecations

[Andrew Rybchenko]

Remove deprecated macros.

Andrew Rybchenko (3):
  mempool: remove deprecated macro to calculate header size
  mempool: remove deprecated macro to register mempool driver
  mempool: remove deprecated unused defines

 doc/guides/rel_notes/deprecation.rst   | 11 -----------
 doc/guides/rel_notes/release_22_11.rst | 11 +++++++++++
 lib/mempool/rte_mempool.h              | 14 --------------
 3 files changed, 11 insertions(+), 25 deletions(-)

-- 
2.30.2

[PATCH 1/3] mempool: remove deprecated macro to calculate header size

[Andrew Rybchenko]

MEMPOOL_HEADER_SIZE() is removed. The replacement with RTE_ prefix
is internal only since it is implementation details which are not
required in applications.

Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
 doc/guides/rel_notes/deprecation.rst   | 4 ----
 doc/guides/rel_notes/release_22_11.rst | 3 +++
 lib/mempool/rte_mempool.h              | 4 ----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index e7583cae4c..5036ae845e 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -32,10 +32,6 @@ Deprecation Notices
   ``__atomic_thread_fence`` must be used for patches that need to be merged in
   20.08 onwards. This change will not introduce any performance degradation.
 
-* mempool: Helper macro ``MEMPOOL_HEADER_SIZE()`` is deprecated and will
-  be removed in DPDK 22.11. The replacement macro
-  ``RTE_MEMPOOL_HEADER_SIZE()`` is internal only.
-
 * mempool: Macro to register mempool driver ``MEMPOOL_REGISTER_OPS()`` is
   deprecated and will be removed in DPDK 22.11. Use replacement macro
   ``RTE_MEMPOOL_REGISTER_OPS()``.
diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst
index 8c021cf050..ae72610093 100644
--- a/doc/guides/rel_notes/release_22_11.rst
+++ b/doc/guides/rel_notes/release_22_11.rst
@@ -84,6 +84,9 @@ API Changes
    Also, make sure to start the actual text at the margin.
    =======================================================
 
+* mempool: Deprecated helper macro ``MEMPOOL_HEADER_SIZE()`` is removed.
+  The replacement macro ``RTE_MEMPOOL_HEADER_SIZE()`` is internal only.
+
 
 ABI Changes
 -----------
diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
index 3ada37cb86..e129a5a59d 100644
--- a/lib/mempool/rte_mempool.h
+++ b/lib/mempool/rte_mempool.h
@@ -329,10 +329,6 @@ struct rte_mempool {
 	(sizeof(*(mp)) + (((cs) == 0) ? 0 : \
 	(sizeof(struct rte_mempool_cache) * RTE_MAX_LCORE)))
 
-/** Deprecated. Use RTE_MEMPOOL_HEADER_SIZE() for internal purposes only. */
-#define MEMPOOL_HEADER_SIZE(mp, cs) \
-	RTE_DEPRECATED(MEMPOOL_HEADER_SIZE) RTE_MEMPOOL_HEADER_SIZE(mp, cs)
-
 /* return the header of a mempool object (internal) */
 static inline struct rte_mempool_objhdr *
 rte_mempool_get_header(void *obj)
-- 
2.30.2

[PATCH 2/3] mempool: remove deprecated macro to register mempool driver

[Andrew Rybchenko]

Replacement RTE_MEMPOOL_REGISTER_OPS() should be used instead.

Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
 doc/guides/rel_notes/deprecation.rst   | 4 ----
 doc/guides/rel_notes/release_22_11.rst | 4 ++++
 lib/mempool/rte_mempool.h              | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 5036ae845e..03f9ac806c 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -32,10 +32,6 @@ Deprecation Notices
   ``__atomic_thread_fence`` must be used for patches that need to be merged in
   20.08 onwards. This change will not introduce any performance degradation.
 
-* mempool: Macro to register mempool driver ``MEMPOOL_REGISTER_OPS()`` is
-  deprecated and will be removed in DPDK 22.11. Use replacement macro
-  ``RTE_MEMPOOL_REGISTER_OPS()``.
-
 * mempool: The mempool API macros ``MEMPOOL_PG_*`` are deprecated and
   will be removed in DPDK 22.11.
 
diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst
index ae72610093..1a3a1549d9 100644
--- a/doc/guides/rel_notes/release_22_11.rst
+++ b/doc/guides/rel_notes/release_22_11.rst
@@ -87,6 +87,10 @@ API Changes
 * mempool: Deprecated helper macro ``MEMPOOL_HEADER_SIZE()`` is removed.
   The replacement macro ``RTE_MEMPOOL_HEADER_SIZE()`` is internal only.
 
+* mempool: Deprecated macro to register mempool driver
+  ``MEMPOOL_REGISTER_OPS()`` is removed. Use replacement macro
+  ``RTE_MEMPOOL_REGISTER_OPS()`` instead.
+
 
 ABI Changes
 -----------
diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
index e129a5a59d..b3d3c52e18 100644
--- a/lib/mempool/rte_mempool.h
+++ b/lib/mempool/rte_mempool.h
@@ -930,10 +930,6 @@ int rte_mempool_register_ops(const struct rte_mempool_ops *ops);
 		rte_mempool_register_ops(&ops);			\
 	}
 
-/** Deprecated. Use RTE_MEMPOOL_REGISTER_OPS() instead. */
-#define MEMPOOL_REGISTER_OPS(ops) \
-	RTE_DEPRECATED(MEMPOOL_REGISTER_OPS) RTE_MEMPOOL_REGISTER_OPS(ops)
-
 /**
  * An object callback function for mempool.
  *
-- 
2.30.2

[PATCH 3/3] mempool: remove deprecated unused defines

[Andrew Rybchenko]

MEMPOOL_PG_NUM_DEFAULT and MEMPOOL_PG_SHIFT_MAX defines are unused
since xmem API removal.

Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
 doc/guides/rel_notes/deprecation.rst   | 3 ---
 doc/guides/rel_notes/release_22_11.rst | 4 ++++
 lib/mempool/rte_mempool.h              | 6 ------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 03f9ac806c..351f3ce056 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -32,9 +32,6 @@ Deprecation Notices
   ``__atomic_thread_fence`` must be used for patches that need to be merged in
   20.08 onwards. This change will not introduce any performance degradation.
 
-* mempool: The mempool API macros ``MEMPOOL_PG_*`` are deprecated and
-  will be removed in DPDK 22.11.
-
 * bus: The ``rte_bus`` object will be made opaque in DPDK 22.11.
   The goal is to remove it from the public ABI and make this object extendable.
   As a side effect, registering a bus will be marked as an internal API:
diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst
index 1a3a1549d9..25c49897eb 100644
--- a/doc/guides/rel_notes/release_22_11.rst
+++ b/doc/guides/rel_notes/release_22_11.rst
@@ -91,6 +91,10 @@ API Changes
   ``MEMPOOL_REGISTER_OPS()`` is removed. Use replacement macro
   ``RTE_MEMPOOL_REGISTER_OPS()`` instead.
 
+* mempool: Deprecated macros ``MEMPOOL_PG_NUM_DEFAULT`` and
+  ``MEMPOOL_PG_SHIFT_MAX`` are removed. These macros are not used and
+  not required any more.
+
 
 ABI Changes
 -----------
diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
index b3d3c52e18..a3c4ee351d 100644
--- a/lib/mempool/rte_mempool.h
+++ b/lib/mempool/rte_mempool.h
@@ -112,12 +112,6 @@ struct rte_mempool_objsz {
 /* "MP_<name>" */
 #define	RTE_MEMPOOL_MZ_FORMAT	RTE_MEMPOOL_MZ_PREFIX "%s"
 
-#define	MEMPOOL_PG_SHIFT_MAX \
-	RTE_DEPRECATED(MEMPOOL_PG_SHIFT_MAX) (sizeof(uintptr_t) * CHAR_BIT - 1)
-
-/** Deprecated. Mempool over one chunk of physically continuous memory */
-#define	MEMPOOL_PG_NUM_DEFAULT	RTE_DEPRECATED(MEMPOOL_PG_NUM_DEFAULT) 1
-
 #ifndef RTE_MEMPOOL_ALIGN
 /**
  * Alignment of elements inside mempool.
-- 
2.30.2

Re: [PATCH 0/3] mempool: apply deprecations

[David Marchand]

On Thu, Jul 28, 2022 at 11:36 AM Andrew Rybchenko
<andrew.rybchenko@oktetlabs.ru> wrote:
>
> Remove deprecated macros.
>
> Andrew Rybchenko (3):
>   mempool: remove deprecated macro to calculate header size
>   mempool: remove deprecated macro to register mempool driver
>   mempool: remove deprecated unused defines
>
>  doc/guides/rel_notes/deprecation.rst   | 11 -----------
>  doc/guides/rel_notes/release_22_11.rst | 11 +++++++++++
>  lib/mempool/rte_mempool.h              | 14 --------------
>  3 files changed, 11 insertions(+), 25 deletions(-)

LGTM.
For the series,
Acked-by: David Marchand <david.marchand@redhat.com>

Thanks Andrew.


-- 
David Marchand

Re: [PATCH 0/3] mempool: apply deprecations

[Olivier Matz]

On Thu, Jul 28, 2022 at 01:38:04PM +0200, David Marchand wrote:
> On Thu, Jul 28, 2022 at 11:36 AM Andrew Rybchenko
> <andrew.rybchenko@oktetlabs.ru> wrote:
> >
> > Remove deprecated macros.
> >
> > Andrew Rybchenko (3):
> >   mempool: remove deprecated macro to calculate header size
> >   mempool: remove deprecated macro to register mempool driver
> >   mempool: remove deprecated unused defines
> >
> >  doc/guides/rel_notes/deprecation.rst   | 11 -----------
> >  doc/guides/rel_notes/release_22_11.rst | 11 +++++++++++
> >  lib/mempool/rte_mempool.h              | 14 --------------
> >  3 files changed, 11 insertions(+), 25 deletions(-)

For the series,
Acked-by: Olivier Matz <olivier.matz@6wind.com>

Thanks
Olivier

Re: [PATCH 0/3] mempool: apply deprecations

[David Marchand]

On Mon, Sep 26, 2022 at 1:43 PM Olivier Matz <olivier.matz@6wind.com> wrote:
>
> On Thu, Jul 28, 2022 at 01:38:04PM +0200, David Marchand wrote:
> > On Thu, Jul 28, 2022 at 11:36 AM Andrew Rybchenko
> > <andrew.rybchenko@oktetlabs.ru> wrote:
> > >
> > > Remove deprecated macros.
> > >
> > > Andrew Rybchenko (3):
> > >   mempool: remove deprecated macro to calculate header size
> > >   mempool: remove deprecated macro to register mempool driver
> > >   mempool: remove deprecated unused defines
> > >
> > >  doc/guides/rel_notes/deprecation.rst   | 11 -----------
> > >  doc/guides/rel_notes/release_22_11.rst | 11 +++++++++++
> > >  lib/mempool/rte_mempool.h              | 14 --------------
> > >  3 files changed, 11 insertions(+), 25 deletions(-)
>
> For the series,
> Acked-by: Olivier Matz <olivier.matz@6wind.com>

Series applied, thanks.


-- 
David Marchand