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 6A14B4625C for ; Tue, 18 Feb 2025 13:44:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 622FD402E9; Tue, 18 Feb 2025 13:44:08 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2078.outbound.protection.outlook.com [40.107.243.78]) by mails.dpdk.org (Postfix) with ESMTP id A9E11402A0 for ; Tue, 18 Feb 2025 13:44:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=x7oWnQkSrRJHrc5iRdNJUG1vjJ7TVcAeS/SZaIiNW9vP7Xpqg3bOyE6iXL6Wo7BvID4sVp8w7/UkaFUY6THd4YAP2bnIWqLsBVExv6emPCUQNxA4mtgy0M4+AZs7fO0wYBTdjOdxub8ACSyoF17dcGgVvRoon+p/Q4tU24Gc7gBNF8CwD9/MjxJKwBlmxWBILz1ZpW1N09rMuHUotcnYpNP9R4Gfd8LXfZeyEb6FyDj4t9d/ZFkEvdmriVieQ/g2rNEeJhzvIKD6iGJxKMx5Qui5TBOunyNHwVhnW04+BUaLDBjFXDqzuf78iYhU55S8co941UFppYHgWTgdv3fMpg== 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=1B7AbMyObWFeh+f4diR5aI038ZegcnHYthSQPt2/oiw=; b=G2ykzkoN7PSt2G0liJGXMEAxM9bBewj8AsWLurKGfelVlyG7cWrl9bQVWNZOi/ObNSX9k5cmEgkp2iuWi8A0g7Tlud1ccGdREvcModE1MfHKjICEuB1Lztd1VlNA8e6A2Ww1iN4nenB5Mnl7tp0NPNkJERcDHdU0zyEQxP4eLe8u+vVDsIPxqnzWAGyq55DKEneHT6mbNgiOw67meNbXYWuBEEXRO+TDZ8a0AOraKOqBc73h3hU81CM32RoNZfQe4fvkcdKqbZKbgrfzJjJGX9jXKtZ5yGVmLyburmxp+dhESGTGdhoD5HBwiTMX7RC3IIMeljxZG0UxnWXTAVSeVg== 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=1B7AbMyObWFeh+f4diR5aI038ZegcnHYthSQPt2/oiw=; b=auE3uQRCHPsiMMck9HPAu4/yusT/8SKfR9Z7WX2Zut3M/CBrzi373vSsoDkhYPVGXNsHflk2Xp2z7X751j7d15hh00mdO3z+bA5Erb1jXljOPy7HMbrJuoGF+lHPa7Yn5npNYpG2KdUHS/AtQF1HX/ervSR68TDsyP+VcnEUilRbueTH3ZMU8t/nBwZEykT9vyRMMP73x1kFa5uuNaDTmlekc0mijXQqE2Qx+BDwI+eW4jwIzDw3fwEw7d4UH1Epjo3ELoSK8vjoxc2v1pGwfSXqmoRNqQIgP2r8HClDZz9xOSg6p/TzHDKfJ1xI1BwnXTTU6nobTegGUpGu+BIC3A== Received: from PH7PR17CA0036.namprd17.prod.outlook.com (2603:10b6:510:323::20) by MW4PR12MB7288.namprd12.prod.outlook.com (2603:10b6:303:223::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.16; Tue, 18 Feb 2025 12:43:59 +0000 Received: from SA2PEPF000015CB.namprd03.prod.outlook.com (2603:10b6:510:323:cafe::df) by PH7PR17CA0036.outlook.office365.com (2603:10b6:510:323::20) 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:43:58 +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 SA2PEPF000015CB.mail.protection.outlook.com (10.167.241.201) 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:58 +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:46 -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:44 -0800 From: Xueming Li To: Stephen Hemminger CC: , Hemant Agrawal , "dpdk stable" Subject: patch 'crypto/dpaa_sec: fix bitmask truncation' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:35:15 +0800 Message-ID: <20250218123523.36836-81-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: SA2PEPF000015CB:EE_|MW4PR12MB7288:EE_ X-MS-Office365-Filtering-Correlation-Id: 92e98a3d-aec5-47c0-b04e-08dd5019ea16 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|36860700013|1800799024|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Yda4PpDYMCWkHFmr28h3j/QHRpEEqvTNnd6+XE0B+Z8yLlBBSajqWIDDtNFP?= =?us-ascii?Q?XsEjf5RSjRsx2/D3hNCNk7xIHmk6jJBrglgz+pe0Juy7tt7PXPGYBznWDYWj?= =?us-ascii?Q?A7nVdUIWo2Mr2Ss8HAS6dqDULJiqpY452uEy9Ays0527/m+nuZxQ/FjZPDSv?= =?us-ascii?Q?MINhDpaXtJ9mQD0w7J5bXjyGXSJNFjO0D0OFMHLclRxnviyYKPDSj0rrd5eF?= =?us-ascii?Q?k2y2YWs3LIePSNy+xz4ffNjOueQ/d9zYKFtsdjTpWYC4Md0egFOEc4L5jKZe?= =?us-ascii?Q?tH6AWdRnST+DXib8LW0qfVQ+Pd7HEY8SJJ7Sv7k9KYc1QEvttXmi7ufmNHWY?= =?us-ascii?Q?NpXhYE1ey2dEInWPY973yD0us36nyXWcd6p7MGFaRCr/hpFEI6CMqr35vl4z?= =?us-ascii?Q?NRBOPPWXj0qVob11vBQjEtVT3jPpBBvcRawMupjgiDTjM244+ULx02xGoACD?= =?us-ascii?Q?VyIVCHVwuIEc/ulW8dyvYMtC72J97Y1iYGrbI6ZsTBbkRYRFS+X/hgUXR4HU?= =?us-ascii?Q?aHDYcsPRdn5O29X9QeDeCLafI3JOhs0LeDVOL4UReJf7TVO+MB7H65gTA5t5?= =?us-ascii?Q?51JrkNiU8/+urAQAKNp/tbzg7YvPlt7AEu3B7zo3xpiQRCA3RU/stanqFn6+?= =?us-ascii?Q?zdv1obSrbkJNY2ZeEgCn5+5iCFKPCw4xFFgUUG6QGicaD6x1GG8Rp3tioXnK?= =?us-ascii?Q?xWlQHW0DpSt5A4HU8zWCmR91hyGrBUw1nnCG77dJcRc76PAHfQntNhX9UNFK?= =?us-ascii?Q?aQsTw4FPF1IDna5cQY9KSLUm3hFtGyrY6SQcMRVjKFtu67qT9LU06nXq8Fw2?= =?us-ascii?Q?y7iUiRntzZOM6PI1O1MNwuyeTufHKtxf77pRGvpAn4izx1i05mLC7L1PHOEW?= =?us-ascii?Q?GCwEB6plPRX36zI5pFKX1APhSVLXZd3r/sYCdty+JEhNvZGpKhwQB1IUX47C?= =?us-ascii?Q?CWFu6u98wpTYVb02PWjxugo4p5tzMwegjDmjMMPNUYIir5eO1UZFm0YgWr2f?= =?us-ascii?Q?sLT0DTqcM84WXLNNU+Fmt69ngt90aDA6HkizPILDnNFOfBYmkAiFSxHEFyLt?= =?us-ascii?Q?xUQgiq1Qaf5amzycUnwb54RElTxtVu4VRaqxjYPkvbwbbKijOziKz1GInwnf?= =?us-ascii?Q?io0Zeth9enLPrYdXI4YT64WzXs3AT8HW/RSfCj0b4ZGFRWVjaUTjgJRi9j/m?= =?us-ascii?Q?+S/ZH0nCO0iYq7RuJQtfc9rv9mwmKUOW7CCc7+wZnjZDQJF6rJuUe5usPMgR?= =?us-ascii?Q?VWF2aHnFgeFi48eq+qyGBdjwS2MKrGSBsWdwxoULDJRO5vd+eCT2jLaB7048?= =?us-ascii?Q?UwfHJZIgMIvU9UZxzEnnPullhygSpGbTlVnCKTfvJ9DGYzTQTkVa5V8jeIDR?= =?us-ascii?Q?ZXzwX7kbpQmDql4ZBHvDxSkE2EOMa0UICbMbu2wrj5IzNAt808qfm9FOtH6b?= =?us-ascii?Q?UFUK9eoI1Kg9DS0F82ssOjH34B3TlebPbLW2GfZJrjxsUYOF/BRsPFhga5cc?= =?us-ascii?Q?KFO+i3xG791ogkk=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)(376014)(82310400026)(36860700013)(1800799024)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:43:58.6832 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 92e98a3d-aec5-47c0-b04e-08dd5019ea16 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: SA2PEPF000015CB.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7288 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=2327043ff494d807aaaec57f42b2c5d78389c8a7 Thanks. Xueming Li --- >From 2327043ff494d807aaaec57f42b2c5d78389c8a7 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Feb 2025 08:23:14 -0800 Subject: [PATCH] crypto/dpaa_sec: fix bitmask truncation Cc: Xueming Li [ upstream commit 7c18f573c1f5368f70e6e956c4ba0c6f97b19cb1 ] 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: fe3688ba7950 ("crypto/dpaa_sec: support event crypto adapter") Signed-off-by: Stephen Hemminger Acked-by: Hemant Agrawal --- drivers/crypto/dpaa_sec/dpaa_sec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 131cd90c94..502e4fbed1 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -1903,13 +1903,12 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, op = *(ops++); if (*dpaa_seqn(op->sym->m_src) != 0) { index = *dpaa_seqn(op->sym->m_src) - 1; - if (DPAA_PER_LCORE_DQRR_HELD & (1 << index)) { + if (DPAA_PER_LCORE_DQRR_HELD & (UINT64_C(1) << index)) { /* QM_EQCR_DCA_IDXMASK = 0x0f */ flags[loop] = ((index & 0x0f) << 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); } } @@ -3447,7 +3446,7 @@ dpaa_sec_process_atomic_event(void *event, /* Save active dqrr entries */ index = ((uintptr_t)dqrr >> 6) & (16/*QM_DQRR_SIZE*/ - 1); 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) = ctx->op->sym->m_src; ev->impl_opaque = index + 1; *dpaa_seqn(ctx->op->sym->m_src) = (uint32_t)index + 1; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:03.484912756 +0800 +++ 0080-crypto-dpaa_sec-fix-bitmask-truncation.patch 2025-02-18 19:39:00.718244032 +0800 @@ -1 +1 @@ -From 7c18f573c1f5368f70e6e956c4ba0c6f97b19cb1 Mon Sep 17 00:00:00 2001 +From 2327043ff494d807aaaec57f42b2c5d78389c8a7 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7c18f573c1f5368f70e6e956c4ba0c6f97b19cb1 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 3fa88ca968..e117cd77a6 100644 +index 131cd90c94..502e4fbed1 100644 @@ -25 +27 @@ -@@ -1907,13 +1907,12 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, +@@ -1903,13 +1903,12 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, @@ -41 +43 @@ -@@ -3500,7 +3499,7 @@ dpaa_sec_process_atomic_event(void *event, +@@ -3447,7 +3446,7 @@ dpaa_sec_process_atomic_event(void *event,