From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 513A1A034F for ; Wed, 10 Nov 2021 07:46:43 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4A09E4014D; Wed, 10 Nov 2021 07:46:43 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2068.outbound.protection.outlook.com [40.107.94.68]) by mails.dpdk.org (Postfix) with ESMTP id 5D174410EF for ; Wed, 10 Nov 2021 07:46:41 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mr26/uH9HTcaBWYeKc8hJ+LivJKN6TYu2khWUmheHQQ11LXn4/oTagOYrX3mJcE9n/sh1xdNeQrqOUK2ucG1KUGwF2NjC7l25xc9QijG4e94joNTUG9/Q+SL7DgmcSCeqCggy3fuHbARiG4CnakDVdIoE29EvizoqQ+HoVJ3F2uAiINsV9AuyMF3rCyzLKx0u6V/L/vl7Fwm92Zlb9rNk1ohFFYDFsf5Vh9D51cGPSzgUo3xX/ZPVxLGB1zoM2dTAsQo8uAK6jRkxNUDo2A8TlNgUvyiPRqWJl+BqVEEgHQTK59WTSsytPV3SRek4hnnrENhjfeDaMx0TLX740/Vaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jlqumdL56u20qVLXa/e95r3p4kFLIGXF7p0TNSOWTz8=; b=FmsGrf0uBvtx/cZPkb0jX9+tVpDRZFOETdmqVpcbk4lRH7Y1G7N2slIxtUK8jdWwCHTGfAfPmwu8ssnX4dGu7m2rjlr5mfPuvwEoyvnSR7STDfMuvwj4sQioZ54XIzM70/Y0T7JEYV66L0rt8KVNSgmjuzzC5kjXScp97f/jmToTG+ZOzW5UuYf29Vi9abHhGKFcCcPm7k3nTWtdfWcIKqo252Ev9sJjDBCbm+6CFqg3LHYZzTy5kKRECv9kRrnKi5fF7wuiN2JcGv11tvrz8qoHj+O2DCjdTqhGDK728oHzMGq+CeVi+FDQrr8feoGbVZo8fvNbW0GaqRNrz0etxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=6wind.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jlqumdL56u20qVLXa/e95r3p4kFLIGXF7p0TNSOWTz8=; b=UuS9sfDgrTQXlQJgVMSNEQ9UFfAC0ZI3v/9W7m6YYMsYZ/hujK6Ng/XVGM1zMtizQAHPN98qmYp55TpvuVRe0a3dTlI5VyJZCB4F9c3Fgmj8Z7z80BWscV0Enfz/GPXg6m6VyVSmRPu4GMK+JIA7pVyTinLZcjt9dB5hJ5XtlYLoO95sq1KcJkXZ+KSXULLrSXuF2U6ZnLjfmv5JFre0uhBu6C+5eiyBqedsfpM+bVg9IQK2vj9rEHPgXqYpchu+LM3v5Bs9PRcWvXry89xqfplfLFDsb1g56TEEj73cOjNzyNu4g0IuxpI7mRAxdshkDmlFGtjik3e6Y7ES3zicuA== Received: from BN9PR03CA0640.namprd03.prod.outlook.com (2603:10b6:408:13b::15) by DM6PR12MB4154.namprd12.prod.outlook.com (2603:10b6:5:21d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 10 Nov 2021 06:46:39 +0000 Received: from BN8NAM11FT036.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13b:cafe::22) by BN9PR03CA0640.outlook.office365.com (2603:10b6:408:13b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13 via Frontend Transport; Wed, 10 Nov 2021 06:46:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; 6wind.com; dkim=none (message not signed) header.d=none;6wind.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT036.mail.protection.outlook.com (10.13.177.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:46:38 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:46:37 +0000 From: Xueming Li To: Andrew Rybchenko CC: Luca Boccassi , Olivier Matz , dpdk stable Date: Wed, 10 Nov 2021 14:30:12 +0800 Message-ID: <20211110063216.2744012-129-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e9ee2fa-71a1-44a1-1bcd-08d9a415d8f1 X-MS-TrafficTypeDiagnostic: DM6PR12MB4154: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TLaReYcLi+KIJ+R7HPAxz29tnDUNT3FFzeyBR3S1DI3/SLev2XMw14EMu9Yf+j5gE8bid/LfuQNIWkoReAQ5Kq66pObCnEgPU+1G3mLalbjkm4oK0bC+ydNAHlENQ8Z98K66d0g7pCicsl36ALPEtVYnOmdBtc3m5XDm3XcVGpCsY277IztmZin8gMrc7xO3r/tGsrqbcXYYejx/xEE5s+Qi9PeQ2r29femQgchptMvrMLWVf1Qwr87f7/SkNQHuzWkd8lN7XRRKl4s3bfIpXmmIrdh+Td6GyFYNjf5ZzIrQJ94vcvSRRJ71UPbQLYYoXtD2Ko88zc8u2Mb0LS9JBiYeiF4NRcpb1PnetUlGlO20Alukdzyde2HE0eL9Cz3zho8noVJnW3h/COLb5zu4vgzx5c3+rGNtNwN249BZ11p2oNZXEvv6Ktxb1S6lePO1/VTgJpnpNb6gG+rk30Y+ELROE3KSR27zLpZctU6upldMQu8mRZSKD5aB4DKz0OeSZ8zD14z7KsLSKB97lylBQKEYaxS0lDWnL3sj3Ld1WvlbV3JjDrYoWgdnCgpXfYhJqb+aDkcSDaQtPavycPmhbqeuNOCpelCRIx1n/QA8rSX+v2REeUqUK9fOIjymK4c6ABCZ5ykZV5WS3WN/b1EuQgxinUxEmquu736qzVPBb+4W9WczZc3XuQQZ65qNhhhsuu7Xw5M5Dp0CUeg4IHyue12mdh7E4nUn+XYnrD06lEhjE8Jww0sUDhG0smLxRCVXiO6WeJgYYWJpGDKMHMkrAa2jRCcd3pKWWK8Bu8bTXrA2ZduBo7IkYg+h20NNHenm4ZLinrjZpUYjEWEOIds+tQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(316002)(6916009)(82310400003)(7636003)(47076005)(70206006)(966005)(1076003)(36860700001)(70586007)(508600001)(8936002)(8676002)(356005)(55016002)(7696005)(4326008)(53546011)(336012)(6286002)(36756003)(2616005)(2906002)(86362001)(4001150100001)(6666004)(186003)(16526019)(426003)(5660300002)(26005)(54906003)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:46:38.8885 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e9ee2fa-71a1-44a1-1bcd-08d9a415d8f1 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT036.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4154 Subject: [dpdk-stable] patch 'mempool: deprecate unused physical page defines' has been queued to stable release 20.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/f4860fc14a96f04d552b3580ac337a3cd23f00ae Thanks. Xueming Li --- >From f4860fc14a96f04d552b3580ac337a3cd23f00ae Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Tue, 19 Oct 2021 20:40:22 +0300 Subject: [PATCH] mempool: deprecate unused physical page defines Cc: Xueming Li [ upstream commit fb11ae88165cdea37cc3b86f045ac0e899aa4e77 ] MEMPOOL_PG_NUM_DEFAULT and MEMPOOL_PG_SHIFT_MAX are not used. Fixes: fd943c764a63 ("mempool: deprecate xmem functions") Signed-off-by: Andrew Rybchenko Acked-by: Olivier Matz --- doc/guides/contributing/documentation.rst | 4 ++-- doc/guides/rel_notes/deprecation.rst | 3 +++ lib/librte_mempool/rte_mempool.h | 7 ++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst index 1e998fd214..7c76b32dbf 100644 --- a/doc/guides/contributing/documentation.rst +++ b/doc/guides/contributing/documentation.rst @@ -649,7 +649,7 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati /**< Virtual address of the first mempool object. */ uintptr_t elt_va_end; /**< Virtual address of the mempool object. */ - phys_addr_t elt_pa[MEMPOOL_PG_NUM_DEFAULT]; + phys_addr_t elt_pa[1]; /**< Array of physical page addresses for the mempool buffer. */ This doesn't have an effect on the rendered documentation but it is confusing for the developer reading the code. @@ -668,7 +668,7 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati /** Virtual address of the mempool object. */ uintptr_t elt_va_end; /** Array of physical page addresses for the mempool buffer. */ - phys_addr_t elt_pa[MEMPOOL_PG_NUM_DEFAULT]; + phys_addr_t elt_pa[1]; * Read the rendered section of the documentation that you have added for correctness, clarity and consistency with the surrounding text. diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index c0d7efaba8..cf11196748 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -40,6 +40,9 @@ 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. + * lib: will fix extending some enum/define breaking the ABI. There are multiple samples in DPDK that enum/define terminated with a ``.*MAX.*`` value which is used by iterators, and arrays holding these values are sized with this diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h index c551cf733a..9c990a5593 100644 --- a/lib/librte_mempool/rte_mempool.h +++ b/lib/librte_mempool/rte_mempool.h @@ -112,10 +112,11 @@ struct rte_mempool_objsz { /* "MP_" */ #define RTE_MEMPOOL_MZ_FORMAT RTE_MEMPOOL_MZ_PREFIX "%s" -#define MEMPOOL_PG_SHIFT_MAX (sizeof(uintptr_t) * CHAR_BIT - 1) +#define MEMPOOL_PG_SHIFT_MAX \ + RTE_DEPRECATED(MEMPOOL_PG_SHIFT_MAX) (sizeof(uintptr_t) * CHAR_BIT - 1) -/** Mempool over one chunk of physically continuous memory */ -#define MEMPOOL_PG_NUM_DEFAULT 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 /** -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:07.635858274 +0800 +++ 0128-mempool-deprecate-unused-physical-page-defines.patch 2021-11-10 14:17:01.890745927 +0800 @@ -1 +1 @@ -From fb11ae88165cdea37cc3b86f045ac0e899aa4e77 Mon Sep 17 00:00:00 2001 +From f4860fc14a96f04d552b3580ac337a3cd23f00ae Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit fb11ae88165cdea37cc3b86f045ac0e899aa4e77 ] @@ -15,3 +18,2 @@ - doc/guides/rel_notes/release_21_11.rst | 3 +++ - lib/mempool/rte_mempool.h | 7 ++++--- - 4 files changed, 12 insertions(+), 5 deletions(-) + lib/librte_mempool/rte_mempool.h | 7 ++++--- + 3 files changed, 9 insertions(+), 5 deletions(-) @@ -20 +22 @@ -index 8cbd4a0f6f..7fcbb7fc43 100644 +index 1e998fd214..7c76b32dbf 100644 @@ -23 +25 @@ -@@ -705,7 +705,7 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati +@@ -649,7 +649,7 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati @@ -32 +34 @@ -@@ -724,7 +724,7 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati +@@ -668,7 +668,7 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati @@ -42 +44 @@ -index 0095d48084..c59dd5ca98 100644 +index c0d7efaba8..cf11196748 100644 @@ -45,17 +47,3 @@ -@@ -47,6 +47,9 @@ Deprecation Notices - 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. -+ - * mbuf: The mbuf offload flags ``PKT_*`` will be renamed as ``RTE_MBUF_F_*``. - A compatibility layer will be kept until DPDK 22.11, except for the flags - that are already deprecated (``PKT_RX_L4_CKSUM_BAD``, ``PKT_RX_IP_CKSUM_BAD``, -diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst -index a8dd8031c0..bdaefd236d 100644 ---- a/doc/guides/rel_notes/release_21_11.rst -+++ b/doc/guides/rel_notes/release_21_11.rst -@@ -239,6 +239,9 @@ API Changes - * mempool: Macro to register mempool driver ``MEMPOOL_REGISTER_OPS()`` is - deprecated. Use replacement ``RTE_MEMPOOL_REGISTER_OPS()``. +@@ -40,6 +40,9 @@ 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. @@ -66,8 +54,8 @@ - * net: Renamed ``s_addr`` and ``d_addr`` fields of ``rte_ether_hdr`` structure - to ``src_addr`` and ``dst_addr``, respectively. - -diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h -index 657233ce45..300dbdea4a 100644 ---- a/lib/mempool/rte_mempool.h -+++ b/lib/mempool/rte_mempool.h -@@ -116,10 +116,11 @@ struct rte_mempool_objsz { + * lib: will fix extending some enum/define breaking the ABI. There are multiple + samples in DPDK that enum/define terminated with a ``.*MAX.*`` value which is + used by iterators, and arrays holding these values are sized with this +diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h +index c551cf733a..9c990a5593 100644 +--- a/lib/librte_mempool/rte_mempool.h ++++ b/lib/librte_mempool/rte_mempool.h +@@ -112,10 +112,11 @@ struct rte_mempool_objsz {