From patchwork Thu Dec 14 03:04:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suanming Mou X-Patchwork-Id: 135178 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 A1F92436E9; Thu, 14 Dec 2023 04:05:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5225442FA5; Thu, 14 Dec 2023 04:05:18 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2076.outbound.protection.outlook.com [40.107.223.76]) by mails.dpdk.org (Postfix) with ESMTP id 2C12042FA1 for ; Thu, 14 Dec 2023 04:05:16 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GClhreg4qSjlqU12sM96Iw08CvQtDS7BIABszcWANrQwZEKDYVk77vrRVqRSOYaIQ0j9HIzZG17TMIRhcQxRqj4H6TEn2KPlI1OBcW9m3+lZGGVEg1vTeOLIyzn9FJGE1LDys9RYTcmVlbygasPvVAfvSbFNvpEuaKdRwQOKdxdPYawewKoJYzHrSqF+Qbqi2Vq/5FNC5g7zmcheIZrK693uwR3QTqTYv2r7CHfyVTh264VAcUieNl7tMJEhlykSFJhBWXX+hs35EDcBRGNEbhejpSSCN5N/eyimuzFxCffvxPCrZAO+WLun9kH70kKy7Y+RgVR+q5rtCNR/bxAGlQ== 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=N/0dOSisnvfQpewLxFD2GJGN1cvXDs9Kx8TNdoLMz5Y=; b=aN0eQw/vwUfdsXKJRlK9vI6V9xTavw3Y9MNjP3mD8M8f4+mgYpQWy3kGmjLgxzJqS8TlY3TcalCoVlEX0qfvVCpmwGr6kynGbwrObCPC+d0sCMIY4Wum2K7EZQygSgEH6ITuUiQVKtpJGpFzxLtMB+py+9STGyAagTGcLm68xOdqMCA/3hUV0DDESIYrlrKiCyPbrSob9rr7o+yebKUXrZAloLmqdLqNW2hVcpb+gMQs8efRfh/aGghUv4VD1gX3qrGG2ba+HSZkNWIa9UG8RdmFto0OG5zvBXkT2MPKiT+NOuMBJ2p4vQERCy6Mf8P3/YfLo3kjklJjaEuHnQcslg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=N/0dOSisnvfQpewLxFD2GJGN1cvXDs9Kx8TNdoLMz5Y=; b=S2Bw2CJT4+dsAg8myWN5lfivBiXLDFn8QHfcJJpeyCmRhR0ouuZ01vTDb5QM+c2F9YsACPwxRJ+LxrzqBbZh02Cmmc+6VCJNidwkDNBg7NHK9zPEc+SFikdIIJR/0PTckqO2BB/a6BNM4vp8TyLqzCnaI/euZbOAnEMfInr0zCLSda2QKSFiQZ7o4ihc6r/oHa+7M/PzPjZXxRQUbrbSlHKn8LlLwGFDrY8Wcak8KKoAdspcyXEX2Z5inqi9geRE1D2kdstSnHtm7jo5Wm4erzXtMLBQJknEIO+WIQO2qKV9GgR3xtZs2hwITdIFpYiQfKE4iRZri/y1dGa9YpnnlQ== Received: from CH5P220CA0015.NAMP220.PROD.OUTLOOK.COM (2603:10b6:610:1ef::9) by SA0PR12MB4560.namprd12.prod.outlook.com (2603:10b6:806:97::17) 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:13 +0000 Received: from DS2PEPF0000343A.namprd02.prod.outlook.com (2603:10b6:610:1ef:cafe::4c) by CH5P220CA0015.outlook.office365.com (2603:10b6:610:1ef::9) 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:12 +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 DS2PEPF0000343A.mail.protection.outlook.com (10.167.18.37) 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:12 +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; Wed, 13 Dec 2023 19:04:52 -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:49 -0800 From: Suanming Mou To: Dariusz Sosnowski , Viacheslav Ovsiienko , Ori Kam , Matan Azrad CC: , Subject: [PATCH 2/4] net/mlx5: rename modify copy destination to destination Date: Thu, 14 Dec 2023 11:04:25 +0800 Message-ID: <20231214030428.363471-3-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: DS2PEPF0000343A:EE_|SA0PR12MB4560:EE_ X-MS-Office365-Filtering-Correlation-Id: 25fa9771-15bc-4fe6-d57c-08dbfc517d52 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nJwDez9g5cI6WvdRIJKK9jFuq2OPNr05TSDn0Zo2K8g5OIIY+2Te+wrkiE80mudzTVxmvN9xdbD/MJ2A44yXkPrVHbEw0b5WSLO0wGJkLQ0alHBrOgmUyFM8QKt9BldhtwgHnsYx3baTsXGUI+mwbmMKV8lrLHs636lDR7UsHjIP06Lc+qbSIDiw6iLxSbU223dT1h/j6MhmXGuOvbod+VS+AHpVrbz+tmStJ5AdSrMIrarlHNPkV/tJ6vT80BOE78UUdfy3ifUguD8pZdtAUKIkwWAmOj+NVDDkftxdTsu/CKA8aB38B9nOi4sbSuyh95yZx/GSOCplPvRnV6ypYArmGIgHOec5Nyl04Oq1dcyXmy/+UO9esRVT9uvkykndos5vdk2tt6enAvR+35F0eyiSGPx3/5cNDD6CA0Q4/YH12wIUkOENBrUSJDFoxwa2ivO/0/VK720xyd9Mx2GLwBtBNUX1Sj4Ue/kFzf/uC+L7xvx79vn1vQkE7S604XsEqdrMdvQzbnt1V/YxBTiriq+28ZCNhZKTdNaTW+FUzAAcQOaZAdugTOE2OOM2bYwFhuXfgBXR0+3MtcmX6eV++A7OvYBFXqq0+3eu+yKuKoMClxZgi8vCoxTA0dw1W2jJu2IneSMZ+v7+ME6vwfADqu1b0seRHo4TIFeOOOOfcY/hLcBB0iwsFOxVVOr+E1VdZwxGuIlIIqZ+EHxrNNEn78XbDBvbC77E4Ec3EHW3bCT5CV/oaismNue2tnaV6Di4 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)(396003)(39860400002)(136003)(230922051799003)(1800799012)(451199024)(82310400011)(186009)(64100799003)(40470700004)(46966006)(36840700001)(40460700003)(107886003)(1076003)(2616005)(26005)(336012)(16526019)(6286002)(6666004)(7696005)(426003)(47076005)(36860700001)(83380400001)(2906002)(5660300002)(41300700001)(70586007)(478600001)(70206006)(8936002)(8676002)(4326008)(6636002)(54906003)(110136005)(316002)(82740400003)(356005)(7636003)(86362001)(36756003)(55016003)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2023 03:05:12.6782 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 25fa9771-15bc-4fe6-d57c-08dbfc517d52 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: DS2PEPF0000343A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4560 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 In the mlx5_flow_field_id_to_modify_info() function, for the coming new ADD_FILED operation will also use that dcopy as ADD_FIELD's destination. This commit renames the dcopy to dest which makes things much clearer. Signed-off-by: Suanming Mou Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_flow.h | 2 +- drivers/net/mlx5/mlx5_flow_dv.c | 34 +++++++++++++++++---------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 6dde9de688..120609c595 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -2834,7 +2834,7 @@ void mlx5_flow_field_id_to_modify_info const struct rte_flow_attr *attr, struct rte_flow_error *error); int flow_dv_convert_modify_action(struct rte_flow_item *item, struct field_modify_info *field, - struct field_modify_info *dcopy, + struct field_modify_info *dest, struct mlx5_flow_dv_modify_hdr_resource *resource, uint32_t type, struct rte_flow_error *error); diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 4e2095dcfe..272dbca00f 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -363,8 +363,10 @@ mlx5_update_vlan_vid_pcp(const struct rte_flow_action *action, * For MLX5_MODIFICATION_TYPE_SET specifies destination field. * For MLX5_MODIFICATION_TYPE_ADD specifies destination field. * For MLX5_MODIFICATION_TYPE_COPY specifies source field. - * @param[in] dcopy - * Destination field info for MLX5_MODIFICATION_TYPE_COPY in @type. + * For MLX5_MODIFICATION_TYPE_ADD_FIELD specifies source field. + * @param[in] dest + * Destination field info for MLX5_MODIFICATION_TYPE_COPY and + * MLX5_MODIFICATION_TYPE_ADD_FIELD in @type. * Negative offset value sets the same offset as source offset. * size field is ignored, value is taken from source field. * @param[in,out] resource @@ -380,7 +382,7 @@ mlx5_update_vlan_vid_pcp(const struct rte_flow_action *action, int flow_dv_convert_modify_action(struct rte_flow_item *item, struct field_modify_info *field, - struct field_modify_info *dcopy, + struct field_modify_info *dest, struct mlx5_flow_dv_modify_hdr_resource *resource, uint32_t type, struct rte_flow_error *error) { @@ -401,7 +403,7 @@ flow_dv_convert_modify_action(struct rte_flow_item *item, uint32_t mask; uint32_t data; bool next_field = true; - bool next_dcopy = true; + bool next_dest = true; if (i >= MLX5_MAX_MODIFY_NUM) return rte_flow_error_set(error, EINVAL, @@ -432,20 +434,20 @@ flow_dv_convert_modify_action(struct rte_flow_item *item, 0 : size_b, }; if (type == MLX5_MODIFICATION_TYPE_COPY) { - MLX5_ASSERT(dcopy); - actions[i].dst_field = dcopy->id; + MLX5_ASSERT(dest); + actions[i].dst_field = dest->id; actions[i].dst_offset = - (int)dcopy->offset < 0 ? off_b : dcopy->offset; + (int)dest->offset < 0 ? off_b : dest->offset; /* Convert entire record to big-endian format. */ actions[i].data1 = rte_cpu_to_be_32(actions[i].data1); /* * Destination field overflow. Copy leftovers of * a source field to the next destination field. */ - if ((size_b > dcopy->size * CHAR_BIT - dcopy->offset) && - dcopy->size != 0) { + if ((size_b > dest->size * CHAR_BIT - dest->offset) && + dest->size != 0) { actions[i].length = - dcopy->size * CHAR_BIT - dcopy->offset; + dest->size * CHAR_BIT - dest->offset; carry_b += actions[i].length; next_field = false; } else { @@ -455,12 +457,12 @@ flow_dv_convert_modify_action(struct rte_flow_item *item, * Not enough bits in a source filed to fill a * destination field. Switch to the next source. */ - if ((size_b < dcopy->size * CHAR_BIT - dcopy->offset) && + if ((size_b < dest->size * CHAR_BIT - dest->offset) && ((size_b == field->size * CHAR_BIT - off_b) || field->is_flex)) { actions[i].length = size_b; - dcopy->offset += actions[i].length; - next_dcopy = false; + dest->offset += actions[i].length; + next_dest = false; } } else { MLX5_ASSERT(item->spec); @@ -475,11 +477,11 @@ flow_dv_convert_modify_action(struct rte_flow_item *item, /* Convert entire record to expected big-endian format. */ actions[i].data0 = rte_cpu_to_be_32(actions[i].data0); if ((type != MLX5_MODIFICATION_TYPE_COPY || - dcopy->id != (enum mlx5_modification_field)UINT32_MAX) && + dest->id != (enum mlx5_modification_field)UINT32_MAX) && field->id != (enum mlx5_modification_field)UINT32_MAX) ++i; - if (next_dcopy && type == MLX5_MODIFICATION_TYPE_COPY) - ++dcopy; + if (next_dest && type == MLX5_MODIFICATION_TYPE_COPY) + ++dest; if (next_field) ++field; } while (field->size);