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 3C77141D8D for ; Mon, 27 Feb 2023 08:07:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 349B7410D3; Mon, 27 Feb 2023 08:07:42 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2080.outbound.protection.outlook.com [40.107.93.80]) by mails.dpdk.org (Postfix) with ESMTP id 1A22F40A7D for ; Mon, 27 Feb 2023 08:07:41 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k0GRULlk9VJhnjoV7vxTRGNdeveBuixxZwIH3XJq2stIjCLNbJh1LRbsSSVwoHSnT3/Ec4wbKBLYlmtUo0psT0WyxAw1DT5cb14bh4oVu6v+5pButpyxsKtHxDxNjdHWOjx0LEsNKQPAoDr/A/jzKmfQL3nwsRweDq1hL8hAyehiyCZh0tdWSJ2cn9HwTP1bfIo5QVUVZrbW7XSQDPmyifcLhWfZm49Z5CBpsGHyAA2Wn1U2uAsL91RZLWUQtXiAHR/CbWKFC/aXRlz/saN/M0q9xZMUlwGBNNWLuB4m0t/9nOp9M/noAkf9M5EX76Hd3C4YeCORP/rRQwKeLzwgYQ== 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=rk0jbHISGEqzUM7iM1YIPg2f0YAlTlVWoqHs0DE9GZE=; b=EbNR7B/Zrjsro0DqYualStvNr+WwrEmrSJdI4D35EcGIW5g4G5PeX9BjimFEYfyqxfRED/6F0YudYEMIQ0rR6WyPbejSCs9dfcQDrK75quQHL1vWeQodwPBUoV3kk7XLpKuC51amtiVSN4Kj9O4HWQqKfK69z+Pdhkr1N50bq+e9gUSRbVauZ15uxkL2OzKIszd/ZBIRbqQLhF87wGMkEWh/4IUphZj30d4Y9XSaQz9QdIZg5Ho3p+JJWl2JMxgVO3skfb0QMiHPUx/nKjwMlVW5TrxtzNUB0YtmqDp6DqThc0kj91r9IsyF/5dymu1Kw1QT/gA3kLdmNtlFlG6ebA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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 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=rk0jbHISGEqzUM7iM1YIPg2f0YAlTlVWoqHs0DE9GZE=; b=ORubW3x7fmEFdzfi1SqNkeaqTWjjCbiOn+u04GrJG7dCmHZUiGvDKxD0MtLs/ZO/N2yJzqPwnDGHjWs2rVNWnsk8LJIqh2y6EnECftejQSHl4aZZS5G7gJUenh6zZr/bZ6K6WMb82PNd08JL+8fIwk7wdfm5suSKDgKq9f5T73LaHJZxRZpH3L7qJFTYK8x6XehuYBcU1Hc/OWv5GCfJwJ+hcGZ3u72E5vQyc8kuORNs8UHEdgC13mWF/td4IyWm+/64E8G3YSwlMNSm9y9oV/PgLnwTpxnYl6dD0BnWtSbZcFIEoiohehp+VsgN9frSZbJRkLmV2wYdeAyAfsxFRw== Received: from BN8PR03CA0035.namprd03.prod.outlook.com (2603:10b6:408:94::48) by SA3PR12MB7805.namprd12.prod.outlook.com (2603:10b6:806:319::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.27; Mon, 27 Feb 2023 07:07:38 +0000 Received: from BN8NAM11FT079.eop-nam11.prod.protection.outlook.com (2603:10b6:408:94:cafe::26) by BN8PR03CA0035.outlook.office365.com (2603:10b6:408:94::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:07:38 +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 BN8NAM11FT079.mail.protection.outlook.com (10.13.177.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:07:38 +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.36; Sun, 26 Feb 2023 23:07:30 -0800 Received: from nvidia.com (10.126.231.37) 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.37; Sun, 26 Feb 2023 23:07:28 -0800 From: Xueming Li To: Ciara Power CC: Brian Dooley , dpdk stable Subject: patch 'crypto/ipsec_mb: fix ZUC-256 maximum tag length' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:59:27 +0800 Message-ID: <20230227070107.15664-59-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] 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-TrafficTypeDiagnostic: BN8NAM11FT079:EE_|SA3PR12MB7805:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e558e4b-e2ac-44b9-6b68-08db18914f59 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I7DVua6zxFJBlzK90uOGRNLJYK/5w0wmL2JnOSSbKftvTck3e56IOzXmrgiicnoffoIJ7aAfg/+Kpwrxs5M2V77xzyT4cGH5FeCJlYvgeoQWsZhI0T5GEWFREFHUH+bxdpZnj1KGodOQeS7R6jVhGA/k8vcf9iIkonxU6lHQpaO09IfjMmz4RFnxQOwKNLHpqJ66amDCUrFDW863iSYMYE0MxyneJy8TDgiDRS+2i0E+ghqE2geFT9Jsc+0YyhNVNgpHR+3O6WMmx3JaHgvGQrt3FvAL30H69Y+aIZMSogUHu4u2XSHD1T/5XG1DPM2oIFC/a3HPOOCRjAouNNLRFgcnPD6Eqk0ZYHkqrQHwnlBfF0hHhdfgwLevr+UnwpbbNsUdjPEcAVln82D8YMdxgkYEUpHICNChzhQk03Egm8TqXGLXCNAIN/dX5/nnphli9yilaH/0mKNbMeXCukzmN0gl0e2mJhd9irjfJY+eXRFozyebznfg9yj1naEUn9brsDxotdkPSUB7z1U24+K7akpxrID60scWqYrYWDm0/OP/DNv5BgNhhzNN4A4l1wgYIrSEo2emsnKZTJT8P8sRD24pJ3Rgq0TXc68FinLqGkkLbQlhP4LEpQ8Boud+BfARKrfhfadLEPWt/zZH1aW0R4eFMbpgwvPVagjnC2EsfEHdf+Q6og6a9oqwoYZyssMguy6t4cidie07AURF3vf2im91xo2qKbwxgfwrgR+Qqla4mg80G7vpdUOxBCcVogQpGfoqHOC25l20dOwqXfsvGVWxlp5/ImGjWwwkTCvpzftRQUnPi+rLJJUdHcK7gIW2 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:(13230025)(4636009)(136003)(396003)(39860400002)(376002)(346002)(451199018)(40470700004)(46966006)(36840700001)(6286002)(186003)(16526019)(40460700003)(82740400003)(7636003)(83380400001)(316002)(356005)(8936002)(6916009)(8676002)(4326008)(41300700001)(70206006)(336012)(2906002)(5660300002)(70586007)(34020700004)(36860700001)(7696005)(55016003)(40480700001)(478600001)(1076003)(426003)(26005)(53546011)(47076005)(966005)(2616005)(36756003)(82310400005)(86362001)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:07:38.1610 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0e558e4b-e2ac-44b9-6b68-08db18914f59 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: BN8NAM11FT079.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB7805 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/01/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=d357ef8a3ca371bb82f53443d9a909f1050652ca Thanks. Xueming Li --- >From d357ef8a3ca371bb82f53443d9a909f1050652ca Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Tue, 31 Jan 2023 17:20:27 +0000 Subject: [PATCH] crypto/ipsec_mb: fix ZUC-256 maximum tag length Cc: Xueming Li [ upstream commit d3802886aaa76604833da59fa2df7cd519e59982 ] The AESNI_MB PMD supports 8 and 16 byte tag lengths for ZUC-256 when intel-ipsec-mb version is 1.3 or newer. The conditional check to enable these tag lengths had the incorrect operator, which enabled 8 and 16 byte tag lengths for versions below 1.2, which is not supported. Fixes: 7babda4316f9 ("crypto/ipsec_mb: support all tag sizes for ZUC-EIA3-256") Signed-off-by: Ciara Power Reviewed-by: Brian Dooley --- drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 2 +- drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c index 147a38932d..ac20d01937 100644 --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c @@ -199,7 +199,7 @@ aesni_mb_set_session_auth_parameters(const IMB_MGR *mb_mgr, } } else if (xform->auth.key.length == 32) { sess->auth.algo = IMB_AUTH_ZUC256_EIA3_BITLEN; -#if IMB_VERSION(1, 2, 0) > IMB_VERSION_NUM +#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM if (sess->auth.req_digest_len != 4 && sess->auth.req_digest_len != 8 && sess->auth.req_digest_len != 16) { diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h index 55fafbbbec..8a7c74f621 100644 --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h @@ -566,7 +566,7 @@ static const struct rte_cryptodev_capabilities aesni_mb_capabilities[] = { }, .digest_size = { .min = 4, -#if IMB_VERSION(1, 2, 0) > IMB_VERSION_NUM +#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM .max = 16, .increment = 4 #else -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:42.836380500 +0800 +++ 0060-crypto-ipsec_mb-fix-ZUC-256-maximum-tag-length.patch 2023-02-27 14:08:40.789237000 +0800 @@ -1 +1 @@ -From d3802886aaa76604833da59fa2df7cd519e59982 Mon Sep 17 00:00:00 2001 +From d357ef8a3ca371bb82f53443d9a909f1050652ca Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d3802886aaa76604833da59fa2df7cd519e59982 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org