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 0EC434625C for ; Tue, 18 Feb 2025 13:36:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DC94E402A0; Tue, 18 Feb 2025 13:36:13 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2057.outbound.protection.outlook.com [40.107.244.57]) by mails.dpdk.org (Postfix) with ESMTP id 2792F402C4 for ; Tue, 18 Feb 2025 13:36:12 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=o3q2VK1wDlifoQ9rSSazL+k4iKgNAZHRXbtK9HtnxiLWFzP5Tc3HDYWkYHFeYWFQcyjoF1xWxDHBBrTHlsPjl9Dn7awL5cxoFGONaZJAq2bnEc5tLk8S2O5TtQNSpLR8dQNqErVDIR65VyVPoDj3bHTbFVaRGI7prrP2HJ4iTCJa8fDKUggD8xITpXTla+hZUu+yhvuUx87dTNR9dVsCTl9a1nPcTMBotIemhAwCElaIGZ1jPXKeriF4mJkam2OqhxSLv4FUlsaRDnfmABwrliD2rgYWkPLsFJ1wyj8wa0+VflWf6p5dvIwo2adUwxaH//OZFGdDgtidljifjrGXbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=PUONAjNOHCii1XyR6qGSWlkrBH1VEPIUgFH3G4219zA=; b=N7Ik6UYTmy+IIaBIQ275kToXJF3Pksd0OOWDXkSSGNWbNLpaen/KtTgFEZm07L69UZWiCuDvClObhhO86y+el4LsZzJU/rNdO8n91UDMok894fnY21WiIQME9LalYRi3HvOeCtGp6TRSmogcdmuIxV/eZajavmcC+f4WGG/B6YYBgOCqisU4DBKTtnFK96Aov8zV3cf57QjsAUs0oom4EJp+OR8ydxQOLNWesQvRw42q4bik5WFl4rsNS5rcCi/jAjObm2hv1fXR1pCG1Hm6/j1xO15f0Rlm4kn5en5Oq740vMZWC1bRWOM6Q31q5HEB4McR5TD/SpI4JxjApnOstQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=PUONAjNOHCii1XyR6qGSWlkrBH1VEPIUgFH3G4219zA=; b=RV0npY5nl4IG8GwJyIuUivKk5MdwkV+rjt74O4ewKtEHP3tqdMAvovqBDyVLlZFLe1H/uD0TMEtbRnCfFnsrSvJwMtqXMRmQh2bVRbTdhG/KuZTTU40wTSJyB0JSx0Nwc5K4RaxqJOUA13xyGmsXjmXozjkSMIQXmlH1uPq9SYu6Rc81Lx2DQ1Lj7qrah6x6qdpuqIPTCOXDnw9WVZgUeGczSMJnRmeBuH2VgCfoE7iqmqFoSR36c4jv2FcfzaBX/Lqa00VRm2VqN5CT+9AK2nlznCbveDabTZ0PShddBrey9oPpW4J8xWX5EhmFzCRzoLBJwue0o4C8mtdpB/PnxQ== Received: from BN9PR03CA0261.namprd03.prod.outlook.com (2603:10b6:408:ff::26) by SJ2PR12MB7992.namprd12.prod.outlook.com (2603:10b6:a03:4c3::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Tue, 18 Feb 2025 12:36:07 +0000 Received: from BN3PEPF0000B069.namprd21.prod.outlook.com (2603:10b6:408:ff:cafe::17) by BN9PR03CA0261.outlook.office365.com (2603:10b6:408:ff::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.14 via Frontend Transport; Tue, 18 Feb 2025 12:36:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN3PEPF0000B069.mail.protection.outlook.com (10.167.243.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.2 via Frontend Transport; Tue, 18 Feb 2025 12:36:06 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 18 Feb 2025 04:35:53 -0800 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 18 Feb 2025 04:35:50 -0800 From: Xueming Li To: Konstantin Ananyev CC: , Phanendra Vukkisala , =?UTF-8?q?Morten=20Br=C3=B8rup?= , "Stephen Hemminger" , dpdk stable Subject: patch 'test/ring: fix init with custom number of lcores' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:33:56 +0800 Message-ID: <20250218123523.36836-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B069:EE_|SJ2PR12MB7992:EE_ X-MS-Office365-Filtering-Correlation-Id: aa5d81ec-3208-4dff-14cd-08dd5018d0b0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|1800799024|82310400026|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?utf-8?B?bmNLUjN2VXlPZTFZakJsY0FVVHF4TVYweTdWY1lQYnczandNdTdPalNvWkpL?= =?utf-8?B?emhqT0VFVGN0YlNZVzlKZW8wNm9zQWdXZTh2cVVOejkvR3AxU1NzZjdSQzBz?= =?utf-8?B?azE2YVFnSmdBUWdRQTQwN3Y0bVQ1NUdNaXdWV0xhWi8rM2wyNFNuQ0VVNjBM?= =?utf-8?B?RjkxTEZ4TzFoRkV4eksvaG0rbG5DMVpnMm81aTVYWGRzYThqcWpjTlNyWUMw?= =?utf-8?B?eVZYbkJacEEzM3ZpZVRpK0VsdzBGM1dMZksvM3VwQjBkWHJKUjN1M2tlZE1y?= =?utf-8?B?YUU5L3VOZHp2VlhQYVp1L1pDbDlSbGRxWWttbHkwZlBSdklFaFM1QWIvYkFC?= =?utf-8?B?ZVBlRWZWaVhjSndFakdOdDRlWUVwaWlwbm81eElWajJTZ1VzYU1UN1ZlbWZC?= =?utf-8?B?VXZ4ZWZON0w5a3kyLzdSb1hpWUxZWCszVWNIeFQ4YWQweXdPWFpKZlpoNEhF?= =?utf-8?B?WWlQYXFwMWgvcllNUEE2WU5jZ0RSQTZkaHVpc0NjSUkyLzZRSDVRU2poMTdq?= =?utf-8?B?YTFFWFVqeG4rK2JjM1hUNEVKdnJsL2puV1o4UDNGN01xeVIwSS8vSWVpeXFj?= =?utf-8?B?djRJNnZlK1lDT0N5eVBSd2VWY1NwUXBJZ3hrUXlubnJSVUxPdkZpaHBjeitO?= =?utf-8?B?TGxpbWJlZ1k2SUh5aG15SmNFWWNrUzVJNS9RQkI3d2ljcUhnZVRHdU1QOG1k?= =?utf-8?B?aUpPS3YxOWlHNldmWjVqUmhLalY0Rm40K3NYU0FXaU0rVnJlOGpMcE44TmUy?= =?utf-8?B?Rnp0ODZxZUdodktEZWNiNUlXcWNvRVRBT2xvNFNSRU5FSEI2MkdqM3E4U0hG?= =?utf-8?B?WVBjZXlaWjBYZWVMcHZWQ2FvaDVrSWRFSzVBN3VZSjkyd0NtQlhqTXJCbDJH?= =?utf-8?B?Ym45eW9WK2ZTL3Z6c2FxWFZQWnZudnhGRHpnblNlSnJzSDVRdGtVYS9ZdE8v?= =?utf-8?B?My9RZXNKcHl0bWRxSGl5cXY1NGFxckl2NDdFellYdFg5ZXVsUUpvQTNhSGhx?= =?utf-8?B?a1ZicHg2K0xUbG1YVVVVYzZiMGtDdEtZMEY1VnBqcEt4RnBaZ3pIdWtlcDFm?= =?utf-8?B?Y2ZwWWhuY2orN3Jnb2FtZmY2YlBaSXE1VWRiaUZKbi9TN0tGWld4N1VtdVRP?= =?utf-8?B?Ylp6M1VPLzJmdzJObTlOY0FGbTkzTFVGVzROTDY0eUJ4bC9YL05EYUxUbW1P?= =?utf-8?B?NGVvZkMrV0ZhTTcxWXo5R0JodXF3VlZOYzVhNzlzR0JwZXoxSFV1VHdBTy9m?= =?utf-8?B?MHkzTEw2OS9GUkxhY09POU8xdzZTUnRpWGtpcmoweGNSNEl4NFFydHVna05v?= =?utf-8?B?a29yUU9nR05rR1VQc3l4WjY4azRKVGJJaFlxbVJ1Z013R1dtTDRkVkNodlE4?= =?utf-8?B?cHh3VjVvVXBrb281N3pseEx2Q2ZQc3RVdXk1SjY2RXozVVB2L3hZcTV1VndZ?= =?utf-8?B?MER5cDQzTFpraEs2bWpVN2JqOWZ4Q29NTUZuV2ZEN2RvWHZZKzZsSXBZaEd6?= =?utf-8?B?T05IWVVPK0VPTTJaMlNOMDlGSDFZRlVzd0dUWU1LMVdzWi9ucjhaNHpoRmRx?= =?utf-8?B?MGp2bFJqaHNwK1ZOWkJSVitYSWFVSUxZWGF6TkRGUWMrVmhnTGZ3d1BQekZT?= =?utf-8?B?dG8yVHBvMFJVNkdMWjVqMU0zaTNjNitWK1VoSkVkQjIxSzhNNldZVkJtZmpq?= =?utf-8?B?eTAva0wxTmh6ZkdSK24vVzJLbDdIYjU0ZUFQTjdzRlRZZFRJcWFZdnhPN1FR?= =?utf-8?B?eEt3L0oyNTZNSjREN0Rxa1dVQW5UK3k1SXBwWWN5czhlUTUyUWYweGxhUkN2?= =?utf-8?B?VFBrbUFvbzNFc0MrVm9hNmpkZFR5U3Z0M2ZXZzFDU3NUcFRZQ2JrbWlqSjNx?= =?utf-8?B?VzVreWVhTXN3U1hvaXdZdGExQktYb3RFalFERTUwRE5NZE5vUURkb013WUNm?= =?utf-8?B?OHhWOURIbW5TSytkYXNKV1d4NDhIMW5jMnVSOUhpVnF0c1gzdXBmeGpIMFRt?= =?utf-8?Q?RM6/98oLLBzbCG0LUuKbZKPFZ181ho=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(376014)(1800799024)(82310400026)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:36:06.4303 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aa5d81ec-3208-4dff-14cd-08dd5018d0b0 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN3PEPF0000B069.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7992 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 Hi, FYI, your patch has been queued to stable release 23.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=8c0b8af3bd76eb9d19ade4503b72a901b6e9780b Thanks. Xueming Li --- >From 8c0b8af3bd76eb9d19ade4503b72a901b6e9780b Mon Sep 17 00:00:00 2001 From: Konstantin Ananyev Date: Fri, 6 Dec 2024 13:35:54 -0500 Subject: [PATCH] test/ring: fix init with custom number of lcores MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 2cf3a8d35d2db1cee1523e6e9ef5553432fbf56f ] ring_stress_autotest fails to initialize the ring when RTE_MAX_LCORE value is not a number of 2. There is a flaw in calculation required number of elements in the ring. Fix it by aligning number of elements to next power of 2. Fixes: bf28df24e915 ("test/ring: add contention stress test") Reported-by: Phanendra Vukkisala Signed-off-by: Konstantin Ananyev Acked-by: Morten Brørup Acked-by: Stephen Hemminger --- app/test/test_ring_stress_impl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test/test_ring_stress_impl.h b/app/test/test_ring_stress_impl.h index 62f046a91a..373091957b 100644 --- a/app/test/test_ring_stress_impl.h +++ b/app/test/test_ring_stress_impl.h @@ -295,7 +295,7 @@ mt1_init(struct rte_ring **rng, void **data, uint32_t num) *data = elm; /* alloc ring */ - nr = 2 * num; + nr = rte_align32pow2(2 * num); sz = rte_ring_get_memsize(nr); r = rte_zmalloc(NULL, sz, __alignof__(*r)); if (r == NULL) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:00.800358318 +0800 +++ 0001-test-ring-fix-init-with-custom-number-of-lcores.patch 2025-02-18 19:39:00.388244089 +0800 @@ -1 +1 @@ -From 2cf3a8d35d2db1cee1523e6e9ef5553432fbf56f Mon Sep 17 00:00:00 2001 +From 8c0b8af3bd76eb9d19ade4503b72a901b6e9780b Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 2cf3a8d35d2db1cee1523e6e9ef5553432fbf56f ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index 8b0bfb11fe..ee5274aeef 100644 +index 62f046a91a..373091957b 100644 @@ -29 +31 @@ -@@ -297,7 +297,7 @@ mt1_init(struct rte_ring **rng, void **data, uint32_t num) +@@ -295,7 +295,7 @@ mt1_init(struct rte_ring **rng, void **data, uint32_t num) @@ -36 +38 @@ - r = rte_zmalloc(NULL, sz, alignof(typeof(*r))); + r = rte_zmalloc(NULL, sz, __alignof__(*r));