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 8D4594333A; Wed, 15 Nov 2023 17:43:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CB8DE40A71; Wed, 15 Nov 2023 17:43:06 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 14A51402B0; Wed, 15 Nov 2023 17:43:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700066585; x=1731602585; h=from:to:cc:subject:date:message-id:references: in-reply-to:mime-version; bh=QyzYVyBM+5Va4KJ8KLvlU4zcJhkrHiQIjs46O1dTVsg=; b=ldxgf0qILTVzb+HHWMNvOFbLX/LXLyfD3/fLB7q+RBrXCscfR7JAtbZu cSfLXBCnuO8QUhwrYzbvWzTjpQ/+r4BlAseupSRCqI0nS5kNd/F+5Pmsi xL3uWDzdClrFd+keQQnLztzg+Csi6FqDnb+m2CU6fBA1kQ0HNAwm/KBMl Eg+7saPaIWTK9VsiF9qanV2t6LOiErv1RcqvR+cw33dDPPxs77tsRlBPJ /uk3V/HQNl4/eV7W5ASj5l/heK9Z4fDGHBe3ZqriRsUtu8Kuxa5gUmoLY KnJjQKw8NwQ9dmRyjQ/C0A3UGreQn8EHqWjHURJytoK+7RIY4clCVy9cn Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="390705920" X-IronPort-AV: E=Sophos;i="6.03,305,1694761200"; d="scan'208,217";a="390705920" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 08:43:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="768632684" X-IronPort-AV: E=Sophos;i="6.03,305,1694761200"; d="scan'208,217";a="768632684" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga007.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 15 Nov 2023 08:43:03 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Wed, 15 Nov 2023 08:43:03 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34 via Frontend Transport; Wed, 15 Nov 2023 08:43:03 -0800 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.168) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.34; Wed, 15 Nov 2023 08:42:46 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l+hsJyRWEXFrqzZHhPIpDoUQ4MWUZ9cSVOdCnl2RMArHCGGPCMeVhl1UpH3U0sL73oHFEaG0ZOjxJyuWAfgWTQyHUHOWtoiaanUOKja31mYXkSvylvQ3qTFW1tEXkQbxg1b9gdfzPxY/HyCITFcQHECo8dNkJ1CpJqInvFJw24cebuSIQ3KSg6fmcsNkG6YIMUa9Ed5cS2D9ndqnbKholqzucIw3cH/7Khs9AXBCKBmn2hF73AocxJiLAWdQz9UQMGnzGrgu1Gza2myNeZi66c+9+3dKDZEurFvJnYSNiYCvR+nq1aoWDWa3fFRlJTgs+X2jgwqLMRMPeSPhjhRLfw== 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=VgOejepY7pT0MXMzJAICX5z06Hvh2sUheD7tOjZoduk=; b=M3YePwOevclVIi+dZH/6Ka5CmZBFD2hduAT1od/z2ayRNEJb62WuNLUhCUnHDNWtP4RLHpWE5/jc37W2nrlL5cMiWfpo5kjQRJgB/KZj/vv2Nu50jnM5+it0vJkaqn8lOKUsvKlFdN2pL0oMm5ZcREwFb4YWdL4lpyMEeGxIDInMjLCHC9GeE9qQTaz/uRbQh7fR+kLD8Qm5+Sa4RZ3+ARSerbfz4JYXRBsOfqSKf1nLzerzXSQwjMuvJyjWaYtNFmE0fV2gWXBGdyaNA4n5+hgDvEtss2knMzKy882OScf6q5B3TXhHepDDtZrECPiBcr0SF1IOqtqqDy5svdkmQA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from SN6PR11MB3408.namprd11.prod.outlook.com (2603:10b6:805:bc::22) by IA0PR11MB8380.namprd11.prod.outlook.com (2603:10b6:208:485::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.20; Wed, 15 Nov 2023 16:42:44 +0000 Received: from SN6PR11MB3408.namprd11.prod.outlook.com ([fe80::33f5:4be5:6737:5b59]) by SN6PR11MB3408.namprd11.prod.outlook.com ([fe80::33f5:4be5:6737:5b59%4]) with mapi id 15.20.6977.033; Wed, 15 Nov 2023 16:42:43 +0000 From: "Ji, Kai" To: "Power, Ciara" , "dev@dpdk.org" CC: "Kusztal, ArkadiuszX" , "stable@dpdk.org" Subject: Re: [PATCH v2] crypto/qat: fix gen3 legacy capabilities Thread-Topic: [PATCH v2] crypto/qat: fix gen3 legacy capabilities Thread-Index: AQHaF97w18INZZXXhkSajzW8b7c8c7B7lZx3 Date: Wed, 15 Nov 2023 16:42:43 +0000 Message-ID: References: <20231115160554.2451510-1-brian.dooley@intel.com> <20231115161413.2520429-1-ciara.power@intel.com> In-Reply-To: <20231115161413.2520429-1-ciara.power@intel.com> Accept-Language: en-GB, en-US, en-IE Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SN6PR11MB3408:EE_|IA0PR11MB8380:EE_ x-ms-office365-filtering-correlation-id: e74ca19c-5f46-4027-75da-08dbe5f9e418 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: rrh6IOjocNy7eracVsMcn4ckKIPdYjJNHzdTwstgFcmFh3pRHaaLu/Vunej7veqWlSeCkewzlaP83Hl4o0985mSphnA5/rPJVpT3Jb4nJ8kFqNWQ4ybQl5o8dK/GRfKCFvnypA532IW8ePtTB7skbq3ABhD/v8Uwl0/26bn0EQ9xsbcEsSjayzYCKYz5PXwAwsHUwppySDWvw70X/bejVRt+Ra1gNxq2cYzSQw52930kbZ1Wat0o03Np56yzcJmi42dmZXh4XlG8YqS8WzJlR/MgFM2PP6R0rrWC3lgVDWnUZuwt66i/euwtC2GM323aDLGgpl9sMM9heiSWsC4bMWXJBusS4r+0NMhPXIIqjpcA9+zQr250in0hq58g75ymrLpDM+GTlAqm1nkHjf9443JNTs/ri3mise7uOdVCjSF4l4dJoDb4waigmJideZyPzF8hCAAgFzolNwaSeml/qs4cOJ9K1NVg6EySfIAep+aENDwO9Bn1FXYXQhxLeiUmZWLXg+chm3BneXpADX3sKMa6fOauGQzCKtDk6SKxMTXRh48REuHoZFm0rgswyeZCujCQ9P8YfGPA839npl7Ouox5LT7lK/CRarRl9BlgFwlJ7JM2xeUy30xgOj+asFwS x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR11MB3408.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(346002)(39860400002)(136003)(396003)(366004)(376002)(230922051799003)(64100799003)(1800799009)(186009)(451199024)(7696005)(450100002)(4326008)(8676002)(53546011)(8936002)(6506007)(64756008)(316002)(54906003)(66446008)(110136005)(66476007)(66556008)(76116006)(478600001)(91956017)(55016003)(86362001)(66946007)(71200400001)(83380400001)(82960400001)(9686003)(52536014)(33656002)(26005)(19627405001)(2906002)(5660300002)(41300700001)(122000001)(38100700002)(38070700009); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?+54ovwBW6BRvn4s/5usqrDKHwuaGsIxdIHR5VDVhv6EVrb6GhLEvD6PzlCyE?= =?us-ascii?Q?ClQD+1Fye6jfwnKtTuogBmugw8fEfwKqzMeUSEPfvPsSByDNbROzjm1rR5cb?= =?us-ascii?Q?niLfMNC8djaJYy/At0Jn14x3g4uDyEN2SdaoFuvBHQePBLalBWSpe0TNCG/v?= =?us-ascii?Q?ijIecX3zzyHZaJG0aQ14E7umjUMa51cpYZymDXl0c+2c7/cgM8CnEkDFn2ou?= =?us-ascii?Q?HXghdrQq6jFTE/tQPVwpE5HJZl+kyYGDJ72EgAffnk8IEtF6sYnC9CJ5Oxtx?= =?us-ascii?Q?aoiuzOBGqiPQzHJm3nHBENNxrz4/Lqr/br6WyL8FgPDTLmL9ozSUXngRfWE5?= =?us-ascii?Q?Pf9dum6InyRWVP+iZv7WvkY0BQ21up3m7OKEYf5htClCEJs6ssqxEH/KnwS2?= =?us-ascii?Q?HC7Rs2iHvYit8MH8mobpKcYIs0wc3Rvxlen5J9lr4cCwEZb0lVswWVpgleEN?= =?us-ascii?Q?MWqlhBpbN/3oBtJaJU6Dtbzh2rlIGOG2jeHSqeYaoUz64RLQNnygLTZeQP44?= =?us-ascii?Q?Nw/TXaTWPTdeZNDWnjym7250EavIDNV6NwJOR+i9X90/Oq5t+mWmF/0kIY60?= =?us-ascii?Q?keKV/ik2sBAKX5HlqFzhLKiliszjAL8uEJmFS6HamncTsFvcw2hAFgXahJkc?= =?us-ascii?Q?4Pqv/rLNgCFtsRuYgYWjucXpVOzNxlFGTvhSUJdqLuxA/V1CZQMr2Py6Dx6K?= =?us-ascii?Q?lESi3G9uWCnAKL8Sy4xv+o4Np/rapdGjN+RbLMN2IdHM00XIXFZIGvmyI6x+?= =?us-ascii?Q?k3ShEfixhMObFgKMN7lIzeCxKXn9LkjfBxDPK0LjZX2HG1f65xcGBj/E0NSS?= =?us-ascii?Q?b6RO2PNzKkeWYVwZpyq1ko8fd5yZtPCcRnFb+ZKnWx1ViNXGNhWW3kzmm1mt?= =?us-ascii?Q?gDCdlm4yCVG/srJJxtC3kDpg6nLWUoX21nTcyOjYftv9j97gjFWQKiHR+QoK?= =?us-ascii?Q?qBLkKxQtJ0Wm+qAxMaX6Z7/A+HakTK2yXHchoBC+JErNETBSC88lxdgMXrrK?= =?us-ascii?Q?nIXWvW+yNpn9ymhuRFD9vNv56o0NWOiwrLQ+Ms6TKRQq3zu2Vt8nTMowHMsU?= =?us-ascii?Q?0+MxTGxQeacZU1UGhvVhj3WoeFBb3fYuZadR0N6m02rifq+xoIZvhqgTvyCt?= =?us-ascii?Q?pwE9g7wg5N+nmKEV0QURAwa7FsmP0/M0SxOK6zGJfs/JZUwNPUxyRRWhIdqP?= =?us-ascii?Q?2ILdT+tGW8aQa1/tzkdmEmIKNfVH3/rPXh2P/5wKv8tXakwPdyUGb5ZIVpTx?= =?us-ascii?Q?jeXuil8pcrvcS/PHUt67XetbCzYeemiChA4sIXV1IFV9bpcdPzFWQOtMPpwv?= =?us-ascii?Q?Jl3SZCT0rUxrmsMKxOXo7HrCUrntaQaxFbzOyUhx/xmiLK/r/2mKbPfKx7RO?= =?us-ascii?Q?WuRPySJRro3Bl+6x5f5LH/1TCT+RFC2aDwEOrC0Kp7F4HVQxkTL64pahFzzx?= =?us-ascii?Q?KKY1rWLzWJolb0kT1eGO6NnJEzGAmpjhIcA/T8lzza/1GzTriQua8f+jcpTj?= =?us-ascii?Q?Nl1lKXUlw8SLZgU3w+KhCLZyWaSPsevNQ00RyqvBP1hKp8AeM+UngE1jnfcr?= =?us-ascii?Q?1NSFxvZgYytK7OP6hkY=3D?= Content-Type: multipart/alternative; boundary="_000_SN6PR11MB34084E09F19AD0C9F899975981B1ASN6PR11MB3408namp_" MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB3408.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e74ca19c-5f46-4027-75da-08dbe5f9e418 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Nov 2023 16:42:43.8897 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: jCLxMEPCuMvV8beGP+pi8KTLD6IQcnpIddjpnzqjlttnuR3ZpZtyK+q+1hyWa/khDffziqk1mbVOsBvJv3lxXQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR11MB8380 X-OriginatorOrg: intel.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org --_000_SN6PR11MB34084E09F19AD0C9F899975981B1ASN6PR11MB3408namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Acked-by: Kai Ji ________________________________ From: Power, Ciara Sent: 15 November 2023 16:14 To: dev@dpdk.org Cc: Kusztal, ArkadiuszX ; Power, Ciara ; stable@dpdk.org ; Ji, Kai Subject: [PATCH v2] crypto/qat: fix gen3 legacy capabilities When the legacy capability flag was enabled for QAT GEN3, in the case of the last legacy capability in the list being SM3 or SM4, when no slice is on the device, the loop continues instead of checking if the end of the legacy capbilities list has been met. To fix this, the check for the end of the legacy capabilities list is moved to the top of the loop, so it is detected when the last legacy element is SM and no SM slice exists. Fixes: cffb726b7797 ("crypto/qat: enable insecure algorithms") Cc: stable@dpdk.org Signed-off-by: Ciara Power --- v2: updating sender email --- drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c b/drivers/crypto/= qat/dev/qat_crypto_pmd_gen3.c index 0a939161f9..150f77ab0c 100644 --- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c +++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c @@ -232,6 +232,13 @@ qat_sym_crypto_cap_get_gen3(struct qat_cryptodev_priva= te *internals, } for (i =3D 0; i < capa_num; i++, iter++) { + if (unlikely(qat_legacy_capa) && (i =3D=3D legacy_capa_num)= ) { + capabilities =3D qat_sym_crypto_caps_gen3; + addr +=3D curr_capa; + curr_capa =3D 0; + iter =3D 0; + } + if (slice_map & ICP_ACCEL_MASK_SM4_SLICE && ( check_cipher_capa(&capabilities[iter], RTE_CRYPTO_CIPHER_SM4_ECB) || @@ -249,13 +256,6 @@ qat_sym_crypto_cap_get_gen3(struct qat_cryptodev_priva= te *internals, memcpy(addr + curr_capa, capabilities + iter, sizeof(struct rte_cryptodev_capabilities)); curr_capa++; - - if (unlikely(qat_legacy_capa) && (i =3D=3D legacy_capa_num-= 1)) { - capabilities =3D qat_sym_crypto_caps_gen3; - addr +=3D curr_capa; - curr_capa =3D 0; - iter =3D -1; - } } internals->qat_dev_capabilities =3D internals->capa_mz->addr; -- 2.25.1 --_000_SN6PR11MB34084E09F19AD0C9F899975981B1ASN6PR11MB3408namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable
Acked-by: Kai Ji <kai.j= i@intel.com>

From: Power, Ciara <ciar= a.power@intel.com>
Sent: 15 November 2023 16:14
To: dev@dpdk.org <dev@dpdk.org>
Cc: Kusztal, ArkadiuszX <arkadiuszx.kusztal@intel.com>; Power,= Ciara <ciara.power@intel.com>; stable@dpdk.org <stable@dpdk.org&g= t;; Ji, Kai <kai.ji@intel.com>
Subject: [PATCH v2] crypto/qat: fix gen3 legacy capabilities
 
When the legacy capability flag was enabled for QA= T GEN3,
in the case of the last legacy capability in the list being SM3 or SM4,
when no slice is on the device, the loop continues instead of checking
if the end of the legacy capbilities list has been met.

To fix this, the check for the end of the legacy capabilities list is
moved to the top of the loop, so it is detected when the last legacy
element is SM and no SM slice exists.

Fixes: cffb726b7797 ("crypto/qat: enable insecure algorithms") Cc: stable@dpdk.org

Signed-off-by: Ciara Power <ciara.power@intel.com>

---
v2: updating sender email
---
 drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c b/drivers/crypto/= qat/dev/qat_crypto_pmd_gen3.c
index 0a939161f9..150f77ab0c 100644
--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c
+++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c
@@ -232,6 +232,13 @@ qat_sym_crypto_cap_get_gen3(struct qat_cryptodev_priva= te *internals,
         }
 
         for (i =3D 0; i < capa_= num; i++, iter++) {
+            &n= bsp;  if (unlikely(qat_legacy_capa) && (i =3D=3D legacy_capa_n= um)) {
+            &n= bsp;          capabilities =3D= qat_sym_crypto_caps_gen3;
+            &n= bsp;          addr +=3D curr_c= apa;
+            &n= bsp;          curr_capa =3D 0;=
+            &n= bsp;          iter =3D 0;
+            &n= bsp;  }
+
            &nb= sp;    if (slice_map & ICP_ACCEL_MASK_SM4_SLICE &&am= p; (
            &nb= sp;            check= _cipher_capa(&capabilities[iter],
            &nb= sp;            =         RTE_CRYPTO_CIPHER_SM4_ECB) || @@ -249,13 +256,6 @@ qat_sym_crypto_cap_get_gen3(struct qat_cryptodev_priva= te *internals,
            &nb= sp;    memcpy(addr + curr_capa, capabilities + iter,
            &nb= sp;            sizeo= f(struct rte_cryptodev_capabilities));
            &nb= sp;    curr_capa++;
-
-            &n= bsp;  if (unlikely(qat_legacy_capa) && (i =3D=3D legacy_capa_n= um-1)) {
-            &n= bsp;          capabilities =3D= qat_sym_crypto_caps_gen3;
-            &n= bsp;          addr +=3D curr_c= apa;
-            &n= bsp;          curr_capa =3D 0;=
-            &n= bsp;          iter =3D -1;
-            &n= bsp;  }
         }
         internals->qat_dev_capa= bilities =3D internals->capa_mz->addr;
 
--
2.25.1

--_000_SN6PR11MB34084E09F19AD0C9F899975981B1ASN6PR11MB3408namp_--