From patchwork Thu Jul 28 09:35:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 114338 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AF1D8A00C4; Thu, 28 Jul 2022 11:36:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 73B2142B92; Thu, 28 Jul 2022 11:36:12 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 3B34D427ED for ; Thu, 28 Jul 2022 11:36:09 +0200 (CEST) Received: by shelob.oktetlabs.ru (Postfix, from userid 115) id 77CFAD5; Thu, 28 Jul 2022 12:36:07 +0300 (MSK) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mail1.oktetlabs.ru X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_DISCARD autolearn=no autolearn_force=no version=3.4.6 Received: from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17]) by shelob.oktetlabs.ru (Postfix) with ESMTP id C659BC9; Thu, 28 Jul 2022 12:36:05 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru C659BC9 Authentication-Results: shelob.oktetlabs.ru/C659BC9; dkim=none; dkim-atps=neutral From: Andrew Rybchenko To: Ray Kinsella , Olivier Matz Cc: dev@dpdk.org Subject: [PATCH 1/3] mempool: remove deprecated macro to calculate header size Date: Thu, 28 Jul 2022 12:35:56 +0300 Message-Id: <20220728093558.2261726-2-andrew.rybchenko@oktetlabs.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220728093558.2261726-1-andrew.rybchenko@oktetlabs.ru> References: <20220728093558.2261726-1-andrew.rybchenko@oktetlabs.ru> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 --- 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) From patchwork Thu Jul 28 09:35:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 114337 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id ED9E1A00C4; Thu, 28 Jul 2022 11:36:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A0C7942B8A; Thu, 28 Jul 2022 11:36:11 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 3196640E25 for ; Thu, 28 Jul 2022 11:36:09 +0200 (CEST) Received: by shelob.oktetlabs.ru (Postfix, from userid 115) id 64473D9; Thu, 28 Jul 2022 12:36:07 +0300 (MSK) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mail1.oktetlabs.ru X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_DISCARD autolearn=no autolearn_force=no version=3.4.6 Received: from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17]) by shelob.oktetlabs.ru (Postfix) with ESMTP id F4157CB; Thu, 28 Jul 2022 12:36:05 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru F4157CB Authentication-Results: shelob.oktetlabs.ru/F4157CB; dkim=none; dkim-atps=neutral From: Andrew Rybchenko To: Ray Kinsella , Olivier Matz Cc: dev@dpdk.org Subject: [PATCH 2/3] mempool: remove deprecated macro to register mempool driver Date: Thu, 28 Jul 2022 12:35:57 +0300 Message-Id: <20220728093558.2261726-3-andrew.rybchenko@oktetlabs.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220728093558.2261726-1-andrew.rybchenko@oktetlabs.ru> References: <20220728093558.2261726-1-andrew.rybchenko@oktetlabs.ru> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replacement RTE_MEMPOOL_REGISTER_OPS() should be used instead. Signed-off-by: Andrew Rybchenko --- 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. * From patchwork Thu Jul 28 09:35:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 114335 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 72D38A00C4; Thu, 28 Jul 2022 11:36:10 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 08851427ED; Thu, 28 Jul 2022 11:36:10 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id B1214427ED for ; Thu, 28 Jul 2022 11:36:08 +0200 (CEST) Received: by shelob.oktetlabs.ru (Postfix, from userid 115) id D5488CB; Thu, 28 Jul 2022 12:36:07 +0300 (MSK) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mail1.oktetlabs.ru X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_DISCARD autolearn=no autolearn_force=no version=3.4.6 Received: from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17]) by shelob.oktetlabs.ru (Postfix) with ESMTP id 58115D1; Thu, 28 Jul 2022 12:36:06 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 58115D1 Authentication-Results: shelob.oktetlabs.ru/58115D1; dkim=none; dkim-atps=neutral From: Andrew Rybchenko To: Ray Kinsella , Olivier Matz Cc: dev@dpdk.org Subject: [PATCH 3/3] mempool: remove deprecated unused defines Date: Thu, 28 Jul 2022 12:35:58 +0300 Message-Id: <20220728093558.2261726-4-andrew.rybchenko@oktetlabs.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220728093558.2261726-1-andrew.rybchenko@oktetlabs.ru> References: <20220728093558.2261726-1-andrew.rybchenko@oktetlabs.ru> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org MEMPOOL_PG_NUM_DEFAULT and MEMPOOL_PG_SHIFT_MAX defines are unused since xmem API removal. Signed-off-by: Andrew Rybchenko --- 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_" */ #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.