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 CD9F945C16; Wed, 30 Oct 2024 17:53:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8CA7043451; Wed, 30 Oct 2024 17:53:33 +0100 (CET) Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2057.outbound.protection.outlook.com [40.107.103.57]) by mails.dpdk.org (Postfix) with ESMTP id 653F440299 for ; Wed, 30 Oct 2024 17:53:32 +0100 (CET) ARC-Seal: i=2; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=pass; b=SVla4Mal7K1hq52zyHYlrKKrKRQfBzz4/EA3R5SqoRH/+20ZRaOf91b6kylhMRIirbEA+kQqyd3j6cTHsGiXdoYOpD2XQ2YPdDm81i6qeoFPEshuQ/XIL5Y8py7+GS92EHV6IEkGtPBx2sZWB65C6hfJyN/6dFgsUeKVzqpF8eFuCm1SxhTCdpfyN/ouxn1g/7IFlmLseCDx8ODSavXSzxZWYRCFrR4p3SyLyjAiSKeQdm1TCvkDjnHR9fY3Dn6U8Uo7XzCKYClruNMYmYqpJOGLM+YHy9CzcA2Mux8YCY0FCCVDhzhHCJz+0UgJejUSlv2cyXT0OLQKDGwuomD9Cg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=6M6hcRJcqobCR1vT0l5IQ5kCxzk2ygzKZ2GvurW9wuE=; b=tL5jjfz6KXfKQ16kZFTozFWlccxYuM4UI+7OoLANv79DBnSm/T48AS3C9jdXcXdjhzAJhtJCsq2pUz95g+txVnhA5XmRwodfX338Znk8xlO409ryy1eZTFFGIHakd8RVacGYhQuFS8QSE+pLLQwIOrhsnxxAQAfGV+fYh9cthYqJO9XUnjblTEIS4RPf0Js4X/jESTI9jazdS6KRsJocBhJUcXwf4VhUGMQkGLQtBAwegfooZEWu/TocSsRp+X37ITrMiHjRpmnRzOQZcKILpi2t4L24dV4GjIrvNxggFw93nedf0V54oVvjBnao41q3o4M3GT8MqPA36R9HeIiEkQ== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=dpdk.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=arm.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arm.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6M6hcRJcqobCR1vT0l5IQ5kCxzk2ygzKZ2GvurW9wuE=; b=Wl4He5bbz9o0WDh1BGH8oZj0hdqloUogZ0KB5E0ofPe3jkPxLxR+JgCvagx2JL80oWFZJTDFRi9hb087rbv/NHSDxfSn/v8628obm7rL+5JqpYgy7cxrBmqTc/tO8u5CFr+R068ooEqrBhkreNY+7TPy2bqmtLBEESwdMRhywUI= Received: from DB7PR03CA0080.eurprd03.prod.outlook.com (2603:10a6:10:72::21) by AS8PR08MB6264.eurprd08.prod.outlook.com (2603:10a6:20b:29a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.32; Wed, 30 Oct 2024 16:53:29 +0000 Received: from DB1PEPF000509E2.eurprd03.prod.outlook.com (2603:10a6:10:72:cafe::ef) by DB7PR03CA0080.outlook.office365.com (2603:10a6:10:72::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.29 via Frontend Transport; Wed, 30 Oct 2024 16:53:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=arm.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB1PEPF000509E2.mail.protection.outlook.com (10.167.242.52) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8114.16 via Frontend Transport; Wed, 30 Oct 2024 16:53:28 +0000 Received: ("Tessian outbound 4f9bb016c0c5:v490"); Wed, 30 Oct 2024 16:53:28 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 063d005ce33093a4 X-TessianGatewayMetadata: P2imWVvOYGznrsxei/CmNFGQUf6U+xDatENbtfBNB9vMAr9zkWSGr4MUFYVJhezPRlM1E+f938223h1Vt3u7KlarLlW3Ew26vY6A/D2iLf7MCVjqi/WxlcTJmgQs+strsMl3uxi9PIyTKoad0wqfxXXq4ZFFdBzeMqemIWwc0FwqFc0EJ4DLXl7MJva//euOPDBMv8uEhgC0BTP6Qy1WuQ== X-CR-MTA-TID: 64aa7808 Received: from Lf984d52c6775.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id A5642167-1746-4698-967B-661DDDAC031A.1; Wed, 30 Oct 2024 16:53:21 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id Lf984d52c6775.1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Wed, 30 Oct 2024 16:53:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=j+B+J1dvJ8tT/aOO9XybepJtEwrVzi/Fs62EvwkbjU1jCi57FSRevBMAjQohATIcBxSNveZ/42W3c8EP8Udils5Dye8SsFjARHLiHHn5QuqA0106bEyJaLkVMjr58ron9D6SyT3yswEUHuyE1rWo9/3cPILrt9fVOzkkBXDi6AuSGOSYU1o3TQb1X1bI5r1lLJGZC9qjS0SfuoeNTBm3J1lIOxU0xmPf/rFdaaumuNf/1Bm+rkTrkrUYfka/BCUECIOMzGgA0A4S6Ti5CjA6HytordYXaKiQ10ifjKKJG6TUweMOvX+/WAm07cVHZ7d6CHZc2k/QpOY4xnHTXmhjzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=6M6hcRJcqobCR1vT0l5IQ5kCxzk2ygzKZ2GvurW9wuE=; b=teZTzPfeygha4ToeVrT8wWEiy8xNPrEOTsTb6Ffu3+9M29a7CraAnB6LWTq5hL+CPpyhtt/1R4vFGQnNL9NFhLxqNvQqEsa6KhYlL+fMOWjp0NP0Js/Ke6eo3A2cazwVSalTcuXn/jMtbJk35m1klWiMuC6Hq43+lDKFBdbLBKlobj5AsTEV1gWhW8qAsnWrEWmrQw1tVtCIwzmAYT7O96aGwflg0SJGb7ANXF60OSL9olROE6YfuoOvoRy6Hkz64Y9UHdSPBf3CS2cQmgS0TzGCfFnIx4i0DI8tVxIF67VqSastHnKPagSakCswVKlDXJbhSeD10quBPOuNKLd03A== 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=arm.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6M6hcRJcqobCR1vT0l5IQ5kCxzk2ygzKZ2GvurW9wuE=; b=Wl4He5bbz9o0WDh1BGH8oZj0hdqloUogZ0KB5E0ofPe3jkPxLxR+JgCvagx2JL80oWFZJTDFRi9hb087rbv/NHSDxfSn/v8628obm7rL+5JqpYgy7cxrBmqTc/tO8u5CFr+R068ooEqrBhkreNY+7TPy2bqmtLBEESwdMRhywUI= Received: from PAWPR08MB8909.eurprd08.prod.outlook.com (2603:10a6:102:33a::19) by GV1PR08MB10838.eurprd08.prod.outlook.com (2603:10a6:150:16a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.20; Wed, 30 Oct 2024 16:53:16 +0000 Received: from PAWPR08MB8909.eurprd08.prod.outlook.com ([fe80::613d:8d51:60e5:d294]) by PAWPR08MB8909.eurprd08.prod.outlook.com ([fe80::613d:8d51:60e5:d294%7]) with mapi id 15.20.8114.015; Wed, 30 Oct 2024 16:53:14 +0000 From: Wathsala Wathawana Vithanage To: Brian Dooley , Kai Ji , Pablo de Lara CC: "dev@dpdk.org" , "gakhil@marvell.com" , nd Subject: RE: [PATCH v3] crypto/ipsec_mb: bump minimum IPsec MB version Thread-Topic: [PATCH v3] crypto/ipsec_mb: bump minimum IPsec MB version Thread-Index: AQHbGv0MqdM83R5VtkKKuRkCH9kGQbKfoi6Q Date: Wed, 30 Oct 2024 16:53:14 +0000 Message-ID: References: <20241004145815.2275878-1-brian.dooley@intel.com> <20241010101313.3933073-1-brian.dooley@intel.com> In-Reply-To: <20241010101313.3933073-1-brian.dooley@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; x-ms-traffictypediagnostic: PAWPR08MB8909:EE_|GV1PR08MB10838:EE_|DB1PEPF000509E2:EE_|AS8PR08MB6264:EE_ X-MS-Office365-Filtering-Correlation-Id: 16eb3106-44f9-41ff-f322-08dcf90360dc x-checkrecipientrouted: true nodisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; ARA:13230040|366016|1800799024|376014|38070700018; X-Microsoft-Antispam-Message-Info-Original: =?us-ascii?Q?UoRa5yzJwwuJbGpKS7ATEBNWo1iyGtcW0OtzpkiVRBHVUvA5muRBoy4uTneX?= =?us-ascii?Q?Wfp/cxDnjsQiLasWwmQz7k6IfFo40bQfNQjiH5Bocf0KMe65ggx3tl66/KC0?= =?us-ascii?Q?oQV/3VO4KQKn7d6GLOAEBP7jgDkBVYz/XmUSTxTPlckCSfTV25xrAjvaw/f7?= =?us-ascii?Q?5ZG2m3BnxTrhBJ4wxrbb7t5EIBSvnQx3JHWaChn2/v9//FxmgTRGdZTtdLIK?= =?us-ascii?Q?JKBMJhWyAjnLRaQfmiZhYWBPXpha6FpkotbmZx5eoAo14HViv0LJT3jpKGvJ?= =?us-ascii?Q?M7oDT+JTPjs1nyYjp/EysTL7WoqQLa5Sj1u+YOyKZTgHbtJSxXm9yTOh3VX0?= =?us-ascii?Q?M9cXXfMd8J9hv+mOt8fe7yE8FyxIO5Jbl7o2LKZ+Lac+TMU1zCkABOYQgD4k?= =?us-ascii?Q?mD0zaev4PjJkVxmYLNaPnAmF4KH2ERH4DYuZT/EmGcy/WqP0117sGeDSQv8/?= =?us-ascii?Q?lV7oVpzcw6IwhzdBbaSRkBj+Ggc3i7D8YHlFkRFLNaQ/HflVaYy1PMWwNfRj?= =?us-ascii?Q?jORWbxDMSj/oMQDsjfkwx3DovsOsAe+xSyOL4ip1B2SxNeVjJDgFVBqizH5C?= =?us-ascii?Q?xIzPk5rTZMUj/zVynLk2raI5Se4+NSJedPxH9MDdrhtOo4jQUWeI5rK2jhGm?= =?us-ascii?Q?BU6vUsvzCWj0JWbVukZjh2+EMq0+FtoShWzG0xyCJu/PgLSy/Xrq1hiU+IiS?= =?us-ascii?Q?yXJdTZODSqxftGfI1O1pBEQlWWGZldNgQ6XcvfLrhFpXrNZozKigvN+J7gxf?= =?us-ascii?Q?FQSJgEKVNL8xMg9O6JfqQ8rV9f+sBSrAfk793gcxDTfDaHA4rKlR13TDFo0l?= =?us-ascii?Q?qV2LKut76mmM3fjU2mEwkEgssm9iJduoPJhmKSA85j6PNesi0akaWYLhQ2lj?= =?us-ascii?Q?u8ntI6Bxt1sXPgQZn/vOw+xLmgYHyzA0AQ4e2hjT2/dAJlQRgSeqsBdepGka?= =?us-ascii?Q?fcJWuo5yzLUDetRdxrfMSxUH2+FJS6eDSpZ+Rm0uqw8AyLER3bu/4vCE1hmK?= =?us-ascii?Q?+atHvfWTx6/L9xbs5FNZK/T7e08PmRUoZbU0MiHLIk/EqIpGCv9sms51AUKG?= =?us-ascii?Q?cZK9gCFIzmIr0EE+4Sf8RS2gEerbSQl5cCrBjOwuLMXTnHLhcDAsNTgPI3H0?= =?us-ascii?Q?FfY33FWlcimo3wNVBk++GBLfapnPFhslUW8I4qBc6vz8CKvWDbUkzb1uRGOf?= =?us-ascii?Q?obi8f6AcYQwmx43914v+fLZsFGm8mq9lMWJJxtMRF2nx1pLyFv4NAi++uaZn?= =?us-ascii?Q?V6Wzrt/OrgZAsJegrITF2mb24DwREApwwKRlHhzPNc9QZqAjmw5xqoW3Nb/k?= =?us-ascii?Q?iEjahz+34sbfDwfoBE3FP5GF?= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAWPR08MB8909.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(376014)(38070700018); DIR:OUT; SFP:1101; Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR08MB10838 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-SkipListedInternetSender: ip=[2603:10a6:102:33a::19]; domain=PAWPR08MB8909.eurprd08.prod.outlook.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB1PEPF000509E2.eurprd03.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: ee66c06c-a7cd-4ff7-9da6-08dcf903588e X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|35042699022|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?pIDfAku9XgFJN76AT5Gjx0OYFgjqztNOM/gRTyeK47HT7rp3S2xk5ftyhGYw?= =?us-ascii?Q?wDqR2r49gavpKDXVWRyO2gsglpUUEZ4WDvIAwyj+O3NdE/AhTbQhgxMYuRV4?= =?us-ascii?Q?SEHIBbSKcJEbduS7+2C7x1vTm+okzStXIUtP6fbPh2jBeH0+am7r1M3TPrY4?= =?us-ascii?Q?SaluMlFkOyIlxlMRbN6sy7Qfncv5YJhkpFDAp/LPHaaFzda0Ong6kmpX6/Am?= =?us-ascii?Q?G3p10OinRLQERx3w+Y2cNCGlNVvihtk3qgEQ7SjqqXr2eaU3ncwYVwO5hW8N?= =?us-ascii?Q?Nv0zeLhL4b0MHP3t2iRNHrJlsu7J1jy2d5zabEWECKM+6WGtrdVmnTeWFDaT?= =?us-ascii?Q?kPZzOU2IrZkOp9DNIgooOB87SUemhaIVbqsjMNekqVBiTFmQvrIU1AozcMQn?= =?us-ascii?Q?HXX5VPJqV1VBApSR558MOtqIJObkibD0KjEkr2UfRT+bugDgL88neQBL4ccT?= =?us-ascii?Q?7U3tpTc/i2jhPSFhW0yTe9yMFBHKb+UdcasIpEKgaVmcQBSWHoBWkAH8Rqc1?= =?us-ascii?Q?n37NCcSnPSO6YvyBr53x6USUEwGVrSRHoMFBhiiC+jnbZeMfZJ3DqaKsBmN2?= =?us-ascii?Q?mWb6NRMeLBS8x6F5KAJctTGztbJEqhf7ECKVA2vEO06ekN1+uXKiWOUluwwc?= =?us-ascii?Q?GZ4djuLrtR+W/jp1cG5EGRIhriWux28Z4brVE8K5zoFbwvRC1K9j5NIqh1WO?= =?us-ascii?Q?mTtum1HLlK86buYxa/fh5UZ0XCOw0b85Epox6N6Q49SyQFpKRS6kUj515lnQ?= =?us-ascii?Q?qeqvfBPUfSpuik0e6qXY/Zn2M13ZCbswhukdBhCRoJjuXHIqqxybmuJwt39w?= =?us-ascii?Q?35bmlJlv1z27LQHUufqNHwAGaOK5XWjyBsOiWIMVk89xTUtjtmB230U6Q6p9?= =?us-ascii?Q?aBI3rs08X3H/UnWsRR2v9xerQN2Vl4GaiD5MnpeWpT+bAAloPDN++UYN7TJJ?= =?us-ascii?Q?X6tP3ngsV+xPSqoAvEDfzfLoHJWOjVThkn0i8Rmm0lC835s+4TgC6YtZhySM?= =?us-ascii?Q?qcRk+ehJA7DoxxK9JUZrZ1gwoVobRQkScDuxP578djPAmNZWpIrSj1UoeWr8?= =?us-ascii?Q?xfRjHKQGx6pmSTZZGp1E05lzsUo2DYVTf8s+3WpJhp5kWJX2ZemEow6WrcWV?= =?us-ascii?Q?vmiZtpSrDZa10z8/K5Qj1Dd9HYNPE7W8Q8k0fg1Zd6OmQj5D80G45iMmC0mA?= =?us-ascii?Q?C7o3e+L5djMu5MflZkQDQBbQw1SiZibd+O97ORFyBltqXcCJAQ1DOZbOOrsA?= =?us-ascii?Q?c8Cq9Ia8mtSXtKLEAPl0isUFSuop0dHaOFqaEiD+M5ROhFLbxZTBVCY3ySqK?= =?us-ascii?Q?RB9GntLOS/IPFrPU7feY70lQwxJJUj2Nbk0IdQGr1mB2eSgnA2WkJcQXjq8k?= =?us-ascii?Q?GNNAjlI=3D?= X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(13230040)(1800799024)(36860700013)(376014)(35042699022)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2024 16:53:28.5078 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 16eb3106-44f9-41ff-f322-08dcf90360dc X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB1PEPF000509E2.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6264 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 v3] crypto/ipsec_mb: bump minimum IPsec MB version >=20 > AESNI_MB SW PMDs increment Intel IPsec MB version to 1.4. > A minimum IPsec Multi-buffer version of 1.4 or greater is now required fo= r the > 24.11 LTS release. >=20 > Signed-off-by: Brian Dooley > Acked-by: Kai Ji > Acked-by: Pablo de Lara Acked-by: Wathsala Vithanage > --- > This patch relates to a deprecation notice sent in the 24.03 release. > Intel IPsec MB minimum version being bumped to 1.4 for the 24.11 release. > https://patches.dpdk.org/project/dpdk/patch/20240314103731.3242086- > 2-brian.dooley@intel.com/ >=20 > v2: > Added release note > Remove more IMB_VERSION checks > v3: > Remove deprecation notice > --- > 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/deprecation.rst | 5 - > doc/guides/rel_notes/release_24_11.rst | 3 + > drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 24 -- > drivers/crypto/ipsec_mb/meson.build | 2 +- > drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 268 +------------------- > drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h | 9 - > 12 files changed, 19 insertions(+), 310 deletions(-) >=20 > diff --git a/doc/guides/cryptodevs/aesni_gcm.rst > b/doc/guides/cryptodevs/aesni_gcm.rst > index 3af1486553..7592d33da2 100644 > --- a/doc/guides/cryptodevs/aesni_gcm.rst > +++ b/doc/guides/cryptodevs/aesni_gcm.rst > @@ -74,7 +74,8 @@ and the external crypto libraries supported by them: > 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 > 20.11 - 21.08 Multi-buffer library 0.53 - 1.3 > - 21.11+ Multi-buffer library 1.0 - 1.5 > + 21.11 - 24.07 Multi-buffer library 1.0 - 1.5 > + 24.11+ 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 > Initialization > diff --git a/doc/guides/cryptodevs/aesni_mb.rst > b/doc/guides/cryptodevs/aesni_mb.rst > index ca930be1bd..16d82147b2 100644 > --- a/doc/guides/cryptodevs/aesni_mb.rst > +++ b/doc/guides/cryptodevs/aesni_mb.rst > @@ -137,7 +137,8 @@ and the Multi-Buffer library version supported by > them: > DPDK version Multi-buffer 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 > 20.11 - 21.08 0.53 - 1.3 > - 21.11+ 1.0 - 1.5 > + 21.11 - 24.07 1.0 - 1.5 > + 24.11+ 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 > Initialization > diff --git a/doc/guides/cryptodevs/chacha20_poly1305.rst > b/doc/guides/cryptodevs/chacha20_poly1305.rst > index 44cff85918..b5a980b247 100644 > --- a/doc/guides/cryptodevs/chacha20_poly1305.rst > +++ b/doc/guides/cryptodevs/chacha20_poly1305.rst > @@ -66,7 +66,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 - 24.07 Multi-buffer library 1.0 - 1.5 > + 24.11+ 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 > Initialization > diff --git a/doc/guides/cryptodevs/kasumi.rst > b/doc/guides/cryptodevs/kasumi.rst > index 4070f025e1..b57f18b56f 100644 > --- a/doc/guides/cryptodevs/kasumi.rst > +++ b/doc/guides/cryptodevs/kasumi.rst > @@ -80,7 +80,8 @@ and the external crypto libraries supported by them: > 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 > 20.02 - 21.08 Multi-buffer library 0.53 - 1.3 > - 21.11+ Multi-buffer library 1.0 - 1.5 > + 21.11 - 24.07 Multi-buffer library 1.0 - 1.5 > + 24.11+ 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 > Initialization > diff --git a/doc/guides/cryptodevs/snow3g.rst > b/doc/guides/cryptodevs/snow3g.rst > index 6eb8229fb5..fb4e0448ac 100644 > --- a/doc/guides/cryptodevs/snow3g.rst > +++ b/doc/guides/cryptodevs/snow3g.rst > @@ -89,7 +89,8 @@ and the external crypto libraries supported by them: > 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 > 20.02 - 21.08 Multi-buffer library 0.53 - 1.3 > - 21.11+ Multi-buffer library 1.0 - 1.5 > + 21.11 - 24.07 Multi-buffer library 1.0 - 1.5 > + 24.11+ 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 > Initialization > diff --git a/doc/guides/cryptodevs/zuc.rst b/doc/guides/cryptodevs/zuc.rs= t > index 29fe6279aa..4615562246 100644 > --- a/doc/guides/cryptodevs/zuc.rst > +++ b/doc/guides/cryptodevs/zuc.rst > @@ -88,7 +88,8 @@ and the external crypto libraries supported by them: > 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 > 20.02 - 21.08 Multi-buffer library 0.53 - 1.3 > - 21.11+ Multi-buffer library 1.0 - 1.5 > + 21.11 - 24.07 Multi-buffer library 1.0 - 1.5 > + 24.11+ 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 > Initialization > diff --git a/doc/guides/rel_notes/deprecation.rst > b/doc/guides/rel_notes/deprecation.rst > index 1535ea7abf..dd920bc3d7 100644 > --- a/doc/guides/rel_notes/deprecation.rst > +++ b/doc/guides/rel_notes/deprecation.rst > @@ -169,11 +169,6 @@ Deprecation Notices > * fib: A new flag field will be introduced in ``rte_fib_conf`` structure > in DPDK 24.11. This field will be used to pass extra configuration set= tings. >=20 > -* cryptodev: The Intel IPsec Multi-Buffer version will be bumped > - to a minimum version of v1.4. > - This will effect the KASUMI, SNOW3G, ZUC, AESNI GCM, AESNI MB and > CHACHAPOLY > - SW PMDs. > - > * eventdev: The single-event (non-burst) enqueue and dequeue operations, > used by static inline burst enqueue and dequeue functions in > ``rte_eventdev.h``, > will be removed in DPDK 23.11. > diff --git a/doc/guides/rel_notes/release_24_11.rst > b/doc/guides/rel_notes/release_24_11.rst > index 6a8ffe6f19..4430cf5b3a 100644 > --- a/doc/guides/rel_notes/release_24_11.rst > +++ b/doc/guides/rel_notes/release_24_11.rst > @@ -82,6 +82,9 @@ New Features > * Added support for SM3 algorithm. > * Added support for SM3 HMAC algorithm. > * Added support for SM4 CBC, SM4 ECB and SM4 CTR algorithms. > + * In 24.11 LTS release the Intel IPsec Multi-buffer version is bumped = to a > + minimum version of v1.4. This will effect the KASUMI, SNOW3G, ZUC, > + AESNI GCM, AESNI MB and CHACHAPOLY SW PMDs. >=20 > * **Updated openssl crypto driver.** >=20 > diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c > b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c > index ba899604d2..910efb1a97 100644 > --- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c > +++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c > @@ -11,8 +11,6 @@ >=20 > #include "ipsec_mb_private.h" >=20 > -#define IMB_MP_REQ_VER_STR "1.1.0" > - > /** Configure device */ > int > ipsec_mb_config(__rte_unused struct rte_cryptodev *dev, @@ -147,15 > +145,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 +204,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 +236,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 +251,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 +270,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,14 +311,9 @@ 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; > 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 a275ff0fe2..05dc1a039f 100644 > --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c > +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c > @@ -15,51 +15,6 @@ struct aesni_mb_op_buf_data { > uint32_t offset; > }; >=20 > -#if IMB_VERSION(1, 3, 0) >=3D IMB_VERSION_NUM > -/** > - * Calculate the authentication pre-computes > - * > - * @param one_block_hash Function pointer > - * to calculate digest on ipad/opad > - * @param ipad Inner pad output byte array > - * @param opad Outer pad output byte array > - * @param hkey Authentication key > - * @param hkey_len Authentication key length > - * @param blocksize Block size of selected hash algo > - */ > -static void > -calculate_auth_precomputes(hash_one_block_t one_block_hash, > - uint8_t *ipad, uint8_t *opad, > - const uint8_t *hkey, uint16_t hkey_len, > - uint16_t blocksize) > -{ > - uint32_t i, length; > - > - alignas(16) uint8_t ipad_buf[blocksize]; > - alignas(16) uint8_t opad_buf[blocksize]; > - > - /* Setup inner and outer pads */ > - memset(ipad_buf, HMAC_IPAD_VALUE, blocksize); > - memset(opad_buf, HMAC_OPAD_VALUE, blocksize); > - > - /* XOR hash key with inner and outer pads */ > - length =3D hkey_len > blocksize ? blocksize : hkey_len; > - > - for (i =3D 0; i < length; i++) { > - ipad_buf[i] ^=3D hkey[i]; > - opad_buf[i] ^=3D hkey[i]; > - } > - > - /* Compute partial hashes */ > - (*one_block_hash)(ipad_buf, ipad); > - (*one_block_hash)(opad_buf, opad); > - > - /* Clean up stack */ > - memset(ipad_buf, 0, blocksize); > - memset(opad_buf, 0, blocksize); > -} > -#endif > - > static inline int > is_aead_algo(IMB_HASH_ALG hash_alg, IMB_CIPHER_MODE cipher_mode) { > @@ -74,10 +29,6 @@ aesni_mb_set_session_auth_parameters(IMB_MGR > *mb_mgr, > struct aesni_mb_session *sess, > const struct rte_crypto_sym_xform *xform) { -#if > IMB_VERSION(1, 3, 0) >=3D IMB_VERSION_NUM > - hash_one_block_t hash_oneblock_fn =3D NULL; > - unsigned int key_larger_block_size =3D 0; > -#endif > uint8_t hashed_key[HMAC_MAX_BLOCK_SIZE] =3D { 0 }; > uint32_t auth_precompute =3D 1; >=20 > @@ -216,13 +167,9 @@ aesni_mb_set_session_auth_parameters(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"); > return -EINVAL; > } > @@ -273,24 +220,15 @@ > aesni_mb_set_session_auth_parameters(IMB_MGR *mb_mgr, > switch (xform->auth.algo) { > case RTE_CRYPTO_AUTH_MD5_HMAC: > sess->template_job.hash_alg =3D IMB_AUTH_MD5; -#if > IMB_VERSION(1, 3, 0) >=3D IMB_VERSION_NUM > - hash_oneblock_fn =3D mb_mgr->md5_one_block; > -#endif > break; > case RTE_CRYPTO_AUTH_SHA1_HMAC: > sess->template_job.hash_alg =3D IMB_AUTH_HMAC_SHA_1; -#if > IMB_VERSION(1, 3, 0) >=3D IMB_VERSION_NUM > - hash_oneblock_fn =3D mb_mgr->sha1_one_block; > -#endif > if (xform->auth.key.length > get_auth_algo_blocksize( > IMB_AUTH_HMAC_SHA_1)) { > IMB_SHA1(mb_mgr, > xform->auth.key.data, > xform->auth.key.length, > hashed_key); > -#if IMB_VERSION(1, 3, 0) >=3D IMB_VERSION_NUM > - key_larger_block_size =3D 1; > -#endif > } > break; > case RTE_CRYPTO_AUTH_SHA1: > @@ -299,18 +237,12 @@ > aesni_mb_set_session_auth_parameters(IMB_MGR *mb_mgr, > break; > case RTE_CRYPTO_AUTH_SHA224_HMAC: > sess->template_job.hash_alg =3D IMB_AUTH_HMAC_SHA_224; > -#if IMB_VERSION(1, 3, 0) >=3D IMB_VERSION_NUM > - hash_oneblock_fn =3D mb_mgr->sha224_one_block; > -#endif > if (xform->auth.key.length > get_auth_algo_blocksize( > IMB_AUTH_HMAC_SHA_224)) { > IMB_SHA224(mb_mgr, > xform->auth.key.data, > xform->auth.key.length, > hashed_key); > -#if IMB_VERSION(1, 3, 0) >=3D IMB_VERSION_NUM > - key_larger_block_size =3D 1; > -#endif > } > break; > case RTE_CRYPTO_AUTH_SHA224: > @@ -319,18 +251,12 @@ > aesni_mb_set_session_auth_parameters(IMB_MGR *mb_mgr, > break; > case RTE_CRYPTO_AUTH_SHA256_HMAC: > sess->template_job.hash_alg =3D IMB_AUTH_HMAC_SHA_256; > -#if IMB_VERSION(1, 3, 0) >=3D IMB_VERSION_NUM > - hash_oneblock_fn =3D mb_mgr->sha256_one_block; > -#endif > if (xform->auth.key.length > get_auth_algo_blocksize( > IMB_AUTH_HMAC_SHA_256)) { > IMB_SHA256(mb_mgr, > xform->auth.key.data, > xform->auth.key.length, > hashed_key); > -#if IMB_VERSION(1, 3, 0) >=3D IMB_VERSION_NUM > - key_larger_block_size =3D 1; > -#endif > } > break; > case RTE_CRYPTO_AUTH_SHA256: > @@ -339,18 +265,12 @@ > aesni_mb_set_session_auth_parameters(IMB_MGR *mb_mgr, > break; > case RTE_CRYPTO_AUTH_SHA384_HMAC: > sess->template_job.hash_alg =3D IMB_AUTH_HMAC_SHA_384; > -#if IMB_VERSION(1, 3, 0) >=3D IMB_VERSION_NUM > - hash_oneblock_fn =3D mb_mgr->sha384_one_block; > -#endif > if (xform->auth.key.length > get_auth_algo_blocksize( > IMB_AUTH_HMAC_SHA_384)) { > IMB_SHA384(mb_mgr, > xform->auth.key.data, > xform->auth.key.length, > hashed_key); > -#if IMB_VERSION(1, 3, 0) >=3D IMB_VERSION_NUM > - key_larger_block_size =3D 1; > -#endif > } > break; > case RTE_CRYPTO_AUTH_SHA384: > @@ -359,18 +279,12 @@ > aesni_mb_set_session_auth_parameters(IMB_MGR *mb_mgr, > break; > case RTE_CRYPTO_AUTH_SHA512_HMAC: > sess->template_job.hash_alg =3D IMB_AUTH_HMAC_SHA_512; > -#if IMB_VERSION(1, 3, 0) >=3D IMB_VERSION_NUM > - hash_oneblock_fn =3D mb_mgr->sha512_one_block; > -#endif > if (xform->auth.key.length > get_auth_algo_blocksize( > IMB_AUTH_HMAC_SHA_512)) { > IMB_SHA512(mb_mgr, > xform->auth.key.data, > xform->auth.key.length, > hashed_key); > -#if IMB_VERSION(1, 3, 0) >=3D IMB_VERSION_NUM > - key_larger_block_size =3D 1; > -#endif > } > break; > case RTE_CRYPTO_AUTH_SHA512: > @@ -412,25 +326,9 @@ aesni_mb_set_session_auth_parameters(IMB_MGR > *mb_mgr, > return 0; >=20 > /* Calculate Authentication precomputes */ -#if IMB_VERSION(1, 3, > 0) < IMB_VERSION_NUM > - imb_hmac_ipad_opad(mb_mgr, sess- > >template_job.hash_alg, > - xform->auth.key.data, xform- > >auth.key.length, > - sess->auth.pads.inner, sess- > >auth.pads.outer); > -#else > - if (key_larger_block_size) { > - calculate_auth_precomputes(hash_oneblock_fn, > - sess->auth.pads.inner, sess->auth.pads.outer, > - hashed_key, > - xform->auth.key.length, > - get_auth_algo_blocksize(sess- > >template_job.hash_alg)); > - } else { > - calculate_auth_precomputes(hash_oneblock_fn, > - sess->auth.pads.inner, sess->auth.pads.outer, > - xform->auth.key.data, > - xform->auth.key.length, > - get_auth_algo_blocksize(sess- > >template_job.hash_alg)); > - } > -#endif > + imb_hmac_ipad_opad(mb_mgr, sess->template_job.hash_alg, > + xform->auth.key.data, xform- > >auth.key.length, > + sess->auth.pads.inner, sess- > >auth.pads.outer); > sess->template_job.u.HMAC._hashed_auth_key_xor_ipad =3D > sess->auth.pads.inner; > sess->template_job.u.HMAC._hashed_auth_key_xor_opad =3D @@ - > 915,11 +813,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; > } > @@ -1052,9 +948,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); > @@ -1309,7 +1203,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, @@ -1394,7 > +1287,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, @@ -1464,9 +1356,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; > @@ -1494,13 +1384,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 { > @@ -1590,10 +1478,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; > @@ -1603,12 +1487,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) { > @@ -1649,9 +1531,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: > @@ -1676,9 +1556,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: > @@ -1874,13 +1752,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); > } > @@ -2200,7 +2076,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 uint16_t > aesni_mb_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops, > uint16_t nb_ops) > @@ -2333,144 +2208,7 @@ 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; > -} > - > -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; >=20 > - 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 6120a2f62d..468a1f35eb 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 > int > aesni_mb_session_configure(IMB_MGR * m __rte_unused, void *priv_sess, > @@ -580,13 +578,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, > @@ -843,9 +836,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