From patchwork Tue Feb 6 12:17:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 136423 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E05A643A2D; Tue, 6 Feb 2024 13:18:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0101C410F6; Tue, 6 Feb 2024 13:18:28 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2071.outbound.protection.outlook.com [40.107.102.71]) by mails.dpdk.org (Postfix) with ESMTP id 2D33E410F6 for ; Tue, 6 Feb 2024 13:18:25 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Uzpdyb+jX400ihXrW22Q46+4oKE3TcfUe4y7vvj1WHELDVj1c9+uzwMvA4CqzxW1dAeu0/9zAkD/DZV83lwjIVeC8AtQHG2Hz+AiyBK68KQWoN4SvUctbbB9JDdqIFEHj9jPqapGen+vvoqMDLAc2kmhQs/DJwpfGnCL6Hv9gGU6U710QlwUXWabEMzTNYAEPhfC466UBLxSgc0Vz8aWzWoKhm5Oq1e+4PVKsRqRDwa5cfG/RPn5JEWWhuZDreb4Lc8GmAUKTEEsCvcG8QAqdJyjb4H4pPtlG1msU8+lEX6HyPElQy0Z8tPCaXD+H0WJK+N9NYMXGqyb6tuhxBVc/g== 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=WeqkOtKE8h02TT6qFzY1KqPkakpfYUwScw7PgW39y7Y=; b=V4UdjXRm03YZXSBjmUYcr1WGKmQKb5WzXTezTk7jiWlYXV2ID4Q5LRoUoQDBa5WgjpC48y5FfkWI7pOCqvUgfo9oS7gdvS3zf3mxGCd7h6OwI9woBxw8qnBvzV1fbLAo3tOwRcKkySrBqoE4VPtroCVn9aHWLpvJ2rmknb544pXhYRrJ3HaYNTnJadhKQUbjh9nyn1/U1EnIDo0nzlAjGXlC5cFZrP7fmaXmDEXOCw7fPsDb8GdH0di4qhG4igDfwnr6VIgvGtGa6lsZgHpKJ98AjGAVfqSsg9dqnWhuUziuegup6jHY/yfLsVWAWarJMOvB1kw1gH6LI1GKhkmATg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org 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 (0) 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=WeqkOtKE8h02TT6qFzY1KqPkakpfYUwScw7PgW39y7Y=; b=IJnTo6grrjY5L6UeX/0ebbzqoxQ9pmvAm8j0j+jiZ0X+JTvmu2+Pfz+Spotz1gNGKnApsi70afigKR2hdzF2MaFAt5TvDJty2Mlk45TaVSzudMbVcv7u1YpSCbLh/IpaygbH6ewUSGiWa5cIDohb9vRHMf8f9ayO4bqyZwHTY7imGGIM4P3+AvUEdYdDV8aUGGekFaWqM42uZcWciuIrSCSUDNs2W+uZIOVTYZOyPb3NsXKnuE1wC6tdUinWFXx4+8NTmlVQsr83ffknsWRB9odY7lT3WgrAt2XV5k0eKtP8eZJUD1qJi7zVcEOIO6T9fI4gi9Cbfk4o07YVNlRr5w== Received: from SJ0PR05CA0076.namprd05.prod.outlook.com (2603:10b6:a03:332::21) by SN7PR12MB7977.namprd12.prod.outlook.com (2603:10b6:806:340::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.14; Tue, 6 Feb 2024 12:18:23 +0000 Received: from CO1PEPF000044EE.namprd05.prod.outlook.com (2603:10b6:a03:332:cafe::2c) by SJ0PR05CA0076.outlook.office365.com (2603:10b6:a03:332::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.16 via Frontend Transport; Tue, 6 Feb 2024 12:18:22 +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 CO1PEPF000044EE.mail.protection.outlook.com (10.167.241.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.19 via Frontend Transport; Tue, 6 Feb 2024 12:18:22 +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.41; Tue, 6 Feb 2024 04:18:11 -0800 Received: from nvidia.com (10.126.231.35) 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.1258.12; Tue, 6 Feb 2024 04:18:09 -0800 From: Viacheslav Ovsiienko To: CC: , , , Subject: [PATCH 6/6] net/mlx5: add modify field action IPsec support Date: Tue, 6 Feb 2024 14:17:36 +0200 Message-ID: <20240206121736.27391-6-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20240206121736.27391-1-viacheslavo@nvidia.com> References: <20240206121736.27391-1-viacheslavo@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.35] 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: CO1PEPF000044EE:EE_|SN7PR12MB7977:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a96f4cd-a4f7-476c-d44a-08dc270db621 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wpapb4k1yVlf6BCQ81pCh6WpnEUeb4CWijQEUx5wS+E4Ab9L5aknzEF8WKbM1mCCJt/Cva1qcb2U3g7Eq8iJQDrLMNPqaoz5O4V8CJDjHqmARau4QZ/0xzpqGBFaFHHAkQuNNaxGZerchnMJ8St9alkMlelZjxF9J1pa7dg/AiCpmL1C7siUlVOHHb4we2Z6dZt8jPTkSeqHcY7SKhLG7HyXK1bTYDwjqGsuKg5TZVPpijS4EFDiCM3txW6GISDeZAu2s3Jby66C2K8vU2mOIqAmwsEFukrEy7euMep6reYWXTgKi5sRcQwbiJCTVzfrXqGghjLKfZrkaS0Aa9EJbTO6/DPwWHvpkQI0S9s12JamiEOE6WM7Tks/BODbINY5nnzMlihLFzQvGKgYL7kW20POZRJd8TXXkRjY86G2qbgUdU4e8FnMbomHsKNkxFtIXUtLCNuAldYMeVd/cldP0cfAej6/9elOHXzksiwkTbunifJn+7jAs5FssEj73ehXXn4hWCfk0VFDLJZ9JrX3fBQfETjKdZbEqZbVgFQ5dYwk9dTNZsCopWsIbN/LEYVce8/2OFrdGOkhVvMXI52AnwRwuqMSCKVN70b9yt/jNS5T6/V4kOhD50RbcEtU78Ey31tyCMvNaY3JTuM2duyr8TMcfd44G5BoNlexbIQLIq+9xLMU7EjzrreYpuNalnziBIrero9vJyQtVf6/d9jtJOSoqcfn2YykfeO20JHXlBIHJLLdQ6sTyd7YIf0f1xjr 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:(13230031)(4636009)(376002)(396003)(136003)(346002)(39860400002)(230922051799003)(1800799012)(64100799003)(82310400011)(451199024)(186009)(40470700004)(46966006)(36840700001)(55016003)(36756003)(40480700001)(40460700003)(478600001)(2906002)(107886003)(426003)(1076003)(47076005)(82740400003)(26005)(41300700001)(16526019)(336012)(6286002)(6916009)(2616005)(5660300002)(54906003)(7636003)(356005)(316002)(70206006)(4326008)(8936002)(6666004)(36860700001)(7696005)(8676002)(86362001)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 12:18:22.2558 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7a96f4cd-a4f7-476c-d44a-08dc270db621 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: CO1PEPF000044EE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7977 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 Add mlx5 PMD support for the IPsec fields: - RTE_FLOW_FIELD_ESP_SPI - SPI value in IPsec header - RTE_FLOW_FIELD_ESP_SEQ_NUM - sequence number in header - RTE_FLOW_FIELD_ESP_PROTO - next protocol value in trailer Signed-off-by: Viacheslav Ovsiienko --- doc/guides/rel_notes/release_24_03.rst | 3 +++ drivers/common/mlx5/mlx5_prm.h | 3 +++ drivers/net/mlx5/mlx5_flow_dv.c | 31 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst index 2f78009dd8..50e8476e59 100644 --- a/doc/guides/rel_notes/release_24_03.rst +++ b/doc/guides/rel_notes/release_24_03.rst @@ -96,6 +96,9 @@ New Features * Added HW steering support for modify field ``RTE_FLOW_FIELD_GENEVE_OPT_CLASS`` flow action. * Added HW steering support for modify field ``RTE_FLOW_FIELD_GENEVE_OPT_DATA`` flow action. * Added HW steering support for modify field ``RTE_FLOW_FIELD_IPV4_PROTO`` flow action. + * Added HW steering support for modify field ``RTE_FLOW_FIELD_ESP_SPI`` flow action. + * Added HW steering support for modify field ``RTE_FLOW_FIELD_ESP_SEQ_NUM`` flow action. + * Added HW steering support for modify field ``RTE_FLOW_FIELD_ESP_PROTO`` flow action. Removed Items diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 44413517d0..3150412580 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -854,6 +854,9 @@ enum mlx5_modification_field { MLX5_MODI_OUT_IPV6_PAYLOAD_LEN = 0x11E, MLX5_MODI_OUT_IPV4_IHL = 0x11F, MLX5_MODI_OUT_TCP_DATA_OFFSET = 0x120, + MLX5_MODI_OUT_ESP_SPI = 0x5E, + MLX5_MODI_OUT_ESP_SEQ_NUM = 0x82, + MLX5_MODI_OUT_IPSEC_NEXT_HDR = 0x126, MLX5_MODI_INVALID = INT_MAX, }; diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 764940b700..90413f4a38 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1414,7 +1414,11 @@ mlx5_flow_item_field_width(struct rte_eth_dev *dev, case RTE_FLOW_FIELD_GTP_TEID: case RTE_FLOW_FIELD_MPLS: case RTE_FLOW_FIELD_TAG: + case RTE_FLOW_FIELD_ESP_SPI: + case RTE_FLOW_FIELD_ESP_SEQ_NUM: return 32; + case RTE_FLOW_FIELD_ESP_PROTO: + return 8; case RTE_FLOW_FIELD_MARK: return rte_popcount32(priv->sh->dv_mark_mask); case RTE_FLOW_FIELD_META: @@ -2205,6 +2209,33 @@ mlx5_flow_field_id_to_modify_info else info[idx].offset = off_be; break; + case RTE_FLOW_FIELD_ESP_PROTO: + MLX5_ASSERT(data->offset + width <= 8); + off_be = 8 - (data->offset + width); + info[idx] = (struct field_modify_info){1, 0, MLX5_MODI_OUT_IPSEC_NEXT_HDR}; + if (mask) + mask[idx] = flow_modify_info_mask_8(width, off_be); + else + info[idx].offset = off_be; + break; + case RTE_FLOW_FIELD_ESP_SPI: + MLX5_ASSERT(data->offset + width <= 32); + off_be = 32 - (data->offset + width); + info[idx] = (struct field_modify_info){4, 0, MLX5_MODI_OUT_ESP_SPI}; + if (mask) + mask[idx] = flow_modify_info_mask_32(width, off_be); + else + info[idx].offset = off_be; + break; + case RTE_FLOW_FIELD_ESP_SEQ_NUM: + MLX5_ASSERT(data->offset + width <= 32); + off_be = 32 - (data->offset + width); + info[idx] = (struct field_modify_info){4, 0, MLX5_MODI_OUT_ESP_SEQ_NUM}; + if (mask) + mask[idx] = flow_modify_info_mask_32(width, off_be); + else + info[idx].offset = off_be; + break; case RTE_FLOW_FIELD_FLEX_ITEM: MLX5_ASSERT(data->flex_handle != NULL && !(data->offset & 0x7)); mlx5_modify_flex_item(dev, (const struct mlx5_flex_item *)data->flex_handle,