From patchwork Mon Oct 16 18:42:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 132643 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 2FCB943181; Mon, 16 Oct 2023 20:43:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 50E4B40E54; Mon, 16 Oct 2023 20:43:31 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id DD02540E78 for ; Mon, 16 Oct 2023 20:43:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FWK7vXRSFS6dlIhQldFV8SzBbTZq/zgByUuybjF9rKxpvZLVPNXpLQYUhlIrgfNInqP4JD5j8LJo97Wqi8eGbOGZpBxsIiU1KaSy31io7KXpGgwJvh0Eg1CajyZo4F6DQSZE8DgN9GiAeyVr0IJgWhn8ge1+Vkj2FRymMOrZNQCJu8SZBD5qegLr2DTpWmsnmb1S1xTP8L5vgYIOhXNdDpgacady+E7oNzZLlc1HwBewHLthMpg6N+gxhsVEdIgFmx4w+nPivMSRCZ+jqXrzkWkMcZQTqy2E4OZKHMgfR+2rODe81KOiC5Y04Ge9Q9/6djEoILyGdLrb9yU3K4qNgw== 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=WoKbItJTokqaeY4unHDWpXnQZvITRNwLq1mrahWJF9s=; b=T6CmpkbJD3oyiNyd2idG+4k1zOFxE4VS/qE8kC0lYMWUQUNe358W+Q6OsvzX8a3AYe0y7n593ekbm5z19RsQSzBPZR18A/Iea4Xoka+hM/YvBhzu55UOIs6eTqzediY0v0dtJocm5KHOEbZwUK+eE/juvwkxC3w1kkN5AodpbIXYOnyXIA7O3QXVdmUFzVJ4zFTkErCBhD05xwTzCVFSmpN3bdSbGBVUo8s5KnooyYrwqlZP/k3PBy5kwC2lEgSHQlr3IdoaMuV2tu73aI23bOq2cFE291HOaEIKGFMZ5FqHecMXqz3i3Fa0VZ/TbLlSz22+4mytB4zq/BjdOpdTxw== 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 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=WoKbItJTokqaeY4unHDWpXnQZvITRNwLq1mrahWJF9s=; b=BLAdZDTQ03loIRu9Mw+VL6YUIxvKOEvg/0BiZw13N3Tn8921EQRypxdmifANqMyyNwF29m8raatJ8PBb1aUviagD/2C+2A5+DJyK5TAKd+xnAH7TZW5nWUAex00fzBeeOALG+UTIIL6y5TIpQAcNxiZFFEkfybrclnBsDg6m0RjUZgVDcjaqgdF3kP6SyHhjBTReaIVfKBHfAzMZLGqUqXp7Tmb17gdZkamrueD7fet124xQBjyxsrpWOS7G3dlh3eqR3j5j0Nb/ySVQKMulOWq8Ru+MfkbTZE2K7h6M/xGdcYFlnPmIruYeB9teHICbVwg3ZGY+pyHojBc/TyPqzg== Received: from SJ0PR05CA0092.namprd05.prod.outlook.com (2603:10b6:a03:334::7) by MN6PR12MB8592.namprd12.prod.outlook.com (2603:10b6:208:478::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36; Mon, 16 Oct 2023 18:43:27 +0000 Received: from MWH0EPF000989EA.namprd02.prod.outlook.com (2603:10b6:a03:334:cafe::6a) by SJ0PR05CA0092.outlook.office365.com (2603:10b6:a03:334::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.17 via Frontend Transport; Mon, 16 Oct 2023 18:43:27 +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 MWH0EPF000989EA.mail.protection.outlook.com (10.167.241.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22 via Frontend Transport; Mon, 16 Oct 2023 18:43:26 +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; Mon, 16 Oct 2023 11:43:12 -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; Mon, 16 Oct 2023 11:43:10 -0700 From: Gregory Etelson To: CC: , =?utf-8?b?wqA=?= , =?utf-8?q?=C2=A0_=2E_=2E_/patches/upstream-pmd-indirect-actions-list/v2/v2-?= =?utf-8?q?0000-cover-letter_=2E_patch?= , Matan Azrad , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v2 07/16] net/mlx5: reformat HWS code Date: Mon, 16 Oct 2023 21:42:26 +0300 Message-ID: <20231016184235.200427-7-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231016184235.200427-1-getelson@nvidia.com> References: <20230927191046.405282-1-getelson@nvidia.com> <20231016184235.200427-1-getelson@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989EA:EE_|MN6PR12MB8592:EE_ X-MS-Office365-Filtering-Correlation-Id: e52c7065-9902-4bbb-b90c-08dbce77c8f7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: igmVh2o/6AS/ISlp7g06/ma6wazpjhVEhe2Tx1ycB8dyTR8tgprWlhhwxn+8R+hxAnA1rkiq2m1CWw674TlxiXVqsbpR76Pkyn2pQE22j9g1v5F63KICHPch3h+Wfx2y+1uQMzr53COrJP/WY9WizN1gvz788fR6AwbHrro+R9sWHzX8DMi7mkWAbsQw4ykU+PsAiV5J2W9vLGxri9de5VUUI1JVBIxFnypMhort3Qjm8TouqeUaGUU1PbH0IUHx9MjZp79I6uvUcCTO9nCv9N+TkzZjLTk7yrHbq33LqhD59776DoVV0foOfqkq1SSi5GVw0My+8jxbjB3pOd5Np51Dxn819JRhdmIe52h0bJ7qwLug1AdAOmWkx7AEztOsS8RsdgfdwqRS1B1W+KEhF6U9ewRg1xOgHxQCvLXP37gBqS+mD9pKI6IR3vTo3wF1syaK0TXM/rvNfnLzPeEnJy2CHMGkGuS8CbSRKC3vVUQ3Mo21R27tEJHoWJapYUW5mMcMemfIRqv0Zcb6PqwU/ZadHq8MJl2G1tHp60xKFrsuFFgkunBFvItzqOQQVRMg7chfKW9EXz5rG+Q7MRcbVmjtcp9LAVHEA/sxABl5kOY7WI9wCYLvMEH2E7qHRqcEpomucdu+GhpzsVCSF4teNugE8LovWKNcFBhNZZm1SqeyONhYXYsPB9UErmdhgocAXGMSVfLGAEvA1ERR+h62Mdd+GxPS7K85MEcxOOiOrXM= 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)(346002)(39860400002)(376002)(136003)(230922051799003)(451199024)(82310400011)(64100799003)(1800799009)(186009)(46966006)(36840700001)(40470700004)(40480700001)(40460700003)(55016003)(36860700001)(82740400003)(7636003)(356005)(47076005)(83380400001)(6666004)(16526019)(26005)(7696005)(6286002)(36756003)(316002)(70586007)(70206006)(54906003)(478600001)(6916009)(1076003)(107886003)(426003)(336012)(2616005)(86362001)(41300700001)(2906002)(5660300002)(8936002)(8676002)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2023 18:43:26.9446 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e52c7065-9902-4bbb-b90c-08dbce77c8f7 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: MWH0EPF000989EA.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR12MB8592 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 --- 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);