From patchwork Tue Oct 17 08:09:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 132726 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 66DB74318A; Tue, 17 Oct 2023 10:10:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D55F242D89; Tue, 17 Oct 2023 10:10:27 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2060.outbound.protection.outlook.com [40.107.212.60]) by mails.dpdk.org (Postfix) with ESMTP id BB1B642830 for ; Tue, 17 Oct 2023 10:10:25 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T0hhhnidcB8aPhbNMMPgiW6JGA0+3wfFAPNUaz1XlyKrI03kNR1nSL6qGcDxQn7SZj6mppHzSFeeUqMzkLVx47Sk28TR08PNpf6/llrsKBb4gi4DxFDLmivzVghMTJgY0rEiFdSbxCue0T031oqq+hE5yLlYnMckoWodfSEvoJY5TE03qvxQBYKG38QHlwRP6Z6JH/9zqHHrKbjqAaROPMA3VaTIexfh5TXDq5t9HFp3K2F6jBH0n2j8lAID7h22nv+UMtnPtmuwZ5olFbelTb81/wYcxWLGQHZofdTt6nMFsYNG/STPsBHsNtJI0elAWytFkHd0FeBCODmlNaNnWw== 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=ieUuBKTdtoHfjv4RGvoW2uOJCStDfQOfvSZ4h6JpR5w=; b=Ue0w76L7+/dJCDB/tGovHCgPsFx2RwmmzH/Ft77O2/oQKTW8r+oGSCxssCDCyShUf+AxWrBvyzOM0tkmDrCZ7eqe84dFld43Ps9KkdaL8gCDGCbf+NWt8LIugoSoQWu3aEnvulUdVPXGgbJsLIWHqNysE9qR3TtfYsBKy3Bms42pH28ec5w2ubKwShYVF3/Ue/OXf+DPAAU9PJ3PgUpNoTSntpveTU9nWVjx83nPw8LoSVCJWaEtBuItOOKLTs4KS/r685mwwmfpDGiVVsXxsaZZeuGt4j3QLmdv1byrZI4lZsxOoFkFuQJSOfcy0L1q2MRAUU+tjVyyQaADS2rrrw== 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 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=ieUuBKTdtoHfjv4RGvoW2uOJCStDfQOfvSZ4h6JpR5w=; b=Dyby7zkkbYhTeMf9OgQ7+WYZpHRnAbGGSXBiHVnaI7RBdlSnBhuoBARCKWpNCElFJR2gbXsFnjhbJvxu0gqB/aXXhzhKWjCdnOQ8qehbhPb3gEV4WxOYSCctph8+ITQ+zRi4QS5g7WJlrQfG4ooIL436Ayt3ViFa/OugJlsiHpEey47o/k4jVs8Xh2+fG6VbsF/+NCOd4Z5GY8VNGVXsnDPxQASRWJHlLQiHZd11GSxumVDmYI+DuYVHAtJJqxXkXhxGa9P9F9BjRY48DxxB89lz8OZjixle6ucyx8v3WKsYqOkq/I6t5a+jWQtnRhPecwCZ8VYtN12fgGKh4y1cJQ== Received: from MN2PR17CA0027.namprd17.prod.outlook.com (2603:10b6:208:15e::40) by DM4PR12MB5295.namprd12.prod.outlook.com (2603:10b6:5:39f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36; Tue, 17 Oct 2023 08:10:24 +0000 Received: from MN1PEPF0000F0E0.namprd04.prod.outlook.com (2603:10b6:208:15e:cafe::a) by MN2PR17CA0027.outlook.office365.com (2603:10b6:208:15e::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36 via Frontend Transport; Tue, 17 Oct 2023 08:10:23 +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 MN1PEPF0000F0E0.mail.protection.outlook.com (10.167.242.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22 via Frontend Transport; Tue, 17 Oct 2023 08:10:23 +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; Tue, 17 Oct 2023 01:10:09 -0700 Received: from nvidia.com (10.126.230.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; Tue, 17 Oct 2023 01:10:06 -0700 From: Gregory Etelson To: CC: , =?utf-8?b?wqA=?= , , Suanming Mou , Matan Azrad , Viacheslav Ovsiienko , Ori Kam Subject: [PATCH v3 07/16] net/mlx5: reformat HWS code Date: Tue, 17 Oct 2023 11:09:19 +0300 Message-ID: <20231017080928.30454-8-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231017080928.30454-1-getelson@nvidia.com> References: <20230927191046.405282-1-getelson@nvidia.com> <20231017080928.30454-1-getelson@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.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: MN1PEPF0000F0E0:EE_|DM4PR12MB5295:EE_ X-MS-Office365-Filtering-Correlation-Id: 16274b8e-00ed-439f-4ec2-08dbcee8837d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DJKL4rM2lwG6D27aoNo3NJpmqoQ8/ZblUrQoqnF+O7kI1y6MoeEwewIo4eHMPPq7eNJgC4fl0HXlOfcETPmOnTvPaKhWNlO7Jxo8D4IxfJkMLG/jT+LGn7WNVpZxT3n1gTpOuIFRmqW5BzTtEZTX5DCG+bbBLGsv4CKY7UwUpiuY2ywd+3k5MZ1uINoxcTIk5q5gA01d3RPIqj2RIeBLOTI0rloKsMTOou/2DKgZpFDl/DANeA0JQ/TDWCSeuG1UDDd3LI16k9bT2dJIRTSKATtAld43ZaZzA6XRrhKe2A7MuzclCB33DNYJ3/9qr31ycoVUqKKzGRYU+OqE+/RddkqkRxZriuPowHN1iNNmVVW0lgDZ6TC57Ysd1erF9HVdsxAkipJWvxAiQFAjriBfD8Biq5zcI95jtO0mwSlhCcUISkbfKg+al6xnruui6/FdDUuVqYQ+/bh6scbUkzUjKkNDbTfHAlHk3wqb7wgroHBEoU3SGf2AZlpEM+RLxfuEBbJ2+SzDFwWfGkscLEFuAUl3XCwCxhQYyRu4JNKkoejXD3Ktw+Hp+Qz2MzMHuEVeAvTWmlHa85HbQnnWrO9IF6jcDpaH3Qn1fTJTHi+KQ28w3wjKh4SwHYZYdx1zKwc4sKE+0O8h/sHCqqfnVGDMoy9zBSG2AafiZqThpM07np3nvAYnsUQyX6HZhoO5mt9TueQ8z9zZ7HFiDgX1mGpJ4InVdbkwQrjYLGTYlzy9MHs= 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)(39860400002)(396003)(376002)(136003)(230922051799003)(1800799009)(64100799003)(82310400011)(451199024)(186009)(36840700001)(40470700004)(46966006)(6916009)(70206006)(478600001)(70586007)(6666004)(54906003)(1076003)(16526019)(107886003)(7696005)(26005)(6286002)(426003)(336012)(2616005)(316002)(41300700001)(4326008)(8676002)(8936002)(2906002)(5660300002)(36756003)(86362001)(7636003)(356005)(47076005)(36860700001)(83380400001)(82740400003)(40480700001)(40460700003)(55016003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2023 08:10:23.4787 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 16274b8e-00ed-439f-4ec2-08dbcee8837d 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: MN1PEPF0000F0E0.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5295 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 Replace if() with switch(). Signed-off-by: Gregory Etelson Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow_hw.c | 70 ++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 6fcf654e4a..b2215fb5cf 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -4548,6 +4548,17 @@ static enum mlx5dr_action_type mlx5_hw_dr_action_types[] = { [RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL] = MLX5DR_ACTION_TYP_DEST_ROOT, }; +static inline void +action_template_set_type(struct rte_flow_actions_template *at, + enum mlx5dr_action_type *action_types, + unsigned int action_src, uint16_t *curr_off, + enum mlx5dr_action_type type) +{ + at->actions_off[action_src] = *curr_off; + action_types[*curr_off] = type; + *curr_off = *curr_off + 1; +} + static int flow_hw_dr_actions_template_handle_shared(const struct rte_flow_action *mask, unsigned int action_src, @@ -4565,9 +4576,8 @@ flow_hw_dr_actions_template_handle_shared(const struct rte_flow_action *mask, type = mask->type; switch (type) { case RTE_FLOW_ACTION_TYPE_RSS: - at->actions_off[action_src] = *curr_off; - action_types[*curr_off] = MLX5DR_ACTION_TYP_TIR; - *curr_off = *curr_off + 1; + action_template_set_type(at, action_types, action_src, curr_off, + MLX5DR_ACTION_TYP_TIR); break; case RTE_FLOW_ACTION_TYPE_AGE: case RTE_FLOW_ACTION_TYPE_COUNT: @@ -4575,23 +4585,20 @@ flow_hw_dr_actions_template_handle_shared(const struct rte_flow_action *mask, * Both AGE and COUNT action need counter, the first one fills * the action_types array, and the second only saves the offset. */ - if (*cnt_off == UINT16_MAX) { - *cnt_off = *curr_off; - action_types[*cnt_off] = MLX5DR_ACTION_TYP_CTR; - *curr_off = *curr_off + 1; - } + if (*cnt_off == UINT16_MAX) + action_template_set_type(at, action_types, + action_src, curr_off, + MLX5DR_ACTION_TYP_CTR); at->actions_off[action_src] = *cnt_off; break; case RTE_FLOW_ACTION_TYPE_CONNTRACK: - at->actions_off[action_src] = *curr_off; - action_types[*curr_off] = MLX5DR_ACTION_TYP_ASO_CT; - *curr_off = *curr_off + 1; + action_template_set_type(at, action_types, action_src, curr_off, + MLX5DR_ACTION_TYP_ASO_CT); break; case RTE_FLOW_ACTION_TYPE_QUOTA: case RTE_FLOW_ACTION_TYPE_METER_MARK: - at->actions_off[action_src] = *curr_off; - action_types[*curr_off] = MLX5DR_ACTION_TYP_ASO_METER; - *curr_off = *curr_off + 1; + action_template_set_type(at, action_types, action_src, curr_off, + MLX5DR_ACTION_TYP_ASO_METER); break; default: DRV_LOG(WARNING, "Unsupported shared action type: %d", type); @@ -5101,31 +5108,32 @@ flow_hw_actions_template_create(struct rte_eth_dev *dev, at->reformat_off = UINT16_MAX; at->mhdr_off = UINT16_MAX; at->rx_cpy_pos = pos; - /* - * mlx5 PMD hacks indirect action index directly to the action conf. - * The rte_flow_conv() function copies the content from conf pointer. - * Need to restore the indirect action index from action conf here. - */ for (i = 0; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++, masks++, i++) { - if (actions->type == RTE_FLOW_ACTION_TYPE_INDIRECT) { + const struct rte_flow_action_modify_field *info; + + switch (actions->type) { + /* + * mlx5 PMD hacks indirect action index directly to the action conf. + * The rte_flow_conv() function copies the content from conf pointer. + * Need to restore the indirect action index from action conf here. + */ + case RTE_FLOW_ACTION_TYPE_INDIRECT: at->actions[i].conf = actions->conf; at->masks[i].conf = masks->conf; - } - if (actions->type == RTE_FLOW_ACTION_TYPE_MODIFY_FIELD) { - const struct rte_flow_action_modify_field *info = actions->conf; - + break; + case RTE_FLOW_ACTION_TYPE_MODIFY_FIELD: + info = actions->conf; if ((info->dst.field == RTE_FLOW_FIELD_FLEX_ITEM && flow_hw_flex_item_acquire(dev, info->dst.flex_handle, &at->flex_item)) || - (info->src.field == RTE_FLOW_FIELD_FLEX_ITEM && - flow_hw_flex_item_acquire(dev, info->src.flex_handle, - &at->flex_item))) { - rte_flow_error_set(error, rte_errno, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, - "Failed to acquire flex item"); + (info->src.field == RTE_FLOW_FIELD_FLEX_ITEM && + flow_hw_flex_item_acquire(dev, info->src.flex_handle, + &at->flex_item))) goto error; - } + break; + default: + break; } } at->tmpl = flow_hw_dr_actions_template_create(at);