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 2C805428F8 for ; Sun, 9 Apr 2023 17:33:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 22FC1410EF; Sun, 9 Apr 2023 17:33:33 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2053.outbound.protection.outlook.com [40.107.92.53]) by mails.dpdk.org (Postfix) with ESMTP id 43CA240EDE for ; Sun, 9 Apr 2023 17:33:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jROzeMuE9s45P03uVWQbrx/pScjDw6rblyX/9rRzYEbC98UmDGdQQ/7WozaHQvPblz1ij/YpLXSmX6SuUzpNVXtNLY8NA2TDBq+sKGDBkH+Pu6WZvgqDZf5sSYwimP0UWcxiV+SL6E+EwCIwcoqZFiSs7akP5u3lvHEIu+B4BHSPLIHHBy8Yayy7+pQSkerAMm6vqasmHoGOaWv7ibTGXk1rrBJLiHe8BzBMv9maQLcNM7HHYROOy3ecsghs2TqG9UdKrskRuE7oYUJfbRc1ZgF1AEAXF43Kjk7xKH8hTD+B8fh3fct4qg2IU2ISRWDEnJNIT4zYPdLmU+bz5vdk8A== 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=WexgYaIlPg9PSt0X3FNuCRUhaGyYuyupEmKblb19Y4E=; b=i0CGzrLGX+O0JGwh15CUd5GPWkoalpe6amrla0TZA5AIyUhlTT5cXX2A6rWhwD71Ye2m9h2pQECfi+mwGIUj9/1sOz39t0WSeUu1MigHAgwjsC3LWP7QSp93NxzaP4uo3BbYd06AzBEmFXZC0/ntJ+OiTeolQftQQpySD0VZS1XdslqqGMMTJq6E/ZvG3Pf0l2p4hhBk573pw2ew/Sub8vKEnaaTLe4jh3sqtmnhpfx7CNTPAPazQ9yrLeB9twxKBx8eoetdVzLCIf4jNb0Dn0/FYydzsj8CoE5uUooJ4zsuuOwSkQTB3SCApTCxbsnZXFA1DYxKDURj4uZ1+T+qLw== 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=WexgYaIlPg9PSt0X3FNuCRUhaGyYuyupEmKblb19Y4E=; b=QiAfO/cixs99ne8sTHjX06P5v/RJw4X2nDZDq8qM+SQkLET0LrqHgKvfz4cttfuwbZ5yuw8rEd5S7SFyUcOuZZ8UrSfPm6pNJIg7jZvDZGGVmIvq2ZtzA8PYNflfe4HsgOCBj8IYe7SsAdtWmxcV5aV2O5pqXTDq+o0JxvkglvfusKsKxwdjHNxlhuEpu82rmTyG1HhQXOw7hYHGPonUx7ejkIKEU/NARofTiAnf0tmmhjQOS3MZ3pbEiLdLoOsvvBLb8BPkhyS43BjTq4aOSo+/9j3meceHscpmfPVKHHdnnktVohkd8OaXy+tgZWc33wKa52tA0VfpLRT0ZmlT+A== Received: from MW4PR03CA0090.namprd03.prod.outlook.com (2603:10b6:303:b6::35) by BY5PR12MB4273.namprd12.prod.outlook.com (2603:10b6:a03:212::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.31; Sun, 9 Apr 2023 15:33:28 +0000 Received: from CO1NAM11FT040.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b6:cafe::3a) by MW4PR03CA0090.outlook.office365.com (2603:10b6:303:b6::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.39 via Frontend Transport; Sun, 9 Apr 2023 15:33:27 +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 CO1NAM11FT040.mail.protection.outlook.com (10.13.174.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:33:27 +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.5; Sun, 9 Apr 2023 08:33:25 -0700 Received: from nvidia.com (10.126.230.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, 9 Apr 2023 08:33:24 -0700 From: Xueming Li To: Ciara Power CC: Arek Kusztal , dpdk stable Subject: patch 'crypto/qat: fix SM3 auth mode' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:24:38 +0800 Message-ID: <20230409152529.5308-91-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT040:EE_|BY5PR12MB4273:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a05eeb4-4cac-4368-63c0-08db390fc3c9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VY7yoe7FGy3tuNzaxLK5dOdnw2KQfZzhUO7vmk5JRPX+Ft3r2PW10x+g7IcZ6c8MjnsIm5+B/XOjfvxmfUtgfvms/91ytvzwEDWJ1DtcHpfFbJpHHvZUL7fAsov1TZcpDseUgtfgfNAqgE9k3bbezK85OmIbsnqZfWIpgqg8WX18kMnx7Oslnxl7wT8esl3I6RhnlwHCDbyNoGmC0PNN3UUL4k1XsfqVmH8HJk+DaFv6GU4XkA00c3fOiGz1EuMJxnuB+jnCYg8xW4qHIsW3l5SYoTgFl2pLQF5dFnVTRG7eTXcwAfy5UkdNxx9Y3aF9/VGxWEwCuYe0r/yzB7IoBxYCT6m8kdMVkgiD+OlBpssP97LBOEG/UGb0+KvfQVXfBT2C7TRZI0xOGQxuA+g3/SW8DCikaEHrUeQgvbtKis230et7G47NCETo1bO9IbqjQ7OV7Fiuw7gm2LlwB7U19dQ254y105WdyJq9XukCMruMBSo6d23FOEJnjNwn9AOcfE8hh10MDPhQRydnJEfmW6eUZqQu7H2vi+ynisSSmaRlIxtjg95F2I04yDVqCW0g2N+fwhW0le32c+xo7SsiHOtln6Sk4FrwZKafYGXARiMjjhWbyUFMfPEMwq1RRJTOD0N0FfLLr8Gf3mdKDu2Mdvs1H+KmvKuab2Ufp2QCS4KWVxoe9WhxwCKDUk3IEKWQjXLkWZopPS40k8+NAo3XI3WBlw1Vz+HoK6Ex7y51JngIDNWGK7mrnmSum+JAMU6LbtThW1oy5Uva0EDh8jAxE3icghxEFRiolquOufdmnNA= 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:(13230028)(4636009)(39850400004)(136003)(376002)(396003)(346002)(451199021)(36840700001)(46966006)(316002)(966005)(5660300002)(54906003)(478600001)(83380400001)(7696005)(41300700001)(8936002)(70206006)(4326008)(8676002)(6916009)(70586007)(6666004)(53546011)(26005)(2906002)(1076003)(186003)(16526019)(6286002)(336012)(426003)(82740400003)(356005)(47076005)(7636003)(2616005)(55016003)(40480700001)(86362001)(36756003)(82310400005)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:33:27.4167 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7a05eeb4-4cac-4368-63c0-08db390fc3c9 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: CO1NAM11FT040.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4273 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 04/11/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/log/?h=22.11-staging/commit/1536a7304aa84119a36a8ebd0da70cf4b726c2d2 Thanks. Xueming Li --- >From 1536a7304aa84119a36a8ebd0da70cf4b726c2d2 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Wed, 1 Mar 2023 13:59:15 +0000 Subject: [PATCH] crypto/qat: fix SM3 auth mode Cc: Xueming Li [ upstream commit 6291de627734e465e4645117dab4b7546393e20e ] The SM3 auth mode is now set to 0, to support plain hash only. This is also added to the capabilities for GEN3 and GEN4. SM3 HMAC is not supported. Fixes: 75fd4bbc94ab ("crypto/qat: support SM3 hash algorithm") Signed-off-by: Ciara Power Acked-by: Arek Kusztal --- drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c | 3 +++ drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c | 3 +++ drivers/crypto/qat/qat_sym_session.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c b/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c index 7f00f6097d..2a0ddab8af 100644 --- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c +++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c @@ -140,6 +140,9 @@ static struct rte_cryptodev_capabilities qat_sym_crypto_caps_gen3[] = { QAT_SYM_CIPHER_CAP(SM4_CTR, CAP_SET(block_size, 16), CAP_RNG(key_size, 16, 16, 0), CAP_RNG(iv_size, 16, 16, 0)), + QAT_SYM_PLAIN_AUTH_CAP(SM3, + CAP_SET(block_size, 64), + CAP_RNG(digest_size, 32, 32, 0)), RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST() }; diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c b/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c index b1e5fa9a82..b219a418ba 100644 --- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c +++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c @@ -100,6 +100,9 @@ static struct rte_cryptodev_capabilities qat_sym_crypto_caps_gen4[] = { QAT_SYM_CIPHER_CAP(SM4_CTR, CAP_SET(block_size, 16), CAP_RNG(key_size, 16, 16, 0), CAP_RNG(iv_size, 16, 16, 0)), + QAT_SYM_PLAIN_AUTH_CAP(SM3, + CAP_SET(block_size, 64), + CAP_RNG(digest_size, 32, 32, 0)), RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST() }; diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c index 46a30d6539..52ed921db2 100644 --- a/drivers/crypto/qat/qat_sym_session.c +++ b/drivers/crypto/qat/qat_sym_session.c @@ -697,7 +697,7 @@ qat_sym_session_configure_auth(struct rte_cryptodev *dev, switch (auth_xform->algo) { case RTE_CRYPTO_AUTH_SM3: session->qat_hash_alg = ICP_QAT_HW_AUTH_ALGO_SM3; - session->auth_mode = ICP_QAT_HW_AUTH_MODE2; + session->auth_mode = ICP_QAT_HW_AUTH_MODE0; break; case RTE_CRYPTO_AUTH_SHA1: session->qat_hash_alg = ICP_QAT_HW_AUTH_ALGO_SHA1; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:41.070718200 +0800 +++ 0090-crypto-qat-fix-SM3-auth-mode.patch 2023-04-09 21:45:38.709042200 +0800 @@ -1 +1 @@ -From 6291de627734e465e4645117dab4b7546393e20e Mon Sep 17 00:00:00 2001 +From 1536a7304aa84119a36a8ebd0da70cf4b726c2d2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6291de627734e465e4645117dab4b7546393e20e ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 5fa898dc8f..6013fed721 100644 +index 7f00f6097d..2a0ddab8af 100644 @@ -25 +27 @@ -@@ -152,6 +152,9 @@ static struct rte_cryptodev_capabilities qat_sym_crypto_caps_gen3[] = { +@@ -140,6 +140,9 @@ static struct rte_cryptodev_capabilities qat_sym_crypto_caps_gen3[] = { @@ -50 +52 @@ -index 466482d225..6ad6c7ee3a 100644 +index 46a30d6539..52ed921db2 100644