From patchwork Thu Dec 14 03:04:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suanming Mou X-Patchwork-Id: 135176 X-Patchwork-Delegate: rasland@nvidia.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 04159436E9; Thu, 14 Dec 2023 04:05:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9D46742F57; Thu, 14 Dec 2023 04:05:10 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2041.outbound.protection.outlook.com [40.107.243.41]) by mails.dpdk.org (Postfix) with ESMTP id E941140283 for ; Thu, 14 Dec 2023 04:05:08 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wkq6p030lDiMzIYoNJuwl0xfyWAUMY7NzeMH5tyxm5u6v4fyXz7TwesnmwSQJiaXElkYfQwNUGTKl46kUk15Gwy8+uzoqyyf++fLRlSLeNQKaGam8vRJMA912eMjz7mF+ukdQBNOzq/MquwIVQLIybNACusKc8ZVkdR79e1bSrLi3bW/dgQjLAwkgOL8r+fZssEve0MHZAFny8ykUdgbxZ6p2XN2QFwPQBrS+WZLnrBqegKtSR8P3PE+hn+c8EB30xaWJCoPZlYlgDBWglZVtZHxuJJtuoDch6aPRANoMkUwpHEedQdLrPvkOJPFE62XTPgxXyd7k1gQFicPQHzKgA== 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=hAKQHv3pEl0ZK7BhzBL4KB1Obf1tS1IhRQQlZAJ/2iE=; b=O9shtfv6Y6JNTMCA0KlRudmYLj8rYnqKrVzUQEWQppGgvQWHDp6Din0vbQTSuxVAWn/2EiyCZbV0zz/45zCYmL0conJrLCYg2csMRTL7tpc7lwnFnuZsu8VNbcXUnE4AYvJiGNyuSzmsR/u0Uz+m5tKYgJKnwa6esQh4EmZtLyM28N4XKTA97XZBAUqyDHIahb/yAVFxJ7TqvoX50emDkIZXaH9s+rB0aM9WbeD6mcuMWWcHDgZsaY5h33jSyfM7vrgLd/5rNQGRC9rvFVdZxx5kNmTTEdNQOz9tlhOWbD8gX9g+Gos4EjeQ0AyK5vfdVNopad05TGMLPutBO2dQ+Q== 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=hAKQHv3pEl0ZK7BhzBL4KB1Obf1tS1IhRQQlZAJ/2iE=; b=Rp0veBoNFLIlxaFr+6hNm454TVtlNuRs54tDag+LWg5zMnZiomhZkURCAt509HNSF6amqQ/0rszrbKWs9B6NjhWXeXOWtzBqS6/9/kaBqc5BElGatau3Itx3ZhKclSGKH+GxujsL8SdJX5F+mNiDSmXhCu3Z8FIhve0oG8Q9kSJI1awdULsalEpvRGwPMh4bTSVrvQS9YaoNERPWOvGsIw+EpA9vXtr6MmNiBX/Y57CldjFIXWQDKAw08f6OpAzhp0neRcqd8Wn4jf7dCRTlA8CtfkWrTfvxTc6Kl+6eXDAUysRnLrFZ+Yus5BVk/pIAeNOUu5ANrawFamIYAzO6lQ== Received: from SN1PR12CA0104.namprd12.prod.outlook.com (2603:10b6:802:21::39) by SN7PR12MB8148.namprd12.prod.outlook.com (2603:10b6:806:351::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.26; Thu, 14 Dec 2023 03:05:04 +0000 Received: from SN1PEPF0002BA4B.namprd03.prod.outlook.com (2603:10b6:802:21:cafe::2e) by SN1PR12CA0104.outlook.office365.com (2603:10b6:802:21::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.26 via Frontend Transport; Thu, 14 Dec 2023 03:05:04 +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 SN1PEPF0002BA4B.mail.protection.outlook.com (10.167.242.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.26 via Frontend Transport; Thu, 14 Dec 2023 03:05:04 +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; Wed, 13 Dec 2023 19:04:49 -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.986.41; Wed, 13 Dec 2023 19:04:46 -0800 From: Suanming Mou To: Dariusz Sosnowski , Viacheslav Ovsiienko , Ori Kam , Matan Azrad CC: , Subject: [PATCH 1/4] net/mlx5: add TCP/IP length modify field Date: Thu, 14 Dec 2023 11:04:24 +0800 Message-ID: <20231214030428.363471-2-suanmingm@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214030428.363471-1-suanmingm@nvidia.com> References: <20231214030428.363471-1-suanmingm@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: SN1PEPF0002BA4B:EE_|SN7PR12MB8148:EE_ X-MS-Office365-Filtering-Correlation-Id: ccfaf790-6f7c-4653-0141-08dbfc517857 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n645XRlUKAMjQiR/bBAGM4s/+I6PANROIwGHYPOmzMI/tk2G8g8/qAkBHkuteOm3uOotzfcBa+LE5zoHiEHM9hAJrDqWmqqMggH2CPtYXcaR6yPxdAcu36uOVrY+sKCua0BXX28UVN/cb6+91pEJ0VhaY+W+aQUlwEFA7nWbmHcT+yrDoTSbn9fPEoqkkTYKinNKUSl1XUNZEGa0sIL7BNv3aGL2bniKilHQA8UmMz6nRAQ+c4ej7YgDF8TJ3BmbVZS+nu0zbAVB0/Y5G0eskfK6fU6mdoShMbqtAYL8JqOs/2+hAZroXUI0ESeX+G1bsrTIPep6IqWdXGOTt/kVVwKcYl4uL4/Mjx9C4lTjv4NgACzs4XzvBCAdPA89acHRgOBQpNWdcV44MxpfKROVsgdW33szry5ouHqNpRp53cvWjickSSvHWyL5YXhWyKOAiURh9A9TcYWxRR1dNyKZtFoSvlLfGrakcS1JavRDYzGdkif5G1lNLuHjDcLBbInz+dhPQbBMNS80YBmh3XzMxaFt/tC7OJH1rc87yVxO8/dZ/cB7bnpS4x81c10WjrFSJE1ZKzYAGdHgJcgC2A1L8Y+ceYc0MRV0OPsGfZzk+wideZXTSWDhRWCjnJz6byaOH1cmr1phu8Q1UwGxCX0OOL9vbwmkvn9xFgNY22wcq0Qx8H8ETDOzgF0o7UKrfY7lMFZgm4enmJmgsXmnk5M6wRnzEzyhilR9gC29rDV7rSoulWzYAXNy7gfNKh3yoebP 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)(396003)(136003)(39860400002)(346002)(376002)(230922051799003)(82310400011)(64100799003)(451199024)(1800799012)(186009)(40470700004)(46966006)(36840700001)(86362001)(36756003)(40480700001)(40460700003)(55016003)(6666004)(70206006)(70586007)(110136005)(7696005)(41300700001)(82740400003)(1076003)(356005)(16526019)(107886003)(336012)(26005)(6286002)(426003)(7636003)(83380400001)(47076005)(5660300002)(54906003)(2906002)(8676002)(478600001)(4326008)(36860700001)(8936002)(6636002)(316002)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2023 03:05:04.3169 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ccfaf790-6f7c-4653-0141-08dbfc517857 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: SN1PEPF0002BA4B.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8148 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 This commit adds TCP data offset, IPv4 total length, IPv4 IHL, IPv6 payload length in modify field operation. Signed-off-by: Suanming Mou Acked-by: Ori Kam Acked-by: Ori Kam --- drivers/common/mlx5/mlx5_prm.h | 4 ++++ drivers/net/mlx5/mlx5_flow_dv.c | 40 +++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 9e22dce6da..0d46ba9c40 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -848,6 +848,10 @@ enum mlx5_modification_field { MLX5_MODI_META_REG_C_13 = 0x94, MLX5_MODI_META_REG_C_14 = 0x95, MLX5_MODI_META_REG_C_15 = 0x96, + MLX5_MODI_OUT_IPV4_TOTAL_LEN = 0x11D, + MLX5_MODI_OUT_IPV6_PAYLOAD_LEN = 0x11E, + MLX5_MODI_OUT_IPV4_IHL = 0x11F, + MLX5_MODI_OUT_TCP_DATA_OFFSET = 0x120, MLX5_MODI_INVALID = INT_MAX, }; diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 115d730317..4e2095dcfe 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1664,6 +1664,16 @@ mlx5_flow_field_id_to_modify_info else info[idx].offset = off_be; break; + case RTE_FLOW_FIELD_IPV4_IHL: + MLX5_ASSERT(data->offset + width <= 4); + off_be = 4 - (data->offset + width); + info[idx] = (struct field_modify_info){1, 0, + MLX5_MODI_OUT_IPV4_IHL}; + if (mask) + mask[idx] = flow_modify_info_mask_8(width, off_be); + else + info[idx].offset = off_be; + break; case RTE_FLOW_FIELD_IPV4_DSCP: MLX5_ASSERT(data->offset + width <= 6); off_be = 6 - (data->offset + width); @@ -1674,6 +1684,16 @@ mlx5_flow_field_id_to_modify_info else info[idx].offset = off_be; break; + case RTE_FLOW_FIELD_IPV4_TOTAL_LEN: + MLX5_ASSERT(data->offset + width <= 16); + off_be = 16 - (data->offset + width); + info[idx] = (struct field_modify_info){2, 0, + MLX5_MODI_OUT_IPV4_TOTAL_LEN}; + if (mask) + mask[idx] = flow_modify_info_mask_16(width, off_be); + else + info[idx].offset = off_be; + break; case RTE_FLOW_FIELD_IPV4_TTL: MLX5_ASSERT(data->offset + width <= 8); off_be = 8 - (data->offset + width); @@ -1714,6 +1734,16 @@ mlx5_flow_field_id_to_modify_info else info[idx].offset = off_be; break; + case RTE_FLOW_FIELD_IPV6_PAYLOAD_LEN: + MLX5_ASSERT(data->offset + width <= 16); + off_be = 16 - (data->offset + width); + info[idx] = (struct field_modify_info){2, 0, + MLX5_MODI_OUT_IPV6_PAYLOAD_LEN}; + if (mask) + mask[idx] = flow_modify_info_mask_16(width, off_be); + else + info[idx].offset = off_be; + break; case RTE_FLOW_FIELD_IPV6_HOPLIMIT: MLX5_ASSERT(data->offset + width <= 8); off_be = 8 - (data->offset + width); @@ -1860,6 +1890,16 @@ mlx5_flow_field_id_to_modify_info else info[idx].offset = off_be; break; + case RTE_FLOW_FIELD_TCP_DATA_OFFSET: + MLX5_ASSERT(data->offset + width <= 4); + off_be = 4 - (data->offset + width); + info[idx] = (struct field_modify_info){1, 0, + MLX5_MODI_OUT_TCP_DATA_OFFSET}; + if (mask) + mask[idx] = flow_modify_info_mask_8(width, off_be); + else + info[idx].offset = off_be; + break; case RTE_FLOW_FIELD_UDP_PORT_SRC: MLX5_ASSERT(data->offset + width <= 16); off_be = 16 - (data->offset + width);