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 834BF4625C for ; Tue, 18 Feb 2025 13:44:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7E94B402E1; Tue, 18 Feb 2025 13:44:10 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2087.outbound.protection.outlook.com [40.107.237.87]) by mails.dpdk.org (Postfix) with ESMTP id 6BE49402E9 for ; Tue, 18 Feb 2025 13:44:07 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vV1yaCAFk/2ox0GfMobBG3n3P4ICaB5kwTQ/q3n0NHwyonFd7GsLwh7Go1Jc53rIxx66PHCufopbgOfPuSudb/XQnqVzNoZc8S4PUQGrZsVksBIx+FVzi9QWS1b00/kitxZZ2aWDGKTg6BGFcVgMJQPFAPn3TJ0d7Vuk6CBHiIrEjxpxI4VnxK/xUArMhr+u4QDQ4a5Bb28SWIoa2q+lBo+7OkN7ExPbjNPAakFunkTKDThLV1WYoIyCPvcnvM5kilFA7cvsUDkbvwYCAWwb5Ril3+X6w/aTrkAPrTjnFQlOd69W+fABv+woxic9QE58FKrh+brTpCKgF9BWRcKkHw== 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=64wXHAl8t8AaQrJRUBJl/H8dI9o+kYXPAQkkFbR5qbY=; b=xJxak7o4L3shpV8yyGsK2BZBW35GbL0Ovl22wlAXNgyq8iqeCLpev3bHCseYXqT/e4LE7dVIZVFIL8jdONcwOq2DFXeGsxh6v3OdZjyF2PlYjuqjjgFoheXjwkg0sSCbe5shMixrYbWgcDRF4OXGDtwzJfw5F06xia4722TYfUBtgTB0AKapHzpA+br4HkPXAWx9SIdhH1lzNCcBJFONJrDpkNwgzKbHOR55kyswt3y/paRCHwCFRAjY4+j00Iq8+FJ0/wFYHMAo0RGWa4MiQCIMKzj1l62HRAJ3bmJUztdV+GrTY20EELxBEeY1PeU09JB+Ef+nFyAT87GHwEBExQ== 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=64wXHAl8t8AaQrJRUBJl/H8dI9o+kYXPAQkkFbR5qbY=; b=r7AQeU6aYWaPqC1oMsdBI1T435P+rZ5uMsGpsuIr9V4e/KUQXr88Vn++UEkZ83H0FAIx69C/I1QykvY+jhz35Abs3wiCbAAfftivwBCd/lMbupYJTaRT9yjfoHWU9GvGa/LNXOF01GH+G//rxTrypB5KNwgBuBbYeSHODyD22lW1qnmiGPjYY3BN0YX4rM8Vqvsf45XNtB89UvlSe27LGpXrS4U9oGxnpmo9J+HBz4cR/oiRsNX7dFn5QgjmaKUySSYUSlCalcxqIuHFwfJ4Zkz9+wIe47+27vu0863KSSHawDnIDxROeHv+rQL3JFLBcY7sYTHRvCRvfB7Dfd/Dzw== Received: from BYAPR06CA0049.namprd06.prod.outlook.com (2603:10b6:a03:14b::26) by IA0PR12MB7752.namprd12.prod.outlook.com (2603:10b6:208:442::11) 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:44:02 +0000 Received: from SJ1PEPF00002324.namprd03.prod.outlook.com (2603:10b6:a03:14b:cafe::ef) by BYAPR06CA0049.outlook.office365.com (2603:10b6:a03:14b::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.19 via Frontend Transport; Tue, 18 Feb 2025 12:44:02 +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 SJ1PEPF00002324.mail.protection.outlook.com (10.167.242.87) 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:02 +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:52 -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:50 -0800 From: Xueming Li To: Stephen Hemminger CC: , Hemant Agrawal , "dpdk stable" Subject: patch 'net/dpaa2: fix bitmask truncation' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:35:18 +0800 Message-ID: <20250218123523.36836-84-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: SJ1PEPF00002324:EE_|IA0PR12MB7752:EE_ X-MS-Office365-Filtering-Correlation-Id: c569d676-aeb7-496c-d5c1-08dd5019ec59 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?xjOUzIathU3GtYeEL3KR1bcQtobbt97eni0+KMXrrwfsVWYje5SUyl7cGS30?= =?us-ascii?Q?LFf56W1NyH9epI+/unj6wF1ltGgWsmxWMRLjzyXfSUj967lCzCvAtyapI0jR?= =?us-ascii?Q?8e5GwHVdcUVqv8sy76Yt9PeZFcdF6OqhKLXcQLga4SjShakMhSfCnYRBWp58?= =?us-ascii?Q?EbwhdpfcWBlR6TCyxyD7Z/aJS5qqRTJqIqiwdweonGC7EYC2YkxFvvjJcg+P?= =?us-ascii?Q?fpQW7WXy3EAstPRupwYkv0uVgLH5/EW9XlGh5so/CTaJtKmlFksI0m2ypcz1?= =?us-ascii?Q?E3awFbq5RFvQnSFXyEFUr5GZ3VksqUooW0Y3rIM+JMAP4pHhRxg7nuLJQn3d?= =?us-ascii?Q?GcegI2U+OzbL/79eUn6/GWZ1OSQXYqN5hU5cTsbd/pZcAqDUOF285tx1dxvg?= =?us-ascii?Q?U3Kgu0Um3SalEyj5yeY0f3i7wWGpx9UyjeNsx+wn0LSTKv+FtfoP3a15a26b?= =?us-ascii?Q?PhBB84SO1OKL3PKLbiXRXJki5dcA51G/jox18Xpm3ZxzwRGoKoKHRJqufp3p?= =?us-ascii?Q?UWDXQBPcWQx8KL3ZfWmC/YPuiQZeZKYeBMerWfSCR2Jq1xNTr4o+2HBxmcmz?= =?us-ascii?Q?TTjqhLVYp90lO9Ic1lqQnpsQjnMH8SzvRX0aLoUdKY/9vVdBL3rMDVlf0Kvq?= =?us-ascii?Q?3BO4i86kzK+6IPzVZFTAplAITAfqRLqUOkrQ1NezCsUkiIyAMjynVBrPEZjq?= =?us-ascii?Q?fMs2eSy8oJolnPktjoz0D1NC4MFH5l3C412NzSZ84JTbrmBw4eiWzOlS46ll?= =?us-ascii?Q?TshKosiRia1fuWWVwzX881jk6twQm2To+gCiNe18bTuKndLc6kTafetTEYs9?= =?us-ascii?Q?cQAtm/OEVMdirT3p3Moegh2HVCTmDzDgAqnf9Qli/RZm3S4cPkiCpyg6ToeH?= =?us-ascii?Q?xhOsY5NIrTewWodoc1wqziGEvOAk3x9dxA780aL8lxc+qnT6PoaJCUe4gN/5?= =?us-ascii?Q?CmKzfKHdOfe/ngOlxiHwJC4ujK2Mm/QmUXvE5F7cvyVhtCGLYxMZWRjnNa7i?= =?us-ascii?Q?aQGttKTaWxjFa4XooFrIesD4GtuEuRhn5LqrT/w6rBlZ1c78C634s8zNNPyh?= =?us-ascii?Q?LPfuDe3XicYVjuZADQWmNAO9r/8jXUuqQrqZoKcPMdyGzQAKPjfN2X4IVBFz?= =?us-ascii?Q?6twlK//PcYLD8T/RulQUpRcdbg0d6DkmX8+5h9YQfpMrA8EercwlUV3faZtB?= =?us-ascii?Q?ypQmiVUvQjTX84oCesjiuUTs7CwPIztoPEvrmIRWpzcF/jaF4Upy68s69jfh?= =?us-ascii?Q?I2E0yyoTl3OfT+kkMsiiXppCqvs16yss1Bw/5tMVD1VVkhV1czt2ICMzKp1v?= =?us-ascii?Q?hr/l67WqdkmVl78S3rF0aHCz4PHxVN0qYxbkMEyO763rlmLjKAh87gv9IV6H?= =?us-ascii?Q?DLN4jBRZvrDhyJnRKTw+VT67M3XQZhS3diqWQ6DWkDTxLX5O/E7xydsfYRQj?= =?us-ascii?Q?pV+xl/l2xLbplmrtj0b8Xmu4vf9TqXcqbbb89OsdPoEI1Zu/WfCLYNAQ6Eb1?= =?us-ascii?Q?+mE7nDOIQUbUg3I=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)(82310400026)(1800799024)(376014)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:44:02.5724 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c569d676-aeb7-496c-d5c1-08dd5019ec59 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: SJ1PEPF00002324.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7752 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=6fc5a6901a4ee4a9ccb5ce242c20e4fc4b7a0c36 Thanks. Xueming Li --- >From 6fc5a6901a4ee4a9ccb5ce242c20e4fc4b7a0c36 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Feb 2025 08:23:17 -0800 Subject: [PATCH] net/dpaa2: fix bitmask truncation Cc: Xueming Li [ upstream commit e4591c38b50e23fc6ac6b73803e78d49142ecf57 ] 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: 2d3788631862 ("net/dpaa2: support atomic queues") Signed-off-by: Stephen Hemminger Acked-by: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_rxtx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index b64232b88f..f65603aa09 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -923,7 +923,7 @@ dpaa2_dev_process_atomic_event(struct qbman_swp *swp __rte_unused, dqrr_index = qbman_get_dqrr_idx(dq); *dpaa2_seqn(ev->mbuf) = dqrr_index + 1; DPAA2_PER_LCORE_DQRR_SIZE++; - DPAA2_PER_LCORE_DQRR_HELD |= 1 << dqrr_index; + DPAA2_PER_LCORE_DQRR_HELD |= UINT64_C(1) << dqrr_index; DPAA2_PER_LCORE_DQRR_MBUF(dqrr_index) = ev->mbuf; } @@ -1304,7 +1304,7 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) flags[loop] = QBMAN_ENQUEUE_FLAG_DCA | dqrr_index; DPAA2_PER_LCORE_DQRR_SIZE--; - DPAA2_PER_LCORE_DQRR_HELD &= ~(1 << dqrr_index); + DPAA2_PER_LCORE_DQRR_HELD &= ~(UINT64_C(1) << dqrr_index); *dpaa2_seqn(*bufs) = DPAA2_INVALID_MBUF_SEQN; } @@ -1543,7 +1543,7 @@ dpaa2_set_enqueue_descriptor(struct dpaa2_queue *dpaa2_q, dq_idx = *dpaa2_seqn(m) - 1; qbman_eq_desc_set_dca(eqdesc, 1, dq_idx, 0); DPAA2_PER_LCORE_DQRR_SIZE--; - DPAA2_PER_LCORE_DQRR_HELD &= ~(1 << dq_idx); + DPAA2_PER_LCORE_DQRR_HELD &= ~(UINT64_C(1) << dq_idx); } *dpaa2_seqn(m) = DPAA2_INVALID_MBUF_SEQN; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:03.581705839 +0800 +++ 0083-net-dpaa2-fix-bitmask-truncation.patch 2025-02-18 19:39:00.728244030 +0800 @@ -1 +1 @@ -From e4591c38b50e23fc6ac6b73803e78d49142ecf57 Mon Sep 17 00:00:00 2001 +From 6fc5a6901a4ee4a9ccb5ce242c20e4fc4b7a0c36 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e4591c38b50e23fc6ac6b73803e78d49142ecf57 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index bfb5542bbc..cad15d8f75 100644 +index b64232b88f..f65603aa09 100644 @@ -25 +27 @@ -@@ -933,7 +933,7 @@ dpaa2_dev_process_atomic_event(struct qbman_swp *swp __rte_unused, +@@ -923,7 +923,7 @@ dpaa2_dev_process_atomic_event(struct qbman_swp *swp __rte_unused, @@ -34 +36 @@ -@@ -1317,7 +1317,7 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -1304,7 +1304,7 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -43 +45 @@ -@@ -1575,7 +1575,7 @@ dpaa2_set_enqueue_descriptor(struct dpaa2_queue *dpaa2_q, +@@ -1543,7 +1543,7 @@ dpaa2_set_enqueue_descriptor(struct dpaa2_queue *dpaa2_q,