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 92EF0433D8 for ; Mon, 11 Dec 2023 11:18:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8CCDC4113C; Mon, 11 Dec 2023 11:18:24 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2085.outbound.protection.outlook.com [40.107.92.85]) by mails.dpdk.org (Postfix) with ESMTP id B569B40E0F for ; Mon, 11 Dec 2023 11:18:23 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m0ctlJ76FTVto84/5eeT850NXrExQaukwaDC2Nh0383w+EgTgnDN5iylM/SpxZiCa1xN8eduQR8RTrlCerDDJTc9R88mPmWd4nD4/Mmz6Lm+F9IPJZ7GrGsTTBzIbq9SK2GSCafTdBfTh3W0J3jBOdXY9fhR9Vjd/NHZ+f/udw/SnYFPx3HGGW9OkJJr3zxVQhe0sXwFqc86IMOY2rzaGjzu9wc6Zf5fFxGh31QRuDefAt2ACDb660WPsfX6SYnF7/M9wrQD8EouFKE6SKvu3Dbb1qKnyq2uLFk3hFzAOnWSwSI7TQaIXhufTdMhKO0VhPVq4wfZ+ceRvAwTUPDu4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=lhFmKP1u3oX9YsTGkRubcRZ74cqEMiLvJ8l7RnpEpu4=; b=D3KIK2KGmh/b+E7CXSn5KlJLu57ftSm9e387TwErVKCQDuXNwk2qzpUDqZD/motsbLHRFeDYJosUQ9ini1EyD+UphAOAX/iOlHa+z3EYPhcP92BMl97RJhSvJNOSgiNOzzGjFb0TNy2yOlRIrZstpPMOHz/NiKM8jA8FQReVds8Ur9jzCRApLtXQHCJeqjtE9XytnlBuEu1ZZBmOb+1rYp4VSa0t6LMTNd6XKDJhLOE4+rfFJxr3u4Pa5Rg1I6VyssUqIinrN31q06D/yCE9rFfzs+vRDQOcsaHlYoX/a/plu1Xn/SmTooVXEDAiAS61Kz7Sg8PAYaJjFQxUM1kxhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=marvell.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=lhFmKP1u3oX9YsTGkRubcRZ74cqEMiLvJ8l7RnpEpu4=; b=FfergL9Nle0ZC/nCNEhu/ZIsMQtoxXtP1neDIkZU9JoarZMBRraiqd5leEOvgVv1cIM4mMw2MVRgyumJKWCen0+p/6vLlCC9CYp/DZKkYXVUG1Y1XPITatLxxK53TFwoecoqp2annSveJ6TNgKN3iDzt1eTcTn8uguwrbGJMx8DuptwqI5j+dVzu1s9gRvYuP1FGTeAP7n3ARlcZrM0UJMGV/B0j0JfeAWd4BS5xaTfaYZxcu+jpryhGdx+pQe+XF2u0w3v9XLXIvirxp5Fgr3E3T02BItiLhUBKBV/wtobgOc+snfV5qvdo53RStnphDD8DX5ks21ZBkmTeXRJaFw== Received: from CH0PR03CA0049.namprd03.prod.outlook.com (2603:10b6:610:b3::24) by SA3PR12MB8762.namprd12.prod.outlook.com (2603:10b6:806:31f::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:18:21 +0000 Received: from CY4PEPF0000EE3D.namprd03.prod.outlook.com (2603:10b6:610:b3:cafe::2d) by CH0PR03CA0049.outlook.office365.com (2603:10b6:610:b3::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33 via Frontend Transport; Mon, 11 Dec 2023 10:18:21 +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 CY4PEPF0000EE3D.mail.protection.outlook.com (10.167.242.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:18:20 +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.986.41; Mon, 11 Dec 2023 02:18:06 -0800 Received: from nvidia.com (10.126.231.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.986.41; Mon, 11 Dec 2023 02:18:04 -0800 From: Xueming Li To: Nagadheeraj Rottela CC: dpdk stable Subject: patch 'crypto/nitrox: fix panic with high number of segments' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:25 +0800 Message-ID: <20231211101226.2122-61-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.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: CY4PEPF0000EE3D:EE_|SA3PR12MB8762:EE_ X-MS-Office365-Filtering-Correlation-Id: 85db07ae-ecb1-45ed-4d37-08dbfa32801b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 83bxz66f5BY7rsapAPRffFdzYDoel7XzvJuVeqDe0/Y2Ac/mA6NWlHPmkVhv56ouO5STJ+sUQbnWcehIw+oZhVCaOUqDktzMVNqpLTNIvu2HnI9x/JSR2lZ4Db0Z8JDBVqtBqyYq6Sl6d0L/JfXhFuMwPi6xqLvKdTkN9zAEMPi8iFlLU/u4J3tk6ZrOe0Tc8iRZszK/ufRZcRLRsgWjIpUIO33kvVFBKzrQduoh5aGGp5pjR1PjahsxJL99mW+k9yDpA3PDb08DpcdUKI1z5wpxYc30lKolVG3KoXMEh3D5kQ2nmLDEbpxeRkXf4bwZ/qCONptWuMmg8JMv9MyTZNucBOg39VvP9OD7ztEjManmVkkHT/DQOe69q0O49pf0ChqrQlk8UirQi1DOWvIE+3Qcu6j0VPy9Hzju6cjU7ZeZ6PHp9u7qR+sSYf6fZBwKHVw8opXPaATPOI8+vT//AkYJSZfkw7+T2GI17iNfJopgT/Z+37xjkgB2P7JGEMzFOMzbutWfsBJvXUhZGRbXF1NrDElF/bHu8FlqyrzXAtQwQkTY+hMM9gQmSCuYY/Ncj4Eve6XBUgM9XhyBygwBB5tYDhSCwRAaNhWKPWjAom3EOalVFzN1LGyjWO/7Ith0PxPlyZKI7zdEaaSUN/QqeYUkYSE3/SacKZqMARXVTuGvQ72R5uHL/bthJ565vhn/ye1ynRml7VjuiMx98yNltcjkvFiuPngr2fJLJiFlzHxfRtiQG84ixxYvJUYvhsFbNcew8pJbYZNMg/yVOyS3mjDnzHuImFIBW750gbLYvRs= 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:(13230031)(4636009)(39860400002)(396003)(136003)(376002)(346002)(230922051799003)(64100799003)(82310400011)(1800799012)(451199024)(186009)(40470700004)(36840700001)(46966006)(4001150100001)(6666004)(7696005)(2906002)(70206006)(6916009)(53546011)(7636003)(356005)(36756003)(86362001)(316002)(8936002)(4326008)(8676002)(5660300002)(55016003)(40480700001)(70586007)(966005)(478600001)(40460700003)(41300700001)(36860700001)(82740400003)(47076005)(6286002)(26005)(336012)(426003)(1076003)(2616005)(83380400001)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:18:20.6232 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 85db07ae-ecb1-45ed-4d37-08dbfa32801b 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: CY4PEPF0000EE3D.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB8762 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 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/23. So 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=c70a8fa66e97fb5c9f843228c8cb3928b637878c Thanks. Xueming Li --- >From c70a8fa66e97fb5c9f843228c8cb3928b637878c Mon Sep 17 00:00:00 2001 From: Nagadheeraj Rottela Date: Thu, 17 Aug 2023 17:15:56 +0530 Subject: [PATCH] crypto/nitrox: fix panic with high number of segments Cc: Xueming Li [ upstream commit 4a469e1216384d19a6dc3950686f479e30e319a9 ] When the number of segments in source or destination mbuf is higher than max supported then the application was panicked during the creation of sglist when RTE_VERIFY was called. Validate the number of mbuf segments and return an error instead of panicking. Fixes: 678f3eca1dfd ("crypto/nitrox: support cipher-only operations") Fixes: 9282bdee5cdf ("crypto/nitrox: add cipher auth chain processing") Signed-off-by: Nagadheeraj Rottela --- drivers/crypto/nitrox/nitrox_sym_reqmgr.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/nitrox/nitrox_sym_reqmgr.c b/drivers/crypto/nitrox/nitrox_sym_reqmgr.c index 9edb0cc00f..d7e8ff7db4 100644 --- a/drivers/crypto/nitrox/nitrox_sym_reqmgr.c +++ b/drivers/crypto/nitrox/nitrox_sym_reqmgr.c @@ -10,8 +10,11 @@ #include "nitrox_sym_reqmgr.h" #include "nitrox_logs.h" -#define MAX_SGBUF_CNT 16 -#define MAX_SGCOMP_CNT 5 +#define MAX_SUPPORTED_MBUF_SEGS 16 +/* IV + AAD + ORH + CC + DIGEST */ +#define ADDITIONAL_SGBUF_CNT 5 +#define MAX_SGBUF_CNT (MAX_SUPPORTED_MBUF_SEGS + ADDITIONAL_SGBUF_CNT) +#define MAX_SGCOMP_CNT (RTE_ALIGN_MUL_CEIL(MAX_SGBUF_CNT, 4) / 4) /* SLC_STORE_INFO */ #define MIN_UDD_LEN 16 /* PKT_IN_HDR + SLC_STORE_INFO */ @@ -303,7 +306,7 @@ create_sglist_from_mbuf(struct nitrox_sgtable *sgtbl, struct rte_mbuf *mbuf, datalen -= mlen; } - RTE_VERIFY(cnt <= MAX_SGBUF_CNT); + RTE_ASSERT(cnt <= MAX_SGBUF_CNT); sgtbl->map_bufs_cnt = cnt; return 0; } @@ -375,7 +378,7 @@ create_cipher_outbuf(struct nitrox_softreq *sr) sr->out.sglist[cnt].virt = &sr->resp.completion; cnt++; - RTE_VERIFY(cnt <= MAX_SGBUF_CNT); + RTE_ASSERT(cnt <= MAX_SGBUF_CNT); sr->out.map_bufs_cnt = cnt; create_sgcomp(&sr->out); @@ -600,7 +603,7 @@ create_aead_outbuf(struct nitrox_softreq *sr, struct nitrox_sglist *digest) resp.completion); sr->out.sglist[cnt].virt = &sr->resp.completion; cnt++; - RTE_VERIFY(cnt <= MAX_SGBUF_CNT); + RTE_ASSERT(cnt <= MAX_SGBUF_CNT); sr->out.map_bufs_cnt = cnt; create_sgcomp(&sr->out); @@ -774,6 +777,14 @@ nitrox_process_se_req(uint16_t qno, struct rte_crypto_op *op, { int err; + if (unlikely(op->sym->m_src->nb_segs > MAX_SUPPORTED_MBUF_SEGS || + (op->sym->m_dst && + op->sym->m_dst->nb_segs > MAX_SUPPORTED_MBUF_SEGS))) { + NITROX_LOG(ERR, "Mbuf segments not supported. " + "Max supported %d\n", MAX_SUPPORTED_MBUF_SEGS); + return -ENOTSUP; + } + softreq_init(sr, sr->iova); sr->ctx = ctx; sr->op = op; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:25.068345200 +0800 +++ 0060-crypto-nitrox-fix-panic-with-high-number-of-segments.patch 2023-12-11 17:56:23.057652300 +0800 @@ -1 +1 @@ -From 4a469e1216384d19a6dc3950686f479e30e319a9 Mon Sep 17 00:00:00 2001 +From c70a8fa66e97fb5c9f843228c8cb3928b637878c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4a469e1216384d19a6dc3950686f479e30e319a9 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org