From patchwork Tue Dec 19 01:33:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suanming Mou X-Patchwork-Id: 135319 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 1EDC84373B; Tue, 19 Dec 2023 02:34:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C78742DA7; Tue, 19 Dec 2023 02:34:32 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2040.outbound.protection.outlook.com [40.107.93.40]) by mails.dpdk.org (Postfix) with ESMTP id 3E5BC402B1 for ; Tue, 19 Dec 2023 02:34:31 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kCdUDwT4jdEGXqMx+kazA9tIZbLrx6WAH6LY5YOONEZNlGHKLwgoi7oQimDV/v7Ky/HioSWXFv/VO70ZdN8rd6u5w3cdLpIsHwpK9/hHAzXEEBTFNjxVemrNy0lPRCUoZh+bURc52Bfh+o6/k8pBZqMbF/i3RkZ9o0Ajsca8mN7z3hFFsOEe/X+b3lYWp3rZaddcHYcaXZMej8CYHh7jOtIGBpjgMSnVtgiAhEETjiKe6LBfGyLRItk6uymVjPcpiR2fZNSdcBqKSMnJcwx8rvGQya9FtXibMzscj96u3hX4oOeHN2P8eiIW6nlr6PmDVvts4rkQ1sgipVRr40ZqXg== 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=J97NHNoSSIlVNCKpUaOIav35OPSIwdrQPqtidkk6ylM=; b=T9b1DvVqYjedKwmIgu4E7xuOPSjYcQKc7Md1E0cAu7og1m4ewh+DBFltH4K+5e3n3b/fWEJuamuhlguGjJdfiP1hOJMcsj8otQAyGYwqvhW59aKOZAxrPax3jC7DEb+L73qCyAK6WlQ8WHm61bsgRBtQUJhrPLvo1wihbppaD4br8sem1L/r+nSqZmSGbGwRQmDSfo/GQGMFC9f4XolycuY0pR8otWnusZFNxnkMjYQZDAcOkQOqnLOUAx809B3lE3cOR4LR9i1pNcVjaMjO22CuBHMmLAQBohX4MB3Dp26hIv6Dg3vC+rKffbR1Qs1RsiId/8tAlRvtL04Q2YFqAg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com 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=J97NHNoSSIlVNCKpUaOIav35OPSIwdrQPqtidkk6ylM=; b=Ftno+TIF9CHjWMddg1KagK5JVGFYgAi/FUNOr/wgeJmjmZ7cNkMUqGdZOt9a/xkVNFHd/gAGVLwkLQGya0k1TZh7LdKa2COa2Y8G63bY4XumwtWi3gcKFosd//n+7oOw08v2AJBv4s00N9oV6CYdeoQx9qCpwFWnUu4ZcdbkrUpnIqGLcdj5S4CV3dT7bZgORPfxIN4jtCQULu0BqTHItMVRrAvuHGjUlZY6VhhUfA4le69RG6SVeTC6scg2UqZw5DqHaYtA52rghp47WJJWGPtn3RTWoSUNPG8FrSxvJoZ5z4k09qAGcI+Nt3rOmmSDWyK8Q1jH0uF0IeZ0RdRShg== Received: from BN9PR03CA0224.namprd03.prod.outlook.com (2603:10b6:408:f8::19) by MW6PR12MB9017.namprd12.prod.outlook.com (2603:10b6:303:23b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.37; Tue, 19 Dec 2023 01:34:29 +0000 Received: from SA2PEPF000015CA.namprd03.prod.outlook.com (2603:10b6:408:f8:cafe::5d) by BN9PR03CA0224.outlook.office365.com (2603:10b6:408:f8::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.38 via Frontend Transport; Tue, 19 Dec 2023 01:34:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF000015CA.mail.protection.outlook.com (10.167.241.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.14 via Frontend Transport; Tue, 19 Dec 2023 01:34:28 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 18 Dec 2023 17:34:09 -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; Mon, 18 Dec 2023 17:34:04 -0800 From: Suanming Mou To: Ori Kam , Aman Singh , "Yuying Zhang" , Dariusz Sosnowski , Viacheslav Ovsiienko , Matan Azrad , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko CC: Subject: [PATCH v2 1/3] ethdev: rename action modify field data structure Date: Tue, 19 Dec 2023 09:33:35 +0800 Message-ID: <20231219013337.531548-2-suanmingm@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231219013337.531548-1-suanmingm@nvidia.com> References: <20231214031227.363911-1-suanmingm@nvidia.com> <20231219013337.531548-1-suanmingm@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015CA:EE_|MW6PR12MB9017:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ebdd132-7d03-40be-38c4-08dc0032a478 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rjtUBk4FFyFJVmzewYQcyoS3RUQt/xSzuv/jminacThX1rqGyml9jTtlyKPdfrZR5ubfey824JkEG5WakquBZP/SLbc72I2wXIHiqXhkrGFmKbUGwEytVWHCIFI2m9QoqFh/4vlf/yZCEGuFIZFU9GKjw9veAWPCHb9nalhsng11/NjR9zbedrF6NdeCz7ZogrCSdeXtkrzPxUCfoC+TQz0RlB5KFsvwEtFOijqVeDJEIpDEilVXz+cubdgnZc4nDhFWnX/bUIsvkrT6u5SL5758onrKwC0GjhZtrBpep8Tg7IJj6zlWqNdTmw7jBHA5Xh79OGT7DN0LMheGoyoNdhR2nwxNL3N+JwqQKNl/GghmIhHPaw+AcxROaLAMXvSkBa56ZDg5AbIXgOvm7vReqCiSB9ds8vlywnXXdqcZHHWSOMbLAi1y0riLVfRCGbbI4WSnWZqIJt4PuwAhF52578qQEA/SeU2tsTFzrhYOb1OHUMSx7a2SfXzyzf2goide6s++vLMAkVdG1e9Gm1t/z02wM2VBPNFJ+hcWMa+GY2xlvUBjTmrifEZdIr0+iMdTOh2YzW+pCyX70EDbmX+YMUEkFaNEcyKo/OHXS3vY/bRDtROsUgFovL8zTB+lyBPv2ANLEavYVQWGqj1Y0pUFUGfEP2iyq5Z9rgQy/hI3ZGNdeNgfBg0FddDpZc8i2cVqeeccoMQIk+4AbcU0VCpoVDE+IkWVpor92yWCoYLNh05JYiCmSCZ0T36M2fil5U9gwancoD2TEdPRs2CMCVjAi48BFnFlsRajWrmrYjqmpgs= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(376002)(39860400002)(396003)(136003)(230173577357003)(230273577357003)(230922051799003)(82310400011)(1800799012)(451199024)(64100799003)(186009)(40470700004)(36840700001)(46966006)(82740400003)(16526019)(6286002)(336012)(426003)(1076003)(2616005)(26005)(6666004)(7696005)(5660300002)(36860700001)(478600001)(83380400001)(2906002)(47076005)(4326008)(41300700001)(8676002)(8936002)(110136005)(70586007)(316002)(70206006)(356005)(7636003)(36756003)(86362001)(40460700003)(40480700001)(55016003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2023 01:34:28.6224 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5ebdd132-7d03-40be-38c4-08dc0032a478 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF000015CA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB9017 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 Current rte_flow_action_modify_data struct describes the pkt field perfectly and is used only in action. It is planned to be used for item as well. This commit renames it to "rte_flow_field_data" making it compatible to be used by item. Signed-off-by: Suanming Mou Acked-by: Ori Kam Acked-by: Andrew Rybchenko --- app/test-pmd/cmdline_flow.c | 2 +- doc/guides/prog_guide/rte_flow.rst | 2 +- drivers/net/mlx5/mlx5_flow.c | 4 ++-- drivers/net/mlx5/mlx5_flow.h | 6 +++--- drivers/net/mlx5/mlx5_flow_dv.c | 10 +++++----- lib/ethdev/rte_flow.h | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index ce71818705..3725e955c7 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -740,7 +740,7 @@ enum index { #define ITEM_RAW_SIZE \ (sizeof(struct rte_flow_item_raw) + ITEM_RAW_PATTERN_SIZE) -/** Maximum size for external pattern in struct rte_flow_action_modify_data. */ +/** Maximum size for external pattern in struct rte_flow_field_data. */ #define ACTION_MODIFY_PATTERN_SIZE 32 /** Storage size for struct rte_flow_action_modify_field including pattern. */ diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 627b845bfb..bf25c849fb 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -3171,7 +3171,7 @@ destination offset as ``48``, and provide immediate value ``0xXXXX85XX``. | ``width`` | number of bits to use | +---------------+-------------------------+ -.. _table_rte_flow_action_modify_data: +.. _table_rte_flow_field_data: .. table:: destination/source field definition diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 85e8c77c81..5788a7fb57 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -2493,7 +2493,7 @@ mlx5_validate_action_ct(struct rte_eth_dev *dev, * Validate the level value for modify field action. * * @param[in] data - * Pointer to the rte_flow_action_modify_data structure either src or dst. + * Pointer to the rte_flow_field_data structure either src or dst. * @param[out] error * Pointer to error structure. * @@ -2501,7 +2501,7 @@ mlx5_validate_action_ct(struct rte_eth_dev *dev, * 0 on success, a negative errno value otherwise and rte_errno is set. */ int -flow_validate_modify_field_level(const struct rte_flow_action_modify_data *data, +flow_validate_modify_field_level(const struct rte_flow_field_data *data, struct rte_flow_error *error) { if (data->level == 0) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 120609c595..8e2034473c 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1121,7 +1121,7 @@ flow_items_to_tunnel(const struct rte_flow_item items[]) * Tag array index. */ static inline uint8_t -flow_tag_index_get(const struct rte_flow_action_modify_data *data) +flow_tag_index_get(const struct rte_flow_field_data *data) { return data->tag_index ? data->tag_index : data->level; } @@ -2523,7 +2523,7 @@ int mlx5_flow_validate_action_default_miss(uint64_t action_flags, const struct rte_flow_attr *attr, struct rte_flow_error *error); int flow_validate_modify_field_level - (const struct rte_flow_action_modify_data *data, + (const struct rte_flow_field_data *data, struct rte_flow_error *error); int mlx5_flow_item_acceptable(const struct rte_flow_item *item, const uint8_t *mask, @@ -2828,7 +2828,7 @@ size_t flow_dv_get_item_hdr_len(const enum rte_flow_item_type item_type); int flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf, size_t *size, struct rte_flow_error *error); void mlx5_flow_field_id_to_modify_info - (const struct rte_flow_action_modify_data *data, + (const struct rte_flow_field_data *data, struct field_modify_info *info, uint32_t *mask, uint32_t width, struct rte_eth_dev *dev, const struct rte_flow_attr *attr, struct rte_flow_error *error); diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 1c3d557d4a..9627e124a9 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1446,7 +1446,7 @@ flow_modify_info_mask_32_masked(uint32_t length, uint32_t off, uint32_t post_mas } static __rte_always_inline enum mlx5_modification_field -mlx5_mpls_modi_field_get(const struct rte_flow_action_modify_data *data) +mlx5_mpls_modi_field_get(const struct rte_flow_field_data *data) { return MLX5_MODI_IN_MPLS_LABEL_0 + data->tag_index; } @@ -1454,7 +1454,7 @@ mlx5_mpls_modi_field_get(const struct rte_flow_action_modify_data *data) static void mlx5_modify_flex_item(const struct rte_eth_dev *dev, const struct mlx5_flex_item *flex, - const struct rte_flow_action_modify_data *data, + const struct rte_flow_field_data *data, struct field_modify_info *info, uint32_t *mask, uint32_t width) { @@ -1578,7 +1578,7 @@ mlx5_modify_flex_item(const struct rte_eth_dev *dev, void mlx5_flow_field_id_to_modify_info - (const struct rte_flow_action_modify_data *data, + (const struct rte_flow_field_data *data, struct field_modify_info *info, uint32_t *mask, uint32_t width, struct rte_eth_dev *dev, const struct rte_flow_attr *attr, struct rte_flow_error *error) @@ -5329,8 +5329,8 @@ flow_dv_validate_action_modify_field(struct rte_eth_dev *dev, struct mlx5_sh_config *config = &priv->sh->config; struct mlx5_hca_attr *hca_attr = &priv->sh->cdev->config.hca_attr; const struct rte_flow_action_modify_field *conf = action->conf; - const struct rte_flow_action_modify_data *src_data = &conf->src; - const struct rte_flow_action_modify_data *dst_data = &conf->dst; + const struct rte_flow_field_data *src_data = &conf->src; + const struct rte_flow_field_data *dst_data = &conf->dst; uint32_t dst_width, src_width, width = conf->width; ret = flow_dv_validate_action_modify_hdr(action_flags, action, error); diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index affdc8121b..40f6dcaacd 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -3910,9 +3910,9 @@ enum rte_flow_field_id { * @warning * @b EXPERIMENTAL: this structure may change without prior notice * - * Field description for MODIFY_FIELD action. + * Field description for packet field. */ -struct rte_flow_action_modify_data { +struct rte_flow_field_data { enum rte_flow_field_id field; /**< Field or memory type ID. */ union { struct { @@ -4021,8 +4021,8 @@ enum rte_flow_modify_op { */ struct rte_flow_action_modify_field { enum rte_flow_modify_op operation; /**< Operation to perform. */ - struct rte_flow_action_modify_data dst; /**< Destination field. */ - struct rte_flow_action_modify_data src; /**< Source field. */ + struct rte_flow_field_data dst; /**< Destination field. */ + struct rte_flow_field_data src; /**< Source field. */ uint32_t width; /**< Number of bits to use from a source field. */ };