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 BF0D943C4B; Tue, 5 Mar 2024 16:13:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A3AC5402AF; Tue, 5 Mar 2024 16:13:12 +0100 (CET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2053.outbound.protection.outlook.com [40.107.6.53]) by mails.dpdk.org (Postfix) with ESMTP id 4CE6540271 for ; Tue, 5 Mar 2024 16:13:11 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SAJxMT3Pu8mPZgeE63EF06ETZEMk3nGG/YeijU/berB/KUCCUHMT4nQU03vwel49b2o2nC8TgNDCpbUPMoB1ol7H9t5neMTonQI7kjxs+Qn7LO9Uf6lhhvP4czxRRmp02VzXW3heCywZjNVBFgd8WXzxMLihQpKaI8upgBppc8Nng3n5u4YiFN4O4HYMoE2l/3vEXTdS+D5wlkx3Pges5hfZ+3ufD6jTIPf4DY8SrRsmEZ3gjJwEvFdxdZFtCoBR0i7syouP0WxOSHuR+W7G4/j0i8DTkCBR4aiiX34LsQvDwAarBc+/ir/lOuXJT34WK9oPKO5Qjb/mi63UThWrmQ== 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=0abMUm7mI6OX/OclJGrU/alg9WsSrLlmXxiRiCDkN04=; b=IzcZA0wdxgVdw9evvAjZBEuQauqSeW9xOXc0ps4lSDF1L7f7lbLshzHLUJWygRBQvdwBEjLhEJ05Xsvygz2WdgaaSQnMoJutjTTdJa/Dqng/fE0K1jQgqQ43d5Kd0tSwc89enIQ0r1NoiEbaj/PsVLiGe/xLH+6ZAcLkLl7RgsY3H4NmqUCCI2PCAFj4P4Q5N6r4C6Nn34PURZ+HX3fAaBKUqBL5MNLQICKOZGwHLw9Oshkk+ivZd0blgFEwe8zZwEJps+KEK4N/gqfWncNaYkRJmDLdGxrtrco3KUuPD9yJBLZhURb2cRmG9qodCEaE0jrfPMVxfEBekGqmC7c/OQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0abMUm7mI6OX/OclJGrU/alg9WsSrLlmXxiRiCDkN04=; b=Knlvhmtd9+RecC+fckb6mHcUEw0ug6IcSawbMLpV4kdc0qEj4tiYfa7UvyA/R1t0HdOT8OPnuXWr/wctkzPnZOhHULh4Mx45x23yQ/+ilkAelUPG2cj4sSoVtyDx2JWDfLJs9e90Se75ztP0v+K0BgfvfSA4HY63S7rsPV4AZ1Y= Received: from AM0PR08MB5073.eurprd08.prod.outlook.com (2603:10a6:208:15c::27) by PA4PR08MB6111.eurprd08.prod.outlook.com (2603:10a6:102:e3::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.37; Tue, 5 Mar 2024 15:13:09 +0000 Received: from AM0PR08MB5073.eurprd08.prod.outlook.com ([fe80::ae6d:f7e2:32d4:dd6a]) by AM0PR08MB5073.eurprd08.prod.outlook.com ([fe80::ae6d:f7e2:32d4:dd6a%5]) with mapi id 15.20.7339.035; Tue, 5 Mar 2024 15:13:09 +0000 From: Wathsala Wathawana Vithanage To: Sivaramakrishnan Venkat , Kai Ji , Pablo de Lara CC: "dev@dpdk.org" , "gakhil@marvell.com" , "ciara.power@intel.com" , Honnappa Nagarahalli , nd Subject: RE: [PATCH v4 1/2] crypto/ipsec_mb: bump minimum IPsec Multi-buffer version Thread-Topic: [PATCH v4 1/2] crypto/ipsec_mb: bump minimum IPsec Multi-buffer version Thread-Index: AQHaZlPwSX/qiF48IUuOF10Xm4jj57EpUlpw Date: Tue, 5 Mar 2024 15:13:09 +0000 Message-ID: References: <20240119114026.1552305-1-venkatx.sivaramakrishnan@intel.com> <20240223122908.3589264-1-venkatx.sivaramakrishnan@intel.com> In-Reply-To: <20240223122908.3589264-1-venkatx.sivaramakrishnan@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ts-tracking-id: AE937E5724FD1342BEA07772254A22E1.0 x-checkrecipientchecked: true authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: AM0PR08MB5073:EE_|PA4PR08MB6111:EE_ x-ms-office365-filtering-correlation-id: e79e35a8-e7a7-4b7c-c923-08dc3d26c48d nodisclaimer: true x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: +gKXZBOp+xoItOdmrKUPZujK59QUiS9xZoL6Mkr0tSp9ju8rCfIlI0aZ1s6ZJ3Viw3NTttLhMZRN+9/vTMA2X9jtC4qQe9jo7QO1OSdBU0rlqv7p7AXfKb0J3cCyBOVnThFMpwRINc1OOz3Ai34yhN3NdbPTyeAV/T17Qp8gh2jBCpz3S4nsU/L39lqXblusq97ce+Pk3Q6r/NcdA0pP5I6pRB6yObxHKEgp+ko6sYB0IBG/phdjxQ5tESZ5YXHJjJTyk2jQG6ZyK+hjMP0i61osGmvDgiDR1eLa6abkgdSwxIb2A9Oei8MrHsLga2rX1QrGkNc6dzbfKySTOCfglSoKh8J3F972oQG1O45Ydhakendu95Ea7uPXcPBSbbx6qudx6gWH6qs/37LHEUQa9MMGKxSMpDb0jYToKNq0Be//Erychxr5+OcNfrEIEPUVnE3plpx9rNMI0X03heMHnE/d1fg66x1GOiATItdXutAvW0WaZxCRosqIACXuWxzrTt27oHSK2fnbQ6/qU0IgvtP/E6ifLTtwXAzOtXh3xERscdnoTUKiS3XlRGP7QfP9SuE395EVfBtYeprYlOP1dfH3hfzF+x3Vd4v96MthTIRZPBluk1AYoI4kadciK4oVVt6H1FW1IxhQKzSPpi1d6Le7Fxgp6Z9pNma/0PgE1NWQDfy0OU+dNLwkw5lOWA+sbrqooN+DcVpv5mWRlcmThaERMonjVN/rNpg+t5hj29s= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR08MB5073.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(38070700009); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?liJCjPlS2N3OGsoXyy2Ea0eZau4AUbE6C9E4w1nlnBXVIUoOtomHYlA+sJDD?= =?us-ascii?Q?LSpl75c57reD+sMaF5KlTOA5j5KS0PjwXXWlUpycOnHic2IdIweRsMSCPHIk?= =?us-ascii?Q?z+ol1+m+wd6IkUIUH0cOlHYwLstp28Cik/fumXJyTwcbQeBEXbkVvDTgi/SL?= =?us-ascii?Q?48xahm//qbQTaOSRF4BOgFZPhI6l2xmYGk6LDSo8nmPe2CpYuPELNzN1btHY?= =?us-ascii?Q?BYGElagkrQ1zeEy3ITxLLDeDBspbcC999hckuNrtKDH751cLanj5pbk4jaV/?= =?us-ascii?Q?q11M2juicWq/KGH7OiGQpLZaOlNVeT/oUS4feunDo2CWfnFbxK3q2NR//dhk?= =?us-ascii?Q?LNzOObVMagIHxkjcdCKlwqvHQ8Oyx5h3T80DBQ84bKjpNLNTfHZYbmD0u0mU?= =?us-ascii?Q?xg1l71ntk3h/XP9M0F5FWi0Bx9LWb7waxcnSzeQHGFeCw0ncNTZnp/1TjY9o?= =?us-ascii?Q?szkrMPTjRJ+3EbvBD+hACOrFPlfcl33ieBA3xovazrr/94lYF6SYWIRyIFpS?= =?us-ascii?Q?9wA1U7WmYoskpY/qp4IWrHab0grDCN0Lq1fzwus5/Q6xoh8m6Lqo6e1m8pCL?= =?us-ascii?Q?tS+bq3S83xLtzn3OFL+XH0lN4CoMdXHmdF/e5bRu9jbFYcsnO4o68oW2LkST?= =?us-ascii?Q?TUtoGDQq1vMeiYqFAugrTklyZn1WveLBLIy5U0OO8/Nz38TbZ525us/FEx1p?= =?us-ascii?Q?xlWzfDHtqA7WPUQfKZ0fEAiZmz9IaMVU8s6YPGh9AZzLYCreRt9BNdfLdp/+?= =?us-ascii?Q?HBPhqx5JFnZbxi8o7tfN9cADvzik8ELRS2BqsBz6o/xxm9P4wnRDqr+beo0V?= =?us-ascii?Q?mAEA0oI/S5j4tULmmo8b+TBvhBrwfs/70u58ekNKwnGvsG9JGFLgKzkx2/7E?= =?us-ascii?Q?mOB2TeMBeQ7udqIPmHiV5rNnfgt9QxFS37rLmWYAHzvrq+ZTv1F6r+l2D24G?= =?us-ascii?Q?ip7dpPsMGCh9cxfDi3649a2n0jtTY5oba0tCDKc2nu0FEuq4ne5OonOoezfA?= =?us-ascii?Q?lMs05CPb2xZ5QJKTwEG92rVZiqedso+YNC7VvZcIpZtzOOsdNaB3hEibyLfg?= =?us-ascii?Q?mC5WeyJO5e8gBCOIblBhr+YGT4ps5lnVQBA4MpUcHZx5h6pu9AAzL1hDhrmI?= =?us-ascii?Q?KYxxAXEpIfPAFQ5nSTuLIuClw7mWH3euIhNE0uk6v+anUHs3QU0/f0KFQhYn?= =?us-ascii?Q?O8+pQjGLWkKlHaaHN2CRgIq+sxZ2UmnU7ipUZGlDHSYvvjZNZwepMDBpOtaK?= =?us-ascii?Q?vL6gQIXKKe6Mg9B9Yfhg+4axqFlOCkEiZf1qnXDcCoMa1mWCTUXng4Ig7ajw?= =?us-ascii?Q?chp5zPg5JVtYCMu6rPCKwEnwDQOHG2WWw2GY22lfZbKnKumhA2lhTQMBLY9x?= =?us-ascii?Q?H056YJhDMj4CpRNFo2/q15+4wqxiBABySgYMV2yREPy2H6b0z1hSzcy/ZbTg?= =?us-ascii?Q?hIkKfY3/qEQOWecyHvPQOcb3Vdfu1EyCkiiKN9sMAneieBkIluScoGOqAKJ8?= =?us-ascii?Q?sB/vfCjKCXD2ChYd02PKT3RYAG+pABVBCYxbN2Muq/HzUWJsM7cA02sSH0Y0?= =?us-ascii?Q?CWeu9zZyw2bdRzRL+xK0k+ZofykDKAp+iyt7k1dM?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AM0PR08MB5073.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e79e35a8-e7a7-4b7c-c923-08dc3d26c48d X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Mar 2024 15:13:09.5382 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: vHnNUlITV6RzJw9eljnpxUjqg9WrGzcrM86OP3ajMFVO+hUVo+zPOf3UQNNo3/HOqYAPCBYrsNPQXCLhLxi6XJrB2kT1qkigLV/8ATtqAPM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB6111 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 > Subject: [PATCH v4 1/2] crypto/ipsec_mb: bump minimum IPsec Multi-buffer > version >=20 > SW PMDs increment IPsec Multi-buffer version to 1.4. > A minimum IPsec Multi-buffer version of 1.4 or greater is now required. >=20 > Signed-off-by: Sivaramakrishnan Venkat > > Acked-by: Ciara Power > Acked-by: Pablo de Lara Acked-by: Wathsala Vithanage > --- > v4: > - 24.03 release notes updated to bump minimum IPSec Multi-buffer > version to 1.4 for SW PMDs. > v2: > - Removed unused macro in ipsec_mb_ops.c > - set_gcm_job() modified correctly to keep multi_sgl_job line > - Updated SW PMDs documentation for minimum IPSec Multi-buffer > version > - Updated commit message, and patch title. > --- > doc/guides/cryptodevs/aesni_gcm.rst | 3 +- > doc/guides/cryptodevs/aesni_mb.rst | 3 +- > doc/guides/cryptodevs/chacha20_poly1305.rst | 3 +- > doc/guides/cryptodevs/kasumi.rst | 3 +- > doc/guides/cryptodevs/snow3g.rst | 3 +- > doc/guides/cryptodevs/zuc.rst | 3 +- > doc/guides/rel_notes/release_24_03.rst | 4 + > drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 23 --- > drivers/crypto/ipsec_mb/meson.build | 2 +- > drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 165 -------------------- > drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h | 9 -- > 11 files changed, 17 insertions(+), 204 deletions(-) >=20 > diff --git a/doc/guides/cryptodevs/aesni_gcm.rst > b/doc/guides/cryptodevs/aesni_gcm.rst > index f5773426ee..dc665e536c 100644 > --- a/doc/guides/cryptodevs/aesni_gcm.rst > +++ b/doc/guides/cryptodevs/aesni_gcm.rst > @@ -85,7 +85,8 @@ and the external crypto libraries supported by them: > 18.05 - 19.02 Multi-buffer library 0.49 - 0.52 > 19.05 - 20.08 Multi-buffer library 0.52 - 0.55 > 20.11 - 21.08 Multi-buffer library 0.53 - 1.3* > - 21.11+ Multi-buffer library 1.0 - 1.5* > + 21.11 - 23.11 Multi-buffer library 1.0 - 1.5* > + 24.03+ Multi-buffer library 1.4 - 1.5* > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=20 > \* Multi-buffer library 1.0 or newer only works for Meson but not Make b= uild > system. > diff --git a/doc/guides/cryptodevs/aesni_mb.rst > b/doc/guides/cryptodevs/aesni_mb.rst > index b2e74ba417..5d670ee237 100644 > --- a/doc/guides/cryptodevs/aesni_mb.rst > +++ b/doc/guides/cryptodevs/aesni_mb.rst > @@ -146,7 +146,8 @@ and the Multi-Buffer library version supported by > them: > 19.05 - 19.08 0.52 > 19.11 - 20.08 0.52 - 0.55 > 20.11 - 21.08 0.53 - 1.3* > - 21.11+ 1.0 - 1.5* > + 21.11 - 23.11 1.0 - 1.5* > + 24.03+ 1.4 - 1.5* > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=20 > \* Multi-buffer library 1.0 or newer only works for Meson but not Make b= uild > system. > diff --git a/doc/guides/cryptodevs/chacha20_poly1305.rst > b/doc/guides/cryptodevs/chacha20_poly1305.rst > index 9d4bf86cf1..c32866b301 100644 > --- a/doc/guides/cryptodevs/chacha20_poly1305.rst > +++ b/doc/guides/cryptodevs/chacha20_poly1305.rst > @@ -72,7 +72,8 @@ and the external crypto libraries supported by them: > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > DPDK version Crypto library version > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > - 21.11+ Multi-buffer library 1.0-1.5* > + 21.11 - 23.11 Multi-buffer library 1.0-1.5* > + 24.03+ Multi-buffer library 1.4-1.5* > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=20 > \* Multi-buffer library 1.0 or newer only works for Meson but not Make b= uild > system. > diff --git a/doc/guides/cryptodevs/kasumi.rst > b/doc/guides/cryptodevs/kasumi.rst > index 0989054875..a8f4e6b204 100644 > --- a/doc/guides/cryptodevs/kasumi.rst > +++ b/doc/guides/cryptodevs/kasumi.rst > @@ -87,7 +87,8 @@ and the external crypto libraries supported by them: > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > 16.11 - 19.11 LibSSO KASUMI > 20.02 - 21.08 Multi-buffer library 0.53 - 1.3* > - 21.11+ Multi-buffer library 1.0 - 1.5* > + 21.11 - 23.11 Multi-buffer library 1.0 - 1.5* > + 24.03+ Multi-buffer library 1.4 - 1.5* > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=20 > \* Multi-buffer library 1.0 or newer only works for Meson but not Make b= uild > system. > diff --git a/doc/guides/cryptodevs/snow3g.rst > b/doc/guides/cryptodevs/snow3g.rst > index 3392932653..46863462e5 100644 > --- a/doc/guides/cryptodevs/snow3g.rst > +++ b/doc/guides/cryptodevs/snow3g.rst > @@ -96,7 +96,8 @@ and the external crypto libraries supported by them: > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > 16.04 - 19.11 LibSSO SNOW3G > 20.02 - 21.08 Multi-buffer library 0.53 - 1.3* > - 21.11+ Multi-buffer library 1.0 - 1.5* > + 21.11 - 23.11 Multi-buffer library 1.0 - 1.5* > + 24.03+ Multi-buffer library 1.4 - 1.5* > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=20 > \* Multi-buffer library 1.0 or newer only works for Meson but not Make b= uild > system. > diff --git a/doc/guides/cryptodevs/zuc.rst b/doc/guides/cryptodevs/zuc.rs= t > index a414b5ad2c..51867e1a16 100644 > --- a/doc/guides/cryptodevs/zuc.rst > +++ b/doc/guides/cryptodevs/zuc.rst > @@ -95,7 +95,8 @@ and the external crypto libraries supported by them: > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > 16.11 - 19.11 LibSSO ZUC > 20.02 - 21.08 Multi-buffer library 0.53 - 1.3* > - 21.11+ Multi-buffer library 1.0 - 1.5* > + 21.11 - 23.11 Multi-buffer library 1.0 - 1.5* > + 24.03+ Multi-buffer library 1.4 - 1.5* > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=20 > \* Multi-buffer library 1.0 or newer only works for Meson but not Make b= uild > system. > diff --git a/doc/guides/rel_notes/release_24_03.rst > b/doc/guides/rel_notes/release_24_03.rst > index 879bb4944c..9f4affb706 100644 > --- a/doc/guides/rel_notes/release_24_03.rst > +++ b/doc/guides/rel_notes/release_24_03.rst > @@ -138,6 +138,10 @@ New Features > to support TLS v1.2, TLS v1.3 and DTLS v1.2. > * Added PMD API to allow raw submission of instructions to CPT. >=20 > +* **Updated ipsec_mb crypto driver.** > + > + * Bump minimum IPSec Multi-buffer version to 1.4 for SW PMDs. > + >=20 > Removed Items > ------------- > diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c > b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c > index f21f9cc5a0..d25c671d7d 100644 > --- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c > +++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c > @@ -11,7 +11,6 @@ >=20 > #include "ipsec_mb_private.h" >=20 > -#define IMB_MP_REQ_VER_STR "1.1.0" >=20 > /** Configure device */ > int > @@ -147,15 +146,10 @@ ipsec_mb_qp_release(struct rte_cryptodev *dev, > uint16_t qp_id) > if (rte_eal_process_type() =3D=3D RTE_PROC_PRIMARY) { > rte_ring_free(rte_ring_lookup(qp->name)); >=20 > -#if IMB_VERSION(1, 1, 0) > IMB_VERSION_NUM > - if (qp->mb_mgr) > - free_mb_mgr(qp->mb_mgr); > -#else > if (qp->mb_mgr_mz) { > rte_memzone_free(qp->mb_mgr_mz); > qp->mb_mgr =3D NULL; > } > -#endif > rte_free(qp); > dev->data->queue_pairs[qp_id] =3D NULL; > } else { /* secondary process */ > @@ -211,7 +205,6 @@ static struct rte_ring > RING_F_SP_ENQ | RING_F_SC_DEQ); } >=20 > -#if IMB_VERSION(1, 1, 0) <=3D IMB_VERSION_NUM static IMB_MGR * > ipsec_mb_alloc_mgr_from_memzone(const struct rte_memzone > **mb_mgr_mz, > const char *mb_mgr_mz_name) > @@ -244,7 +237,6 @@ ipsec_mb_alloc_mgr_from_memzone(const struct > rte_memzone **mb_mgr_mz, > } > return mb_mgr; > } > -#endif >=20 > /** Setup a queue pair */ > int > @@ -260,12 +252,6 @@ ipsec_mb_qp_setup(struct rte_cryptodev *dev, > uint16_t qp_id, > int ret; >=20 > if (rte_eal_process_type() =3D=3D RTE_PROC_SECONDARY) { -#if > IMB_VERSION(1, 1, 0) > IMB_VERSION_NUM > - IPSEC_MB_LOG(ERR, "The intel-ipsec-mb version (%s) does > not support multiprocess," > - "the minimum version required for this > feature is %s.", > - IMB_VERSION_STR, IMB_MP_REQ_VER_STR); > - return -EINVAL; > -#endif > qp =3D dev->data->queue_pairs[qp_id]; > if (qp =3D=3D NULL) { > IPSEC_MB_LOG(DEBUG, "Secondary process setting > up device qp."); @@ -285,15 +271,11 @@ ipsec_mb_qp_setup(struct > rte_cryptodev *dev, uint16_t qp_id, > return -ENOMEM; > } >=20 > -#if IMB_VERSION(1, 1, 0) > IMB_VERSION_NUM > - qp->mb_mgr =3D alloc_init_mb_mgr(); > -#else > char mz_name[IPSEC_MB_MAX_MZ_NAME]; > snprintf(mz_name, sizeof(mz_name), "IMB_MGR_DEV_%d_QP_%d", > dev->data->dev_id, qp_id); > qp->mb_mgr =3D ipsec_mb_alloc_mgr_from_memzone(&(qp- > >mb_mgr_mz), > mz_name); > -#endif > if (qp->mb_mgr =3D=3D NULL) { > ret =3D -ENOMEM; > goto qp_setup_cleanup; > @@ -330,15 +312,10 @@ ipsec_mb_qp_setup(struct rte_cryptodev *dev, > uint16_t qp_id, > return 0; >=20 > qp_setup_cleanup: > -#if IMB_VERSION(1, 1, 0) > IMB_VERSION_NUM > - if (qp->mb_mgr) > - free_mb_mgr(qp->mb_mgr); > -#else > if (rte_eal_process_type() =3D=3D RTE_PROC_SECONDARY) > return ret; > if (qp->mb_mgr_mz) > rte_memzone_free(qp->mb_mgr_mz); > -#endif > rte_free(qp); > return ret; > } > diff --git a/drivers/crypto/ipsec_mb/meson.build > b/drivers/crypto/ipsec_mb/meson.build > index 87bf965554..0c988d7411 100644 > --- a/drivers/crypto/ipsec_mb/meson.build > +++ b/drivers/crypto/ipsec_mb/meson.build > @@ -7,7 +7,7 @@ if is_windows > subdir_done() > endif >=20 > -IMB_required_ver =3D '1.0.0' > +IMB_required_ver =3D '1.4.0' > IMB_header =3D '#include' > if arch_subdir =3D=3D 'arm' > IMB_header =3D '#include' > diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c > b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c > index 4de4866cf3..b93267f1c3 100644 > --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c > +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c > @@ -210,13 +210,9 @@ aesni_mb_set_session_auth_parameters(const > IMB_MGR *mb_mgr, > } > } else if (xform->auth.key.length =3D=3D 32) { > sess->template_job.hash_alg =3D > IMB_AUTH_ZUC256_EIA3_BITLEN; -#if IMB_VERSION(1, 2, 0) < > IMB_VERSION_NUM > if (sess->auth.req_digest_len !=3D 4 && > sess->auth.req_digest_len !=3D 8 && > sess->auth.req_digest_len !=3D 16) { - > #else > - if (sess->auth.req_digest_len !=3D 4) { > -#endif > IPSEC_MB_LOG(ERR, "Invalid digest size\n"); > return -EINVAL; > } > @@ -845,11 +841,9 @@ aesni_mb_session_configure(IMB_MGR *mb_mgr, > } > } >=20 > -#if IMB_VERSION(1, 3, 0) < IMB_VERSION_NUM > sess->session_id =3D imb_set_session(mb_mgr, &sess->template_job); > sess->pid =3D getpid(); > RTE_PER_LCORE(pid) =3D sess->pid; > -#endif >=20 > return 0; > } > @@ -982,9 +976,7 @@ aesni_mb_set_docsis_sec_session_parameters( > goto error_exit; > } >=20 > -#if IMB_VERSION(1, 3, 0) < IMB_VERSION_NUM > ipsec_sess->session_id =3D imb_set_session(mb_mgr, &ipsec_sess- > >template_job); -#endif >=20 > error_exit: > free_mb_mgr(mb_mgr); > @@ -1239,7 +1231,6 @@ imb_lib_support_sgl_algo(IMB_CIPHER_MODE alg) > return 0; > } >=20 > -#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM static inline int > single_sgl_job(IMB_JOB *job, struct rte_crypto_op *op, > int oop, uint32_t offset, struct rte_mbuf *m_src, @@ -1324,7 > +1315,6 @@ single_sgl_job(IMB_JOB *job, struct rte_crypto_op *op, > job->sgl_io_segs =3D sgl_segs; > return 0; > } > -#endif >=20 > static inline int > multi_sgl_job(IMB_JOB *job, struct rte_crypto_op *op, @@ -1394,9 +1384,7 > @@ set_gcm_job(IMB_MGR *mb_mgr, IMB_JOB *job, const uint8_t sgl, > job->msg_len_to_hash_in_bytes =3D 0; > job->msg_len_to_cipher_in_bytes =3D 0; > job->cipher_start_src_offset_in_bytes =3D 0; -#if > IMB_VERSION(1, 3, 0) < IMB_VERSION_NUM > imb_set_session(mb_mgr, job); > -#endif > } else { > job->hash_start_src_offset_in_bytes =3D > op->sym->aead.data.offset; > @@ -1424,13 +1412,11 @@ set_gcm_job(IMB_MGR *mb_mgr, IMB_JOB > *job, const uint8_t sgl, > job->src =3D NULL; > job->dst =3D NULL; >=20 > -#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM > if (m_src->nb_segs <=3D MAX_NUM_SEGS) > return single_sgl_job(job, op, oop, > m_offset, m_src, m_dst, > qp_data->sgl_segs); > else > -#endif > return multi_sgl_job(job, op, oop, > m_offset, m_src, m_dst, mb_mgr); > } else { > @@ -1520,10 +1506,6 @@ set_mb_job_params(IMB_JOB *job, struct > ipsec_mb_qp *qp, > uint8_t sgl =3D 0; > uint8_t lb_sgl =3D 0; >=20 > -#if IMB_VERSION(1, 3, 0) >=3D IMB_VERSION_NUM > - (void) pid; > -#endif > - > session =3D ipsec_mb_get_session_private(qp, op); > if (session =3D=3D NULL) { > op->status =3D RTE_CRYPTO_OP_STATUS_INVALID_SESSION; > @@ -1533,12 +1515,10 @@ set_mb_job_params(IMB_JOB *job, struct > ipsec_mb_qp *qp, > const IMB_CIPHER_MODE cipher_mode =3D > session->template_job.cipher_mode; >=20 > -#if IMB_VERSION(1, 3, 0) < IMB_VERSION_NUM > if (session->pid !=3D pid) { > memcpy(job, &session->template_job, sizeof(IMB_JOB)); > imb_set_session(mb_mgr, job); > } else if (job->session_id !=3D session->session_id) -#endif > memcpy(job, &session->template_job, sizeof(IMB_JOB)); >=20 > if (!op->sym->m_dst) { > @@ -1579,9 +1559,7 @@ set_mb_job_params(IMB_JOB *job, struct > ipsec_mb_qp *qp, > job->u.GCM.ctx =3D &qp_data->gcm_sgl_ctx; > job->cipher_mode =3D IMB_CIPHER_GCM_SGL; > job->hash_alg =3D IMB_AUTH_GCM_SGL; > -#if IMB_VERSION(1, 3, 0) < IMB_VERSION_NUM > imb_set_session(mb_mgr, job); > -#endif > } > break; > case IMB_AUTH_AES_GMAC_128: > @@ -1606,9 +1584,7 @@ set_mb_job_params(IMB_JOB *job, struct > ipsec_mb_qp *qp, > job->u.CHACHA20_POLY1305.ctx =3D &qp_data- > >chacha_sgl_ctx; > job->cipher_mode =3D > IMB_CIPHER_CHACHA20_POLY1305_SGL; > job->hash_alg =3D > IMB_AUTH_CHACHA20_POLY1305_SGL; -#if IMB_VERSION(1, 3, 0) < > IMB_VERSION_NUM > imb_set_session(mb_mgr, job); > -#endif > } > break; > default: > @@ -1804,13 +1780,11 @@ set_mb_job_params(IMB_JOB *job, struct > ipsec_mb_qp *qp, > if (lb_sgl) > return handle_sgl_linear(job, op, m_offset, session); >=20 > -#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM > if (m_src->nb_segs <=3D MAX_NUM_SEGS) > return single_sgl_job(job, op, oop, > m_offset, m_src, m_dst, > qp_data->sgl_segs); > else > -#endif > return multi_sgl_job(job, op, oop, > m_offset, m_src, m_dst, mb_mgr); > } > @@ -2130,7 +2104,6 @@ set_job_null_op(IMB_JOB *job, struct > rte_crypto_op *op) > return job; > } >=20 > -#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM static uint16_t > aesni_mb_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops, > uint16_t nb_ops) > @@ -2263,144 +2236,6 @@ aesni_mb_dequeue_burst(void *queue_pair, > struct rte_crypto_op **ops, >=20 > return processed_jobs; > } > -#else > - > -/** > - * Process a completed IMB_JOB job and keep processing jobs until > - * get_completed_job return NULL > - * > - * @param qp Queue Pair to process > - * @param mb_mgr IMB_MGR to use > - * @param job IMB_JOB job > - * @param ops crypto ops to fill > - * @param nb_ops number of crypto ops > - * > - * @return > - * - Number of processed jobs > - */ > -static unsigned > -handle_completed_jobs(struct ipsec_mb_qp *qp, IMB_MGR *mb_mgr, > - IMB_JOB *job, struct rte_crypto_op **ops, > - uint16_t nb_ops) > -{ > - struct rte_crypto_op *op =3D NULL; > - uint16_t processed_jobs =3D 0; > - > - while (job !=3D NULL) { > - op =3D post_process_mb_job(qp, job); > - > - if (op) { > - ops[processed_jobs++] =3D op; > - qp->stats.dequeued_count++; > - } else { > - qp->stats.dequeue_err_count++; > - break; > - } > - if (processed_jobs =3D=3D nb_ops) > - break; > - > - job =3D IMB_GET_COMPLETED_JOB(mb_mgr); > - } > - > - return processed_jobs; > -} > - > -static inline uint16_t > -flush_mb_mgr(struct ipsec_mb_qp *qp, IMB_MGR *mb_mgr, > - struct rte_crypto_op **ops, uint16_t nb_ops) > -{ > - int processed_ops =3D 0; > - > - /* Flush the remaining jobs */ > - IMB_JOB *job =3D IMB_FLUSH_JOB(mb_mgr); > - > - if (job) > - processed_ops +=3D handle_completed_jobs(qp, mb_mgr, job, > - &ops[processed_ops], nb_ops - > processed_ops); > - > - return processed_ops; > -} > - > -static uint16_t > -aesni_mb_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops, > - uint16_t nb_ops) > -{ > - struct ipsec_mb_qp *qp =3D queue_pair; > - IMB_MGR *mb_mgr =3D qp->mb_mgr; > - struct rte_crypto_op *op; > - IMB_JOB *job; > - int retval, processed_jobs =3D 0; > - pid_t pid =3D 0; > - > - if (unlikely(nb_ops =3D=3D 0 || mb_mgr =3D=3D NULL)) > - return 0; > - > - uint8_t digest_idx =3D qp->digest_idx; > - > - do { > - /* Get next free mb job struct from mb manager */ > - job =3D IMB_GET_NEXT_JOB(mb_mgr); > - if (unlikely(job =3D=3D NULL)) { > - /* if no free mb job structs we need to flush mb_mgr > */ > - processed_jobs +=3D flush_mb_mgr(qp, mb_mgr, > - &ops[processed_jobs], > - nb_ops - processed_jobs); > - > - if (nb_ops =3D=3D processed_jobs) > - break; > - > - job =3D IMB_GET_NEXT_JOB(mb_mgr); > - } > - > - /* > - * Get next operation to process from ingress queue. > - * There is no need to return the job to the IMB_MGR > - * if there are no more operations to process, since the > IMB_MGR > - * can use that pointer again in next get_next calls. > - */ > - retval =3D rte_ring_dequeue(qp->ingress_queue, (void **)&op); > - if (retval < 0) > - break; > - > - if (op->sess_type =3D=3D RTE_CRYPTO_OP_SECURITY_SESSION) > - retval =3D set_sec_mb_job_params(job, qp, op, > - &digest_idx); > - else > - retval =3D set_mb_job_params(job, qp, op, > - &digest_idx, mb_mgr, pid); > - > - if (unlikely(retval !=3D 0)) { > - qp->stats.dequeue_err_count++; > - set_job_null_op(job, op); > - } > - > - /* Submit job to multi-buffer for processing */ > -#ifdef RTE_LIBRTE_PMD_AESNI_MB_DEBUG > - job =3D IMB_SUBMIT_JOB(mb_mgr); > -#else > - job =3D IMB_SUBMIT_JOB_NOCHECK(mb_mgr); > -#endif > - /* > - * If submit returns a processed job then handle it, > - * before submitting subsequent jobs > - */ > - if (job) > - processed_jobs +=3D handle_completed_jobs(qp, > mb_mgr, > - job, &ops[processed_jobs], > - nb_ops - processed_jobs); > - > - } while (processed_jobs < nb_ops); > - > - qp->digest_idx =3D digest_idx; > - > - if (processed_jobs < 1) > - processed_jobs +=3D flush_mb_mgr(qp, mb_mgr, > - &ops[processed_jobs], > - nb_ops - processed_jobs); > - > - return processed_jobs; > -} > -#endif > static inline int > check_crypto_sgl(union rte_crypto_sym_ofs so, const struct rte_crypto_sg= l > *sgl) { diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h > b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h > index 85994fe5a1..51cfd7e2aa 100644 > --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h > +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h > @@ -17,9 +17,7 @@ > #define HMAC_IPAD_VALUE (0x36) > #define HMAC_OPAD_VALUE (0x5C) >=20 > -#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM #define MAX_NUM_SEGS > 16 -#endif >=20 > static const struct rte_cryptodev_capabilities aesni_mb_capabilities[] = =3D { > { /* MD5 HMAC */ > @@ -567,13 +565,8 @@ static const struct rte_cryptodev_capabilities > aesni_mb_capabilities[] =3D { > }, > .digest_size =3D { > .min =3D 4, > -#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM > .max =3D 16, > .increment =3D 4 > -#else > - .max =3D 4, > - .increment =3D 0 > -#endif > }, > .iv_size =3D { > .min =3D 16, > @@ -730,9 +723,7 @@ struct aesni_mb_qp_data { > * by the driver when verifying a digest provided > * by the user (using authentication verify operation) > */ > -#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM > struct IMB_SGL_IOV sgl_segs[MAX_NUM_SEGS]; -#endif > union { > struct gcm_context_data gcm_sgl_ctx; > struct chacha20_poly1305_context_data chacha_sgl_ctx; > -- > 2.25.1