From patchwork Thu Dec 14 03:04:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suanming Mou X-Patchwork-Id: 135179 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 EBAFF436E9; Thu, 14 Dec 2023 04:05:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8F06542FC3; Thu, 14 Dec 2023 04:05:19 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2043.outbound.protection.outlook.com [40.107.244.43]) by mails.dpdk.org (Postfix) with ESMTP id 8B7C842FA1 for ; Thu, 14 Dec 2023 04:05:17 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G/1LyGV29Ps+87EU07FDjceyHN/2FogMS4j9WxmGnphbEzXgXc5iAewWPoP5O3O8ZpCbgwSrT9Alqr6F9ee0r/Fkd7OuSmEtOwmya1CtKH+U5w1ghFM4m0a4KxN24LOEcMRekDtToK8+bko5O8zAJK6L57aS99RUq5wWSl3maoHC103vJmUdSB5J0M26qWleT47Tra0X9Y7q6jBXBqjTWH4ohMXWFAfx28ANxVP+ZavJvCxTXCfI/eg5TkOLNvfo774U9deHpyYkSaJ0nTT+bk4muC+DVG64Kzzo6Hs8WsOH67kqprxSvd93bc8uaqs3y/0g25fMCxM3wizKbVi4Mw== 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=NYfypAxp63p23biDtj5WlNB0/L84yhaecNDYciF2LPg=; b=DSuLjyTIHAIOIsnHz0/ZE+HSSLGNlkkkHIO8bqXrUzorLG1I2WVAsak8SdoC8aBPSEKueEs+QbWlIappEv67pilxFjJfzgn2neZuHCXCl1wihIttbiX3qfrD3STfQt5YUaTkc9Aru5BJixn6u2L3TWyOAJIRXQGEzdwSuBrf/Tk0i95Dm0MFSKpRinKyHHylsBrh/NQfhgxc7MypeYRWsiOLeMV+FXiquKJCG96HVDWzlJLubFFdE1B16PPqrYYUI76nazAqrkSEFBqafzSMJuFTK3Q1xNMIid+M5vcWVKUxuwZNL3FzKfuAUxB5GDvXZDRroIOd6d0h0r2Rfs8aZw== 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=NYfypAxp63p23biDtj5WlNB0/L84yhaecNDYciF2LPg=; b=R4fiZYQH23SHNLLcQYt6O//mkqd2nx5ccgwe09yeCzkIaxJVbqWtQo2oPVYZ6QAqtF3H2RTTIyZGaTdCydeVTf4j+H12v3iiT30MHF95CurK2GP5VqEduXAbmKmVXnGfFD/dXeE3Yea1LlZ8FXJ8t+Ye1uU7FBnvApQQB1BHwkHKX86qoX737wonAA5XExI6pY0zO5Odzp+9F4zLBs1Rnr7h+bFCFI8jpBxxhDuz/nIZK7Sadkzjgcl2T3++ARlmyMkveOFVPDr3c0Ximw9nKTPGR/C8CFcl9jmchy49koAKeHY1mLEEvk14zmEIZ8DfZlFUvNXsEo8FbfrosIDQLQ== Received: from SA0PR11CA0128.namprd11.prod.outlook.com (2603:10b6:806:131::13) by SN7PR12MB7372.namprd12.prod.outlook.com (2603:10b6:806:29b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.28; Thu, 14 Dec 2023 03:05:14 +0000 Received: from SN1PEPF0002BA4C.namprd03.prod.outlook.com (2603:10b6:806:131:cafe::fe) by SA0PR11CA0128.outlook.office365.com (2603:10b6:806:131::13) 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:14 +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 SN1PEPF0002BA4C.mail.protection.outlook.com (10.167.242.69) 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:14 +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:59 -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:56 -0800 From: Suanming Mou To: Dariusz Sosnowski , Viacheslav Ovsiienko , Ori Kam , Matan Azrad CC: , Subject: [PATCH 4/4] net/mlx5: add modify field action ADD fields validation Date: Thu, 14 Dec 2023 11:04:27 +0800 Message-ID: <20231214030428.363471-5-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: SN1PEPF0002BA4C:EE_|SN7PR12MB7372:EE_ X-MS-Office365-Filtering-Correlation-Id: 27e24eee-859b-45a5-429e-08dbfc517e64 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZECN3/Oxq0x6HpZVG7L7j1DGL5K2KXYRYnBrM27MSA4+RcvC8nEwA8/ztrNWC+bLbub5CenhmC4qyopA0jZH9t5IbBa9W2Z+P4zs2CSw5GrieijlDjhl6WWin6A33YTo28ZA07C26BTnBKael9JOQJ4ytaOmvrtOnDkhAWt1E/8RmRJwSzro3f9qpmg7TfPEzgWEgINcBLviBPbuxsaEaWygkOZOVG0c7aB0AHPlZeKeenWNhbii0E8K4NcdFaUAFa4KwjbLaXEVixXheDGjzSsY+Ce+2ZBsPz6cHXl3qZY+m5VoXTe2XABba+r302YZPMbFbt91L6YwoO8vaso7l6MFoiuFLF2bWR642h5UkN0MldIpBluHAVdmV+UL+hF2mXBdIpvPTSnvjrhofGi1Pp/Opa7khxuPLm4pzTaAKGsQQlq5P8bYQOPMz7F99e6VXSeDS5KxmRDhlYmv8V3HDz1IWzewU3qzwntPMmkZOVztwyT3O/uIwnjcSf4JLhTg+hM2CE5OwqhxETKKn4nidCjXkrKhp9a4u7/wN2tcfuvDXCtAytUEVfQhVpigf06+tyzSqFpPP54AMjCrsn1UKynLFHgflsUqht7QMqrWHdbtv+NYKWa1rOLL288nNrNu3N/ncOSqBHpjC2SxGE1Wrl5DR5n8XX9ywnr4K1uSZazXyqs3RjO3oedQDDDEw/NTG9T31zMJ4z0m+lqGjLFMGDr1sFoA7kL8sY0CUgUxfpY= 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)(136003)(396003)(346002)(376002)(39860400002)(230922051799003)(451199024)(1800799012)(82310400011)(64100799003)(186009)(40470700004)(46966006)(36840700001)(41300700001)(83380400001)(426003)(336012)(36860700001)(47076005)(7696005)(5660300002)(40480700001)(55016003)(478600001)(82740400003)(2906002)(6666004)(356005)(110136005)(54906003)(6636002)(316002)(70586007)(4326008)(8676002)(8936002)(70206006)(6286002)(16526019)(40460700003)(86362001)(107886003)(2616005)(7636003)(26005)(36756003)(1076003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2023 03:05:14.4545 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 27e24eee-859b-45a5-429e-08dbfc517e64 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: SN1PEPF0002BA4C.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7372 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 Due to HW limitation, not all the fields are available as ADD_FIELD destination. This commit adds the validation to the destinations. Signed-off-by: Suanming Mou Acked-by: Ori Kam --- doc/guides/rel_notes/release_24_03.rst | 4 ++++ drivers/net/mlx5/mlx5_flow_hw.c | 32 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst index e9c9717706..2c0e2930cc 100644 --- a/doc/guides/rel_notes/release_24_03.rst +++ b/doc/guides/rel_notes/release_24_03.rst @@ -55,6 +55,10 @@ New Features Also, make sure to start the actual text at the margin. ======================================================= +* **Updated NVIDIA mlx5 driver.** + + * Added support for accumulating from src field to dst field. + Removed Items ------------- diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index d224979ee8..c4a90a3690 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -4948,6 +4948,33 @@ flow_hw_modify_field_is_used(const struct rte_flow_action_modify_field *action, return action->src.field == field || action->dst.field == field; } +static bool +flow_hw_modify_field_is_add_dst_valid(const struct rte_flow_action_modify_field *conf) +{ + if (conf->operation != RTE_FLOW_MODIFY_ADD) + return true; + if (conf->src.field == RTE_FLOW_FIELD_POINTER || + conf->src.field == RTE_FLOW_FIELD_VALUE) + return true; + switch (conf->dst.field) { + case RTE_FLOW_FIELD_IPV4_TTL: + case RTE_FLOW_FIELD_IPV6_HOPLIMIT: + case RTE_FLOW_FIELD_TCP_SEQ_NUM: + case RTE_FLOW_FIELD_TCP_ACK_NUM: + case RTE_FLOW_FIELD_TAG: + case RTE_FLOW_FIELD_META: + case RTE_FLOW_FIELD_FLEX_ITEM: + case RTE_FLOW_FIELD_TCP_DATA_OFFSET: + case RTE_FLOW_FIELD_IPV4_IHL: + case RTE_FLOW_FIELD_IPV4_TOTAL_LEN: + case RTE_FLOW_FIELD_IPV6_PAYLOAD_LEN: + return true; + default: + break; + } + return false; +} + static int flow_hw_validate_action_modify_field(struct rte_eth_dev *dev, const struct rte_flow_action *action, @@ -5060,6 +5087,11 @@ flow_hw_validate_action_modify_field(struct rte_eth_dev *dev, return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, action, "MPLS cannot be used as destination"); + /* ADD_FIELD is not supported for all the fields. */ + if (!flow_hw_modify_field_is_add_dst_valid(action_conf)) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "invalid add_field destination"); return 0; } static int