From patchwork Wed Oct 25 11:22:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 133300 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 5D5DF431FB; Wed, 25 Oct 2023 13:24:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BDEA942D8C; Wed, 25 Oct 2023 13:23:29 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2066.outbound.protection.outlook.com [40.107.96.66]) by mails.dpdk.org (Postfix) with ESMTP id 1452B42D7B for ; Wed, 25 Oct 2023 13:23:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZnIReZMYJUzbcrnvKe876PxKXooqJFABsSNFgYF3MVC8jWnbkpSQL+E5I03mmlN+8/F6FiyrS5IpATwdW/vf/PHBaSBBYJs3uZPAQDWEVgS+wK23IWRO8tsAfumuYPIShqsN4VVXv3/cIDRmNkjOQBQ8BeGZxCXfbXa3ILw1uZSDBKwh51h7XCy5FSN81B4MVq2wAoIsfjUmhqULtIPqgxhnllfnEVvsEEBuuLcyaQcyB2z+NUFqpyaI6XC/oYeA2GXKXryUdKzwtx1dAATvpk5LyVK8zKa4ugjk5EIWUmLWzOu0K3HI6ylEW1q39sH6u91k8g3cJ7VfZ+WQVaAJKw== 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/D+usTL9paDnddI7KUite2M7M8Xz7QgvampFNyZuslSObeccdXcq8g5yzqwRl+C3ETeo51CAItZZ1efmXNl+matZ1ywn6nV24F9Zi9u5FJ9zf8++KpKNJbTIb+lqYzjuMS1VkXzp9LI8sS33ysA6LpatzynS1adwsDm1YoU1ve1Gsr7H+CA6BZBe8X6oaWJYcUu6ZkJYYjDB3Sd/KKiAiAEECyHzgHnwMF17UgEik8IoWP/jnVIpHZfsuqeRwYh6aieQhL1k1zBxsZo+bgAEY17iqmVNy4dEEwLi6Ag82RPupSOIv8tIF03dnpKri6hdvkRwqC0jp2l+ml+xgFGhA== 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=41KmvLZUfRDOPvEREZNK1ZTON50ok9RcxwZLZQ2u5tk=; b=PI/RrwrsKfsy8WIiBkMv2JbQ4zDtXWKmz1160FC/kdZnk3RQeFuzYwZmky7AWLpDQi7mzVrqThyShaVEgtFjxdPpXFV8iqXxF6kuuA70nJkVM+VFYl55KQO8pA268B2UXPPSyiVPtJdkZmgpw2fegU/DYI3TPMaMgDL9BLvUYN8vLldEDidwOYEiqC3qAn36TxX6Ld2QDLrCAmIdGkSgVlqoZVvt8CG7rTErJGBxMXyiKFSojXWNYpYth0uokoje6i3HNe8o4y4HsWS0tv0rNsxfM8uDtKXDoOXGS9kJzHc8f6C14E6j9En7V6vzqAuhz9ZlUXgChV68J2b1b90Kqw== Received: from MW4PR03CA0076.namprd03.prod.outlook.com (2603:10b6:303:b6::21) by LV8PR12MB9418.namprd12.prod.outlook.com (2603:10b6:408:202::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Wed, 25 Oct 2023 11:23:26 +0000 Received: from CO1PEPF000044F7.namprd21.prod.outlook.com (2603:10b6:303:b6:cafe::5a) by MW4PR03CA0076.outlook.office365.com (2603:10b6:303:b6::21) 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 11:23:25 +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 CO1PEPF000044F7.mail.protection.outlook.com (10.167.241.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.0 via Frontend Transport; Wed, 25 Oct 2023 11:23:25 +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, 25 Oct 2023 04:23:10 -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 04:23:07 -0700 From: Gregory Etelson To: CC: , =?utf-8?b?wqA=?= , , Suanming Mou , Matan Azrad , Viacheslav Ovsiienko , Ori Kam Subject: [PATCH v6 07/10] net/mlx5: reformat HWS code for HWS mirror action Date: Wed, 25 Oct 2023 14:22:28 +0300 Message-ID: <20231025112232.201606-8-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231025112232.201606-1-getelson@nvidia.com> References: <20231017080928.30454-1-getelson@nvidia.com> <20231025112232.201606-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: CO1PEPF000044F7:EE_|LV8PR12MB9418:EE_ X-MS-Office365-Filtering-Correlation-Id: 35af0dfe-ced6-4425-7178-08dbd54cce0c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Xgv+XaVDLR1XxC3R5Xc/5nM6HGatd9ikCoTBzziUa7ZrHz+C64IGsFA5briXoB+p7lwMumFFHqcH0v8NYhLmw+edQCQPfj3x5IQnO21FMl01MHd2wpB6l7lmsn5r+VBjlKLTUg2gOcW+J87FmIzdggXiH5Y/tptYsKY4tx6hTHeOFS0WunTboc7DrBtc3+djY0g1elfgo4YHmgU4FSKIWFJ61mgt0SKCGcp6pS0I+MSTVpHJ9ULLHgHpzNHiEyatYf302quJavJe1ZEvaq+PArlpWGW4D2/Uz2AFCpHR9JdIJmH0U4euFQ/BI0zVzKTgfkAdXS/eoyv7MFbuzvjI2fzsjGGeLbedANDgJ/z2Kqcc7p/gscoTpFoIk0rm6+zthL4u+h2LJ3t5fi0w2T/9Zd1CTc/J9qrShC8Ae5Qv44JOp39zml366Wj0kEHq/i2hnbftZ+aIyenVp+vXEk9k4u2SOobC4Jr/8SR8ugWE/0o142zz2DopRQ+cTpm8nQvfJoNwLF4Bqy1jCZWJzJRR9N9IkeCTxAbRGXFpXR9j3Ki973W0NanlpPyxydMepB56HrjmbC0x82ygKjDxuJfiZe+DFOmAx1e5aystFp47Ako9WNDXQYsY0wRxxggeu9H7y1VtxvWYgqQ4t4MCjDoK2U+RLPdjXy1vZrY8/XbFofmI4z5vcRMg2GdeoQdVGi2WPM3K3KELmIYT0qR5QVtKwPibuvp+520AKGRL8rnRpqM= 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)(396003)(346002)(39860400002)(376002)(136003)(230922051799003)(1800799009)(64100799003)(82310400011)(186009)(451199024)(40470700004)(36840700001)(46966006)(55016003)(2906002)(86362001)(41300700001)(82740400003)(6916009)(54906003)(316002)(70586007)(6666004)(7696005)(478600001)(107886003)(70206006)(1076003)(7636003)(426003)(47076005)(83380400001)(356005)(40480700001)(336012)(36860700001)(40460700003)(5660300002)(36756003)(4326008)(2616005)(8676002)(8936002)(16526019)(26005)(6286002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2023 11:23:25.3272 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35af0dfe-ced6-4425-7178-08dbd54cce0c 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: CO1PEPF000044F7.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9418 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);