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 3B2AC4625C for ; Tue, 18 Feb 2025 13:44:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2113E402E1; Tue, 18 Feb 2025 13:44:07 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2065.outbound.protection.outlook.com [40.107.100.65]) by mails.dpdk.org (Postfix) with ESMTP id CFCB0402E1 for ; Tue, 18 Feb 2025 13:44:04 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=sW3OOD9FHnv9/c4GAc4Tg2/fcj7RuvjuDjH5HzIG9rg9KBOljB7FTtn5s+ZShANm9LZWWlwBYORNEX737oJC3KDNMHz1JkhuoBSRi7HR4BXdcNE7pR4cpiYkmarzGOuj0cBwBqdLLcIeu7+d0yImtbokO4iLcLfbAIXNcOlRiTFx95sUwytCP+3dsWKEHwdfimfTB9l62OoXNHL1SxAJI/u/j0AvanJToEwYmN17xqpZlgFKrMkWyAs6yqCspNJjseP0kHR3j/vG53x8ijo9pRcmGYmllC0NtpiedGUcQhES2tMC68/veEFxIET91kk1mDWE+pT+2f5zy5L94CiXMg== 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=7k7hj96VveJVace4CUlGp9RePPIjoo4vols5TQ9STRc=; b=iLPDj0W5nbt5c8tCnVnyuB3avLgsKPMBg9FONGsQZilcfFYUSTIPPUnT/lijwlUr+RA9EdyIJ3VTECPV2B9mWdliIHOV37WbyjOKabsIUlJFsAL7TnaZ8S1fUetg9mJIe1ob2SL8Xj8QOPZPEbLzxknic8OInBpm8jH431zhhaQttn7LFipoe7NXs7yEs+QV6z/zpn3QvrR4JSjV2QwchE3gqhfwJSo6mSkd5ugRVm6lTg2lhriw7NB+dQH0GlZebRFaMXdgJfUXAitENHdNM82MEUCwxni/lJWw5XlN2Y5/DlYOYcA3YzcqoX6r2wIAamNCNi/ZUWPTaNAYYZtFvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.org 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=7k7hj96VveJVace4CUlGp9RePPIjoo4vols5TQ9STRc=; b=WW2vqKtsFMhqQ764fmaJXix0NpirRdFJx9GJAq3QkpvXMLn0fvLg6iiql11TOJdxVSzt8dldXtbjRhBqStx7mZtZJd55nATi1FSMn0BlLdufzI83DgZfPc5EgnqEUN04YzcGISsA/jV/QA8BpH236b6OITPHJ6BdwqgUXtt520tFOagg3h4ExMtcpL0evHfzxTABSeeAumPiv4D2ma9DWnexkyfFdMHl3/KI5HvjsrNsTV9cYYvA/wl3pCitHyMbeoqMfEtos7Mnz4UX/bnjIker2R2cTrse3hUcPWEWHAqOTDUJhoMngL/pe9BxiTK759C8RSivdqPt+91dNe3KYg== Received: from SJ0PR03CA0094.namprd03.prod.outlook.com (2603:10b6:a03:333::9) by CH3PR12MB8726.namprd12.prod.outlook.com (2603:10b6:610:17b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Tue, 18 Feb 2025 12:44:00 +0000 Received: from SJ1PEPF00002321.namprd03.prod.outlook.com (2603:10b6:a03:333:cafe::30) by SJ0PR03CA0094.outlook.office365.com (2603:10b6:a03:333::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.18 via Frontend Transport; Tue, 18 Feb 2025 12:44:00 +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 SJ1PEPF00002321.mail.protection.outlook.com (10.167.242.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:44:00 +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:43:50 -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:43:48 -0800 From: Xueming Li To: Stephen Hemminger CC: , Hemant Agrawal , "dpdk stable" Subject: patch 'net/dpaa: fix bitmask truncation' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:35:17 +0800 Message-ID: <20250218123523.36836-83-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-Transfer-Encoding: 8bit Content-Type: text/plain 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: SJ1PEPF00002321:EE_|CH3PR12MB8726:EE_ X-MS-Office365-Filtering-Correlation-Id: 84ef9543-5c29-47a5-9b98-08dd5019ead2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|1800799024|36860700013|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?IKzvpT4U/i2AITctve9Yxai7c1UwIsT30OTlPWWbSg/IeghZwHc/u4CqFZwv?= =?us-ascii?Q?O15HgI90jFy85fvm2xmuJN7nKp2kzH/gbIlODDLf+tMdf0JCa4atvd3Hrf76?= =?us-ascii?Q?COihZ1OeG/pW5VYYfogCJKVOctJMcEiCyAgIBG4NXmEo+GSoyt7Hwg17PhC2?= =?us-ascii?Q?XJRLmrOkKOcPLzIu+4q5ihOoPGXcHTi2yTqbP6b3T4GInLD2ngtNmxhfO17f?= =?us-ascii?Q?FWvCtUwK0uOCFaQrgHZsXz+G91CxFPCnHB/PeoUtlYiANuekTMzRu6nt4PQm?= =?us-ascii?Q?9HMXFgyx6pwpaS8IvjP8/XyA2rbBUzxE1HBImDAOmQKEjbXqo7sWw3agT6yK?= =?us-ascii?Q?vo8V507PU3PxsxOb6agNVP/Xa9y7cdnR8soupceXqnpzUAe4OFgxTeBr52Vm?= =?us-ascii?Q?lyc5vuMHRj9AO/v/nETFwUAEe7+1YQeoEqJ4gUYd9lv7e/oe63obagd0Q7gp?= =?us-ascii?Q?kyVIIcdn3Q2JuX7q3JXiTg4prTnjmM2aCgkaYGUexSsgW8+rdi/J/p/7cAZQ?= =?us-ascii?Q?21YamV3UT5AO8Ffcn9QN6nD1gDqu+ZMGoKRjV9oVaVzmcc1gVhR9xN/X+zJB?= =?us-ascii?Q?tJ3YHs1yAUVGH9bWaHXlGLLkxQl8La2cjm2I+Gd9y2Flg5Ev9/emLCCytRxa?= =?us-ascii?Q?YPdg6IX41hwE2wgEIg4dPp9EFaf3Q//66lvAf9ScZBCxv/vZvajkOQQwpDsv?= =?us-ascii?Q?WQtjLm5mRdaulaWV02AAeMKAfstWP7OYn+Yqs31HsgZvPE3NLTWkOVm9Z2IA?= =?us-ascii?Q?XLVFsDPnYMftLPUwkg1pCHJGXWMi4pNsnha+zXbMPolKLwGICE8Y3gLKH5qa?= =?us-ascii?Q?2p0yO+ymiqJI9WB2tDKDdE6Nk7oUCdrt9+TWD0DA3kFiE8Wh/dPROGCS0TM6?= =?us-ascii?Q?VmAtlSgJynz5WjbGAu7mdv9beZHt+mri7Px1GYlmIH/X9xpXcBY1+FNixTOI?= =?us-ascii?Q?5yHeF+dGUISTuQHgkRZBgz/EthMfcOtOa+rqUXNpK1/yWYEKa5YK9DDPP4y9?= =?us-ascii?Q?sZO9z444Q35mnMx1qODQe3Mkb1774jw6DkpoOY3xS1bf7S7UAiWPFROlGBPh?= =?us-ascii?Q?lVhMahGDaAoFbKvBCfZ9dN9QvSNQs3lcCtaHQjbWEdOdPvHm1GMrGtsThsrT?= =?us-ascii?Q?qggeyImlHrXz7umLYzfbsHz/0fXPRn8At2ZCFUxHrEbRVkq+qOC8dPWS4iSX?= =?us-ascii?Q?XSLW+ne+iuq+RRnUQB7piE2B5g+rZRa6US/MUIxkrqUS5YYjtlJmm9RUntii?= =?us-ascii?Q?CTTBPF7LIqyoLgrnG9oZ5+M4AevHSVpqA5P8X0BBIcgeXZWmSrkLas6LmYbP?= =?us-ascii?Q?SPq5pXqEsZjVZkejYIUHCyPY8cHSpOyUf7EL8pBNq7YQrCJx67JTPG4H+5UJ?= =?us-ascii?Q?ya41DUpGExkIbR/8c/4z90VitE5ufZhGHfUL6+s6w44QhmVKX6cV4GouOq9/?= =?us-ascii?Q?X2tRb9MlJ50eHMhKRbZ0P5xDrz+Krz6i9J0y3CJ76wG1NvHrByjapcXOGics?= =?us-ascii?Q?ZJsc28HmSKdJ58Q=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)(82310400026)(376014)(1800799024)(36860700013)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:44:00.0241 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 84ef9543-5c29-47a5-9b98-08dd5019ead2 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: SJ1PEPF00002321.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8726 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=e32bf2b78128db48cfff0aa83e18a301e649ce5a Thanks. Xueming Li --- >From e32bf2b78128db48cfff0aa83e18a301e649ce5a Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Feb 2025 08:23:16 -0800 Subject: [PATCH] net/dpaa: fix bitmask truncation Cc: Xueming Li [ upstream commit 8f64c187ad8e4e0b953439b2ce92d8573721eda3 ] The dqrr_held mask is 64 bit but updates were getting truncated because 1 is of type int (32 bit) and the result shift of int is of type int (32 bit); therefore any value >= 32 would get truncated. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Fixes: 5e7455931442 ("net/dpaa: support Rx queue configurations with eventdev") Signed-off-by: Stephen Hemminger Acked-by: Hemant Agrawal --- drivers/net/dpaa/dpaa_rxtx.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index 018d55bbdc..31412c0715 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -683,7 +683,7 @@ dpaa_rx_cb_atomic(void *event, /* Save active dqrr entries */ index = DQRR_PTR2IDX(dqrr); DPAA_PER_LCORE_DQRR_SIZE++; - DPAA_PER_LCORE_DQRR_HELD |= 1 << index; + DPAA_PER_LCORE_DQRR_HELD |= UINT64_C(1) << index; DPAA_PER_LCORE_DQRR_MBUF(index) = mbuf; ev->impl_opaque = index + 1; *dpaa_seqn(mbuf) = (uint32_t)index + 1; @@ -1108,13 +1108,12 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) seqn = *dpaa_seqn(mbuf); if (seqn != DPAA_INVALID_MBUF_SEQN) { index = seqn - 1; - if (DPAA_PER_LCORE_DQRR_HELD & (1 << index)) { + if (DPAA_PER_LCORE_DQRR_HELD & (UINT64_C(1) << index)) { flags[loop] = ((index & QM_EQCR_DCA_IDXMASK) << 8); flags[loop] |= QMAN_ENQUEUE_FLAG_DCA; DPAA_PER_LCORE_DQRR_SIZE--; - DPAA_PER_LCORE_DQRR_HELD &= - ~(1 << index); + DPAA_PER_LCORE_DQRR_HELD &= ~(UINT64_C(1) << index); } } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:03.549323745 +0800 +++ 0082-net-dpaa-fix-bitmask-truncation.patch 2025-02-18 19:39:00.728244030 +0800 @@ -1 +1 @@ -From 8f64c187ad8e4e0b953439b2ce92d8573721eda3 Mon Sep 17 00:00:00 2001 +From e32bf2b78128db48cfff0aa83e18a301e649ce5a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8f64c187ad8e4e0b953439b2ce92d8573721eda3 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 247e7b92ba..05bd73becf 100644 +index 018d55bbdc..31412c0715 100644 @@ -25 +27 @@ -@@ -842,7 +842,7 @@ dpaa_rx_cb_atomic(void *event, +@@ -683,7 +683,7 @@ dpaa_rx_cb_atomic(void *event, @@ -34 +36 @@ -@@ -1338,13 +1338,12 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) +@@ -1108,13 +1108,12 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)