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 BF63EA00C5 for ; Wed, 20 Jul 2022 10:23:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B9BF440697; Wed, 20 Jul 2022 10:23:01 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2069.outbound.protection.outlook.com [40.107.92.69]) by mails.dpdk.org (Postfix) with ESMTP id F08E84003C for ; Wed, 20 Jul 2022 10:23:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nUgLpQpOpslWVY8w1clUKsJrvx7uzv0QsSNt2RpZlIvVE6DYTAsy40hF2D/dFxWgweWrsN39PofK2O0Atxi/SyoQ586Y3iTkZrlsdUnlQApihbPLpVvgJ42aHRrdZe3Nmu2j2SiJdibGGWcZWQN2YzRPbHeCZ+0xakp8eMQKlPaSoOZsMsH1fGcIEo3EaCrWf9+W07y+xwN17eR2SxuXe/T4HyugW7z67yFn3G04an9TdlRLBhzUHw7YEKIP1Se68TS+sQ5WCaE2DkihxyVkkuEnJsM0dM0dfNC++iShWdgDRhH8BiYTzSFspd8sANk4lzYZA+tgu9dYmAOOcwNmmA== 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=yHpfh0TFhuDJkphEo9A560dvFTTmktzDoDL9YTZS0/Y=; b=K8pw6qvf9qk52hEaUhVa/BrMAuLTkBAT2F6PQHjhTShUra5ubSBeg+BPrSmKbnGZ2hyBSES/zYNE1iMrUrbeaInFo73YTvwJwsyO0sdGTnNwayxjaCORp5e9J9aykhl1yY2+2Hs9KbbzJBe4x9VBQHqyZCXvo9krsrcNwaTGPezBB++NtsVFYPTagAWPxuZmYAU0ErxsQmCC8Ph+jl/41Au0FZac9TBSdnankP1Ob96v9809sl8rNEfgxliNa/mGynmek95Vok/ZzAY3m4cekONfpLSq8tdIX4upkO+9vTBqfvg7S5NmVGBD2l9wIj7By2xkaP/fnQu/e+lfOoNMag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) smtp.rcpttodomain=dpdk.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 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=yHpfh0TFhuDJkphEo9A560dvFTTmktzDoDL9YTZS0/Y=; b=UFsKtMoUAc7koBkqKTGf0Hq8wf4mNKc316pJUhfuJbPjK4Y8ZZ0FymLvoG9hs0oyMrqHR5CizZQXeIt1Yt0rFK3n7JkT2T4CoLOeTM1J4T2MEfjxektmgIwdLi9MS5ivlobX/ED4XTLN6RZV3XQcowP0O1FPOW08MrFFcTUZNYs6FFCoiN5olGKgT3r96BDKzGqlxgDI9l5DrXpZFWxjwDLOW02kmK+CEnIUga3rtCZhTeqGpWqRy0zMGE3LipQtl6d14iGkNN7kp1D7+yEERUJzYWXPttrE80KsAKUgEPVXTgt4RVBwgfvIuurIYrVf5V/z8rcs4EAXd4rqaVVG3g== Received: from BN8PR12CA0035.namprd12.prod.outlook.com (2603:10b6:408:60::48) by SN1PR12MB2381.namprd12.prod.outlook.com (2603:10b6:802:2f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.15; Wed, 20 Jul 2022 08:22:59 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:60:cafe::54) by BN8PR12CA0035.outlook.office365.com (2603:10b6:408:60::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.23 via Frontend Transport; Wed, 20 Jul 2022 08:22:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) 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 12.22.5.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.238) by BN8NAM11FT019.mail.protection.outlook.com (10.13.176.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5458.17 via Frontend Transport; Wed, 20 Jul 2022 08:22:59 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Wed, 20 Jul 2022 08:22:58 +0000 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.26; Wed, 20 Jul 2022 01:22:56 -0700 From: Xueming Li To: Ciara Power CC: , Kai Ji , dpdk stable Subject: patch 'test/crypto: fix cipher offset for ZUC' has been queued to stable release 20.11.6 Date: Wed, 20 Jul 2022 11:20:40 +0300 Message-ID: <20220720082132.3954126-11-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220720082132.3954126-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> <20220720082132.3954126-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 32e90978-3553-423a-6704-08da6a290e64 X-MS-TrafficTypeDiagnostic: SN1PR12MB2381:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?XoKsq8ig0qrGyxNSsInONSZR1g72Qo2fpbduII9oAcXy1R7GsrtIThmo3hre?= =?us-ascii?Q?DFPtp+kG0HN9W84dCjYo2MzYxSCVdI4d/XzdGGDAfRt6Ed5dM7kd+5cNOjsE?= =?us-ascii?Q?dbWiP7l8zaU5owj13IDhCIV2DvsIu5o5+6mlISSi6G+bWTQoZZRVbI7KGhg9?= =?us-ascii?Q?neVKcQ0ofoze71B2nZZGXtUi3/0bCcVCOthK0WZ15KaiaC/68cBbWJs4ZgV6?= =?us-ascii?Q?/m9PLJffi5pG0dAAmDI+7nLQaN5EsHJOgkAQnBvjuws7a31xYLlvSRslmWTK?= =?us-ascii?Q?SN0/vRFcJVCS7ze1Sebk7AFb1JUCK3251ZQqGV+UBgDwNypPTk6yHix30xn6?= =?us-ascii?Q?oimNwzEm7VnJhTVrsLVC9dld4Ui/C7+Tm5OmNGeadM6sI5TLWMs1yeT2aaXR?= =?us-ascii?Q?wfzv0nuBHEfyzPD4tmkh8w5zlVwjQuBuUrZcYbgN4cuXX69P19BDgIbulQNb?= =?us-ascii?Q?eVAPp+R3645rCbhm0U2O6xpBsYhlQLS3o5/dS0Koa9zS28UatLz/R49g8BFY?= =?us-ascii?Q?E3GtcWi7nfSij5LUy7jgxucMlLJ7kv9WVYqSqJXA+XhsP85p0izHGX072vyr?= =?us-ascii?Q?zJZNg8B32DUTb45iPFfhZgOc2ilAFSbLmHsLxOifbV9JbtrhRW64biYmf1vd?= =?us-ascii?Q?r1RI4v5XHdxqS28jDli04eGYyK/IjJn0yZ8yiP2XFM8DEdmWd2Xio9iVLxbJ?= =?us-ascii?Q?VZ6Drsh8aE93n7nVDiew/ea25eGiz9EfRLT4uXUwn6dntLMxMSIcAK5kqT0D?= =?us-ascii?Q?UA08UY3j29kyLe3WGUtFz/6vnF4Dv2hmNtO4aSEPFe2vdVbBeZyCK5hNOs0w?= =?us-ascii?Q?tcXofpcHIakN01nak0CyGeQS5wtyczaUusLWyVtBUiHor0U5WEt9DbLTijkb?= =?us-ascii?Q?LsRnwG2UAMGxpe8z1eQ8vJQv3GI7EySVxy+NHR2g1ligVgrwl5CGuO+1iky7?= =?us-ascii?Q?ZkNUACUA7IjWqOTTMMWDfg=3D=3D?= X-Forefront-Antispam-Report: CIP:12.22.5.238; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(136003)(376002)(346002)(39860400002)(396003)(36840700001)(40470700004)(46966006)(966005)(16526019)(356005)(82740400003)(86362001)(81166007)(478600001)(6286002)(1076003)(336012)(316002)(6666004)(83380400001)(53546011)(186003)(426003)(54906003)(7696005)(41300700001)(47076005)(40460700003)(40480700001)(8936002)(70206006)(26005)(6916009)(2616005)(4326008)(70586007)(8676002)(36860700001)(2906002)(36756003)(82310400005)(55016003)(5660300002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 08:22:59.2292 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 32e90978-3553-423a-6704-08da6a290e64 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.238]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT019.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2381 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 20.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/22/22. 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://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/8d49e2f6d19e495fb3372dd0671ce69aab7ce1de Thanks. Xueming Li --- >From 8d49e2f6d19e495fb3372dd0671ce69aab7ce1de Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Tue, 21 Jun 2022 11:41:32 +0000 Subject: [PATCH] test/crypto: fix cipher offset for ZUC Cc: Xueming Li [ upstream commit 7a0f8fe76bd03dc8b61965040a66409996afa717 ] The cipher offset in bits was not being used in ZUC encryption test functions when creating the operation, it was hardcoded to 0. This is fixed to use the offset from the test vector as intended. Fixes: fd01a9be38d5 ("test/crypto: move IV to crypto op private data") Signed-off-by: Ciara Power Acked-by: Kai Ji --- app/test/test_cryptodev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 441193c0f6..c254650f39 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -5538,7 +5538,7 @@ test_zuc_encryption(const struct wireless_test_data *tdata) retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data, tdata->cipher_iv.len, tdata->plaintext.len, - 0); + tdata->validCipherOffsetInBits.len); if (retval < 0) return retval; @@ -5638,7 +5638,7 @@ test_zuc_encryption_sgl(const struct wireless_test_data *tdata) /* Create ZUC operation */ retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data, tdata->cipher_iv.len, tdata->plaintext.len, - 0); + tdata->validCipherOffsetInBits.len); if (retval < 0) return retval; -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-20 15:00:59.302788448 +0800 +++ 0011-test-crypto-fix-cipher-offset-for-ZUC.patch 2022-07-20 15:00:58.671000561 +0800 @@ -1 +1 @@ -From 7a0f8fe76bd03dc8b61965040a66409996afa717 Mon Sep 17 00:00:00 2001 +From 8d49e2f6d19e495fb3372dd0671ce69aab7ce1de Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7a0f8fe76bd03dc8b61965040a66409996afa717 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 15df53a1f0..1cac76a64a 100644 +index 441193c0f6..c254650f39 100644 @@ -23 +25 @@ -@@ -6033,7 +6033,7 @@ test_zuc_encryption(const struct wireless_test_data *tdata) +@@ -5538,7 +5538,7 @@ test_zuc_encryption(const struct wireless_test_data *tdata) @@ -32 +34 @@ -@@ -6128,7 +6128,7 @@ test_zuc_encryption_sgl(const struct wireless_test_data *tdata) +@@ -5638,7 +5638,7 @@ test_zuc_encryption_sgl(const struct wireless_test_data *tdata)