From patchwork Wed Oct 25 10:27:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 133290 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 E6556431FB; Wed, 25 Oct 2023 12:28:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 32BE64281D; Wed, 25 Oct 2023 12:28:22 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2081.outbound.protection.outlook.com [40.107.220.81]) by mails.dpdk.org (Postfix) with ESMTP id 25DD24281D for ; Wed, 25 Oct 2023 12:28:19 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m4dB1o37yKc82bLLjd9T3szDPAsCdSBul81hITt5hp4v80BRlR7ozytiVIax8OMtfzMEng0cLZYP1IaETHJt5zHwJvl2DGdDpfTiFBtxoWMf0SgP3JWYkL/u3K3Rds9d6YroAKd6DbPbLlx4Cg/BurOihO64CBXNb4g+FCcO3EJYw8rMn/+JGbcdqJ8SGE7HmYcYRuaErpXg1nQac8R9qEz47X6RMCxSGf/6FyWMzx7PH0fuLVWSZ2e3xbFDEVO2tK6y1qN9he3y/DKUUr5yxRCFA2FidqSAb9R55ppy0fumr9ltlSlvWDFawK3A4Sb3nw5HEI5luRO12uj5ffVjtw== 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=41KmvLZUfRDOPvEREZNK1ZTON50ok9RcxwZLZQ2u5tk=; b=B/DKGzHKTsTPg9dYu0rmlEKFX+hcwnj9OYV2uTnLvvfbtBpbwyTVyS4cJietai01IgtRczsxiXJP1UyIbjHdnQ416pNIi0HxGAkDjYNGWwygWAtzs6OJJc6sdXLhgrm7xAwhH8HyFH+uugcWl15tIG278cPp99ZrcdLsJRJZ6Mfczru3l0pxPCo6iPrmlJzZx+UN+4YHDnd9OhQ0Qeu7sBR7ok7fKtKaOyXlRgLdIaG4VJisepfPBhJA1pSgrPM285sYhUPMjmjDlVQKsSJupaS8AQavUKf5lXJCK2ZZE8qKqHJ1tGJlkU2ulZoUyWwNYzIID36PlgLamglKMwj0IA== 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=41KmvLZUfRDOPvEREZNK1ZTON50ok9RcxwZLZQ2u5tk=; b=ri8B0nEW56G9T4yut2P5E1/BtoxHUS5Qxi6VrTLXKMIBNhDqB0LDMUTlPTltkjtCRbx8XldCrNz4XJ8n8o99E3pnFFvSlbUwlxB9WVxIKiVJLA/2WCERwzCsffoWjvqPFiXeob3KCOj/EiCKfySxUF3OKHiZCeJLto1j9ri+izJK5EPqb7OLyeU19c/bn4bxZdKgPM+G87Qkci7SgznjrkshbI0zVrJYPzCIAFP8IQTEpGeLGvgq0yk+XaW2TL2nAiq4YN9/l20KAyXd5lRURh5dJtyIxZpCWxOjh8Qc+6PdN/fOPEOdZsUvKPIs0K/lxSfnh3bnyua9gGyGT8HZ/g== Received: from SN7PR04CA0018.namprd04.prod.outlook.com (2603:10b6:806:f2::23) by MN6PR12MB8492.namprd12.prod.outlook.com (2603:10b6:208:472::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Wed, 25 Oct 2023 10:28:17 +0000 Received: from SA2PEPF00001507.namprd04.prod.outlook.com (2603:10b6:806:f2:cafe::e6) by SN7PR04CA0018.outlook.office365.com (2603:10b6:806:f2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19 via Frontend Transport; Wed, 25 Oct 2023 10:28:16 +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 SA2PEPF00001507.mail.protection.outlook.com (10.167.242.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Wed, 25 Oct 2023 10:28:16 +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, 25 Oct 2023 03:28:03 -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; Wed, 25 Oct 2023 03:28:01 -0700 From: Gregory Etelson To: CC: , =?utf-8?b?wqA=?= , , Suanming Mou , Matan Azrad , Viacheslav Ovsiienko , Ori Kam Subject: [PATCH v5 07/10] net/mlx5: reformat HWS code for HWS mirror action Date: Wed, 25 Oct 2023 13:27:24 +0300 Message-ID: <20231025102727.145493-8-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231025102727.145493-1-getelson@nvidia.com> References: <20231017080928.30454-1-getelson@nvidia.com> <20231025102727.145493-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: SA2PEPF00001507:EE_|MN6PR12MB8492:EE_ X-MS-Office365-Filtering-Correlation-Id: ad75140c-be5c-4646-11d7-08dbd54519fa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: V8HQpKBN6BrdejmnceYtGf/f2G6JIE9Hdq2Z2vJ9slwg6SjYr3J0sk21vElHLFvev2D0dy+e9gu4u9ehoh0x4gbTD+ZQhb6+m0nA0wulqLcL4hG+IMUk3Jul8H5ZiiGCG78X26nGcZpgHjUnP7ERk9MqJcKpDaeI4PkAxl1TBz3itGrMnn3lQ+E/eOku3Uu+jkj0LmyluTPq2RxGtu2jukPb7otcvYy5Em8dV0ufIb92w4TxceoMU4ackZ1ABLWkXUiWCFmqjFMTwKbYI42G28KlWMtqLtORbnjdcw8Ke8NwxPY88/ZoEIAZXR5VeE+G1rCaG7HOyjvzpcmxHGBWyd4I7eZU4tFbZ02MN/kZUZ1H2P+YkvlZPQ6z5l1kim1dwx29bgLz7vRcZuxibaDtRWVZnhfHvj11+hFasre9TbKJdM7bcrL57H+0qUagvLumj3yDFLHQQmIEhmVsXyWzHof2BnJQZVlJ0TL+iyexexBsnAbbqy9ji5F/6oc1wWnaKoCVgLFjf719u+Fil5FcuJynajd4jc0AHca7sUv8W6CcXPAfgAwahb08gWHBz5oYySaHc5AXFTmhMjC4l1Eo32hp4ojRb328I7o+daVE+t1pYK6kjQIMdjoYjBcMCpB62TI/sX91DYhFGLbjhpNI6yytypTJM93rp1A73UWcdOx0JKtjZGM+3wf/4wrs+ftR3z9XMJvqW8BVlw4dsy8Elhz5jpO9XKv13vk/aL9VX3E= 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)(39860400002)(376002)(396003)(136003)(346002)(230922051799003)(451199024)(82310400011)(64100799003)(1800799009)(186009)(46966006)(40470700004)(36840700001)(55016003)(40480700001)(2906002)(7696005)(6666004)(478600001)(40460700003)(8676002)(4326008)(8936002)(70206006)(5660300002)(70586007)(41300700001)(316002)(6916009)(54906003)(83380400001)(36756003)(356005)(426003)(82740400003)(336012)(6286002)(26005)(16526019)(47076005)(36860700001)(1076003)(7636003)(2616005)(107886003)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2023 10:28:16.6773 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ad75140c-be5c-4646-11d7-08dbd54519fa 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: SA2PEPF00001507.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR12MB8492 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 Reformat HWS code for HWS mirror action. 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);