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 8D0924625C for ; Tue, 18 Feb 2025 13:43:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 88208402A0; Tue, 18 Feb 2025 13:43:43 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2071.outbound.protection.outlook.com [40.107.220.71]) by mails.dpdk.org (Postfix) with ESMTP id 53747402A0 for ; Tue, 18 Feb 2025 13:43:42 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cfP6WrFklxyY4gpVHzL76Dka+ORdUJERwmbhNB/lDOrbox48o18xzf2RVE6tu29E/R4JnzHmOUNmjhtJIItoyO+MsoERECVnthlzsds1waPNb4QC8eUeKghyumjWKR8iVbIXI9AF2EiwBIe0Xtbf0wkGQK9VLvrMtdrlH+6OXsO8kWEK+gCBYhDiqrTBsjC7YYvGErR69QDjGpBmBEE1FOcC3nEYNh3DxSj5W7mqZS2htzzjgelBld4fnZjiiTN/SrW5BhhlVBp/aGDgnp57FiVspX/HaxtennVGsyhzBfnaZt36gvEG8u8/6fw23WVSBtKDyvU/RjJku1djymn8fQ== 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=c6PnkTFR4ijxZL6ZAGW2kn3lHIMvi+HIsDi7uJi8Jhg=; b=aJT26XhWnSfDn3NsAWRIFmd3DygaIWQ4K6ahpX9EHeHQvWhAU5U5tBx+YnHe3AC9Ap8NtfnE3NzJLB8WiFcI0RioQSppRons9HWpqda+hP/7ANUHkaS3cxaC1joEas5u+2OTG5KNqY812vrTGoez4wJNhDgdElhh0tzCABwOkbJbhsZfmERg+L4jDb0FswgBCmOgXmrHDBp9fPuhVep3DmK0W9BQvVMI0MoEkt6qD6taT4WOeRnAJYBV7Casmd/YpnQ+NjCpJVZTZFyxB2zdXyNTQegOkQCsMKXqjbYzXyaGml7o/OQVLCvkkvzAFj5c4m8AA6rLYThVym3OJGGIvQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=c6PnkTFR4ijxZL6ZAGW2kn3lHIMvi+HIsDi7uJi8Jhg=; b=SRRInqx04DBZ+tCZs5+42QWNyY8TRvQSqkg6JLIAw/vOvJGwuO87fqRh+ABEW68wQYyGS3snvby2cuHjU4AwKhoAUpqJROFPerGD4UQokpu9ELkJzQ4MTKE+wrMV8jXizI6rWMdGv4QKgNspDen6JGol5zQKlupe8ScxwpbEu6Kg8cj16lA7vlprAki+ghVgZ1bzWrSz2WqN6tG0omJ0qweb3fD9ZIGBZeckVGGQLIbzk/ZQNPuMwkwKjOBtVfWtE5vqZByu0PqPF3Z8+Iy4dk50N4SFPWJwUTD6w3peTR/e40e8D5rKW814m4YBJXWCZW1cNe9SNCs/SJmz+HAqBg== Received: from PH7PR17CA0028.namprd17.prod.outlook.com (2603:10b6:510:323::8) by CY5PR12MB6034.namprd12.prod.outlook.com (2603:10b6:930:2e::12) 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:43:38 +0000 Received: from SA2PEPF000015C9.namprd03.prod.outlook.com (2603:10b6:510:323:cafe::51) by PH7PR17CA0028.outlook.office365.com (2603:10b6:510:323::8) 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:43:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF000015C9.mail.protection.outlook.com (10.167.241.199) 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:43:38 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) 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:26 -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:24 -0800 From: Xueming Li To: Stephen Hemminger CC: , Hemant Agrawal , "dpdk stable" Subject: patch 'crypto/dpaa2_sec: fix bitmask truncation' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:35:14 +0800 Message-ID: <20250218123523.36836-80-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: SA2PEPF000015C9:EE_|CY5PR12MB6034:EE_ X-MS-Office365-Filtering-Correlation-Id: b4f252b3-94e4-4254-0c75-08dd5019ddda 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?0a2nn4hin9CuAcpGbtNsnxJp9YHhu3KhpK8eLMs3MmwCwSoyB/nTYulxRpFw?= =?us-ascii?Q?NeK13YlqOJvAzn6DY1em867yS1rlbDz06OyXNalTJRAjjv+9YSrxxBNz1P7w?= =?us-ascii?Q?4TmXyxi6FDiLGQdtmQxZ0F1344ETonIwavmrdx/v/HD+pDSoA7NxsBS1wkSl?= =?us-ascii?Q?gD8oafdMXFGGZMeYGSLErAOZ7FWXkeFb9pN3GOjyrhXOK/WoPinRPIXq+sQn?= =?us-ascii?Q?wlG5OgcpjroRsOXetcWT8R4IcbWJSM6Sck2DsDwjhsp44x8FEBGmahiYtWMr?= =?us-ascii?Q?HyDFkWvBKd1JODjX8v63rMiXrh9knTn9OIRnQMWr5UKY+9n9kCCkmcUTrgRb?= =?us-ascii?Q?JJdpxI2usMzi1l/ufEsaJeFKdUuWMvSToX7+tHWujSJRVCmEDDfWxu9by0eB?= =?us-ascii?Q?EIXVewRTIlIF+WFSBON7b2It0He5XIGTSZLtQqF+SgcHg3D3HgnEsOJYVrfF?= =?us-ascii?Q?tCi6aEKXPGv8GxyYLC/grBunt8yjbHGczq7KpqmSywk/sp3fvJ/ouGWe+Uz6?= =?us-ascii?Q?CTDsDKjb93FrKQo+j0wnAZmNJYqiuQV5IixrvPvhLLaL0LWkerPVzlbr6B1j?= =?us-ascii?Q?0vkvDASOCON1d77XILlkMpsWiBEeGIDjamAHXPo/SE0sIrCXKhYogUlvIIc7?= =?us-ascii?Q?PFUpSx0ohHflh+CAmV1GajgK6tK512/YHjlzGTHx0YbfMq5ti4SciZipIp9r?= =?us-ascii?Q?7hx5MVDj0O+ECfrMz/BjaNMqAyk5VD+kyYKTWvpgG0Dsj73Yvfr4ik2/CI8/?= =?us-ascii?Q?g0fsGa4wW1JqrfVd8ZTR54uTfkZhnU3iswOcWE3jp7L1JAbgAPQ/B73Z/Hly?= =?us-ascii?Q?kP7/Y/jTvIX0uswrrm2QhYtvuvJY/nfK9pD2gjTBvJ1aIXYCuAu31ouzJh93?= =?us-ascii?Q?wvNt96texCC782WZXp4nkMXqKJH9VUjSCKXmmSbkNqOcwff17OakB9GJF4oa?= =?us-ascii?Q?/NDRYv1FNpzda+7Y/KoflCfYLNhoFc1xHkIyiM/q7jZjerg9Rv+AxDOZrSiO?= =?us-ascii?Q?lafopgUobILyH0qGMOU4/dDJgKaW9eBCdABuPnWa8+gG0a2I/aBVd4pFLFps?= =?us-ascii?Q?ER6oLNTfnhFYZIzMTGCyLaoIpchk7afcWrdqh4Yv+QNggNi0OFf7xZzSl7ST?= =?us-ascii?Q?bp36UfTUJQh2s+oBhAfJDc7CqRGpolpLRUBqRwZSLiyxydsix4GseKU205TL?= =?us-ascii?Q?MfMT/GYP61YrY7M391CBR3mD/4XBlguAlQsbzCDxF1+nKjVDPGZnZo/q/tC8?= =?us-ascii?Q?yv443qxLslAXKDWVgOuQspOwGSqEgW3/OwoO+4PSBDCtA1m9OTTyH/vr6j/N?= =?us-ascii?Q?2yblqETHWe+SOK6I7YHeAhDMJOS+E6J0vk+B2dbYvRLh3oDely/3l61+UuGe?= =?us-ascii?Q?BK1cySpHtYIHSP0fZoRyQpPBn3XrbX9grAwawxSQb+AQE7xSHIGhijwqhxwT?= =?us-ascii?Q?C5zp/wL2DgI8mAS0rpGFNAKhaiZBYuO9fReE2H1+kdBqkezx3j7yE70kNdFx?= =?us-ascii?Q?9BCp78I/nBnLgnk=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.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:43:38.1218 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b4f252b3-94e4-4254-0c75-08dd5019ddda 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF000015C9.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6034 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=ea50d3b95bb31fb24e608b3c9bb4811c7c5b2f54 Thanks. Xueming Li --- >From ea50d3b95bb31fb24e608b3c9bb4811c7c5b2f54 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Feb 2025 08:23:13 -0800 Subject: [PATCH] crypto/dpaa2_sec: fix bitmask truncation Cc: Xueming Li [ upstream commit 013ddc85bff5fdb85eb6006315ebdaa0c12eeece ] 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: a77db24643b7 ("crypto/dpaa2_sec: support atomic queues") Signed-off-by: Stephen Hemminger Acked-by: Hemant Agrawal --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index bd5590c02d..b9826c4fcf 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -1461,8 +1461,8 @@ dpaa2_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, if (*dpaa2_seqn((*ops)->sym->m_src)) { if (*dpaa2_seqn((*ops)->sym->m_src) & QBMAN_ENQUEUE_FLAG_DCA) { DPAA2_PER_LCORE_DQRR_SIZE--; - DPAA2_PER_LCORE_DQRR_HELD &= ~(1 << - *dpaa2_seqn((*ops)->sym->m_src) & + DPAA2_PER_LCORE_DQRR_HELD &= ~(UINT64_C(1) << + *dpaa2_seqn((*ops)->sym->m_src) & QBMAN_EQCR_DCA_IDXMASK); } flags[loop] = *dpaa2_seqn((*ops)->sym->m_src); @@ -1751,7 +1751,7 @@ dpaa2_sec_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; } @@ -4051,7 +4051,7 @@ dpaa2_sec_process_atomic_event(struct qbman_swp *swp __rte_unused, dqrr_index = qbman_get_dqrr_idx(dq); *dpaa2_seqn(crypto_op->sym->m_src) = 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_PER_LCORE_DQRR_MBUF(dqrr_index) = crypto_op->sym->m_src; ev->event_ptr = crypto_op; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:03.449900662 +0800 +++ 0079-crypto-dpaa2_sec-fix-bitmask-truncation.patch 2025-02-18 19:39:00.718244032 +0800 @@ -1 +1 @@ -From 013ddc85bff5fdb85eb6006315ebdaa0c12eeece Mon Sep 17 00:00:00 2001 +From ea50d3b95bb31fb24e608b3c9bb4811c7c5b2f54 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 013ddc85bff5fdb85eb6006315ebdaa0c12eeece ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index ec6577f64c..7ad8fd47dd 100644 +index bd5590c02d..b9826c4fcf 100644 @@ -24 +26 @@ -@@ -1491,8 +1491,8 @@ dpaa2_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, +@@ -1461,8 +1461,8 @@ dpaa2_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, @@ -35 +37 @@ -@@ -1772,7 +1772,7 @@ dpaa2_sec_set_enqueue_descriptor(struct dpaa2_queue *dpaa2_q, +@@ -1751,7 +1751,7 @@ dpaa2_sec_set_enqueue_descriptor(struct dpaa2_queue *dpaa2_q, @@ -44 +46 @@ -@@ -4055,7 +4055,7 @@ dpaa2_sec_process_atomic_event(struct qbman_swp *swp __rte_unused, +@@ -4051,7 +4051,7 @@ dpaa2_sec_process_atomic_event(struct qbman_swp *swp __rte_unused,