From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EEC3A45A58; Tue, 15 Oct 2024 18:48:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D56174066A; Tue, 15 Oct 2024 18:48:19 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2041.outbound.protection.outlook.com [40.107.220.41]) by mails.dpdk.org (Postfix) with ESMTP id 4905840670 for ; Tue, 15 Oct 2024 18:48:18 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=G4+LGmUj8GXEdcwlPGRY+xA6/bBnfmsWvvUQADi37E06B3Z3rK/0NyPpbqJbqB2OGWqK8JvfT7L1CRcOoUblpXWRpxv3ggceyamBvu95IXLikrF7Iv1LsaGZ4ikO4i75yYw+Y2ByGhSpXNRmLWuBaM2RjzopqBKdioQU2MkVceJVuxfQYt6VjDW0I6zY/qG5Kx60tChV6WdSBGI6SxUfylMgfa0gzpnJaZYRYAtzzlggUrbSdhLg4LfkmHcHGLrOs1NlLYAS1qEun2AFvMsh4K5SKqosYJKSnqSrzpTSS1IUdyscfGupS6GurroE8ZMktu7mp9KSTQE6vXf5wmtpAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=6jwU3gQRh8Cd29WmwrFgqk1rwo/L2pKKZ2QO7vv16gw=; b=o9719E06nW213jvm2UfRhk4/XatTo4KCsyqMMh4CRNd1JYxKMogRG5NKdp5+Orq3VT2/vVwp2X4yyq8EE5hKfRi0NY74pwcjTV3UMYoKi/WVJNfAy+IRqVCj6oEJeKQl7muje3/FRtp11Crp8XpcCtjEO6TCyuTY8FshEOzdAs1KmOdNGAZS6RBax+gExmv1aw5GLGobXqC0uoVc8/whfWKu/ZLp6TiXetyY28kWdzbRAfjf3eBlJj556DEBYJN9hqGP0l09NC2uzctSvI/2mZ/ea3JQziVNi+95/uR2UOiUIxdxbxRJPy1vMSWGcW1UVUm0dxUnwUQfe4otAIV/wQ== 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=6jwU3gQRh8Cd29WmwrFgqk1rwo/L2pKKZ2QO7vv16gw=; b=nK2d4jqiGt/qEIifNL1/j1OCm+aP7eWNNvgMdQjrwHxNkEOQbjPQeJqf417KsQZe2J8ifddFzd2iy8+HKD5IhsBHcmIMHbzECytfhIwdq8y01BRrmhVFDiRfj5TwcqEqPqd8kpBiLPwAv6O8UOxBDTfmcRz5Lf0QrjaTS4w5R6+YL23wFHnQNImRJ+gUFXwStNvPe3fKMLOo7UOnN1D4lWlgqOnw8lSx358Plrfb1wWhHe06hK64e7gaZF2aWmqbVzn+vC+44KtFVG3m1bZSgM+gkiyDqmmB+l9CqLUZ9hmqh6Znd3wbzICyhzoaIKdu/rofz9Mf49i5QEaSX0CEdA== Received: from BL1PR13CA0214.namprd13.prod.outlook.com (2603:10b6:208:2bf::9) by SA1PR12MB6945.namprd12.prod.outlook.com (2603:10b6:806:24c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.17; Tue, 15 Oct 2024 16:48:14 +0000 Received: from BN3PEPF0000B371.namprd21.prod.outlook.com (2603:10b6:208:2bf:cafe::c2) by BL1PR13CA0214.outlook.office365.com (2603:10b6:208:2bf::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.17 via Frontend Transport; Tue, 15 Oct 2024 16:48:14 +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 BN3PEPF0000B371.mail.protection.outlook.com (10.167.243.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.1 via Frontend Transport; Tue, 15 Oct 2024 16:48:13 +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.1544.4; Tue, 15 Oct 2024 09:47:55 -0700 Received: from pegasus01.mtr.labs.mlnx (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.1544.4; Tue, 15 Oct 2024 09:47:52 -0700 From: Alexander Kozyrev To: CC: , , , , , , , , Subject: [PATCH v2 5/5] net/mlx5: implement jump to table index action Date: Tue, 15 Oct 2024 19:47:18 +0300 Message-ID: <20241015164718.607858-5-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20241015164718.607858-1-akozyrev@nvidia.com> References: <20241015164718.607858-1-akozyrev@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.126.231.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: BN3PEPF0000B371:EE_|SA1PR12MB6945:EE_ X-MS-Office365-Filtering-Correlation-Id: d0da353a-c291-473e-2c3a-08dced39296c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Tvvl4Ustcly3UYQL+rvDJLmvPt2b6/vMwe6P/a1NLHC1K94ZUReA5B0XPUio?= =?us-ascii?Q?aSdVFiQO772GWiUe5GMHXAUkMu0OLNf1qK3DIfHOIEp+LhzfPjxNl0XzUodd?= =?us-ascii?Q?Fp8f0VECngwe2ESifdvr4xriMjlvy1VSvrhGam43LDYoYkfJ9NnPNs4paBS9?= =?us-ascii?Q?GbSm89kkA4omDw7VQ4T1K+rCGYO0z0ERZ54iXR6bCoINsHXAqeSZoMjYV3zj?= =?us-ascii?Q?yRLUg+gPmhWPCVv0uo2oXkdLkpidgYG0m3MxtM9ZHrKXyWJSnektMm4ZJomL?= =?us-ascii?Q?PTnB02xkKV+bBEobdR/2sCD9/8lUBP5SsYrWT5SoVzOop1OY6yPJs3dnm0/t?= =?us-ascii?Q?Pc0JNo0w1t1Xbu3zZhsPY4NOlR6x+ff78HwZrVudlX+1vYxo1RQYEU3M4LdL?= =?us-ascii?Q?va3KmUkQ5M7kjYWJqU5Zqjzo5PEIPzWClfRu89S0jd+RVq+oulhRbegQmZ3M?= =?us-ascii?Q?27xRu0oo/xnGl/RIHF79UuDZkLwUYLPGcCCQC68iM/le06f2KqJ7Vm/Ot1BU?= =?us-ascii?Q?6fbjk0H7NpYkT6jdKVxGgIovi9jHD+PV3Vm+ADgqA07/U3SNJyAx3luxBwet?= =?us-ascii?Q?Ib5G5fk82HvzAFQhSSB+464twsVHN6w4MyKar64Yc2MMoEjAyBzBCCnelBX4?= =?us-ascii?Q?S7JW/BQ5QnM39f30yKGTngeVgi25RD1Y0VC2aqc46ifJKbO9CjnrSHNbMoqB?= =?us-ascii?Q?ri5fMdaQsJPh360Cy3ZqBltdMP2+TxJ9x4WbCfeJF8tigVyU4aupFLG1ypVW?= =?us-ascii?Q?kyB50nZR0CUrdxZHRoQmCZzdu07o5vXv/06Y24tdwDLy/4tSZlHMbdYzDnvf?= =?us-ascii?Q?k8qPhUMjk3XBDrOKR/uVZzXSZTXMHfdRyMO06I/waLL7OZpLwlsLHJ8I04+g?= =?us-ascii?Q?AospxN0GHPhjngBKbZABwUsH0tKzJbNLzLg9iBlf2VeEpdGfaPEpf2c6jkEM?= =?us-ascii?Q?iRgbb7AilFhXHinjgK0TTsyVMDjXkqudfY0F+ncaIhYCYvF6TmXbAdxYCsJp?= =?us-ascii?Q?+STdwauSZGm5v+FDmLRTFuUoenEf2V8s7Sc4Inx50TVoL8+BLDBnCpc5gm85?= =?us-ascii?Q?u1GR4RIRFcpS1++5/R7m96Z1++jWNwONfktGN0IjsVPcpG7ybb7O2DixmFT6?= =?us-ascii?Q?n/Ph4rYqexTudAhNVOPVD/t9Ln3P3F5Ttd7E38pXGndP1nYTWlWSd+GFVcJS?= =?us-ascii?Q?AhIAvGfHydHBc1Fm0k5Ze0jdfnjadOW7NVdNrjI8/9FHspzLbseuSUi5wWQ0?= =?us-ascii?Q?eXOTZLUjyZhMSsIJsbRyL5HQ5sRPxYENE8xCZGWWixEGSmuKSqy8ZfzMOPh4?= =?us-ascii?Q?ALEc10AjVhXsjrXjx+okoOZKXm41AVz7pWYBK/o7PYBK368E8JncwghRfLQa?= =?us-ascii?Q?Mi2zXMU=3D?= 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:(13230040)(1800799024)(36860700013)(376014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2024 16:48:13.3485 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d0da353a-c291-473e-2c3a-08dced39296c 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: BN3PEPF0000B371.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6945 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 Implement RTE_FLOW_ACTION_TYPE_JUMP_TO_TABLE_INDEX action. Create the hardware steering jump to matcher action, associated with the template matcher. Use this action and provide the rule index as an offset in the matcher. Note that it is only supported by the isolated matcher, i.e. the table insertion type is by index with pattern. Signed-off-by: Alexander Kozyrev --- drivers/net/mlx5/mlx5_flow.h | 8 +- drivers/net/mlx5/mlx5_flow_hw.c | 145 ++++++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 86a1476879..3708e4d5bf 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -398,6 +398,7 @@ enum mlx5_feature_name { #define MLX5_FLOW_ACTION_IPV6_ROUTING_REMOVE (1ull << 48) #define MLX5_FLOW_ACTION_IPV6_ROUTING_PUSH (1ull << 49) #define MLX5_FLOW_ACTION_NAT64 (1ull << 50) +#define MLX5_FLOW_ACTION_JUMP_TO_TABLE_INDEX (1ull << 51) #define MLX5_FLOW_DROP_INCLUSIVE_ACTIONS \ (MLX5_FLOW_ACTION_COUNT | MLX5_FLOW_ACTION_SAMPLE | MLX5_FLOW_ACTION_AGE) @@ -408,12 +409,14 @@ enum mlx5_feature_name { MLX5_FLOW_ACTION_DEFAULT_MISS | \ MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY | \ MLX5_FLOW_ACTION_SEND_TO_KERNEL | \ - MLX5_FLOW_ACTION_PORT_REPRESENTOR) + MLX5_FLOW_ACTION_PORT_REPRESENTOR | \ + MLX5_FLOW_ACTION_JUMP_TO_TABLE_INDEX) #define MLX5_FLOW_FATE_ESWITCH_ACTIONS \ (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_PORT_ID | \ MLX5_FLOW_ACTION_SEND_TO_KERNEL | \ - MLX5_FLOW_ACTION_JUMP | MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY) + MLX5_FLOW_ACTION_JUMP | MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY | \ + MLX5_FLOW_ACTION_JUMP_TO_TABLE_INDEX) #define MLX5_FLOW_MODIFY_HDR_ACTIONS (MLX5_FLOW_ACTION_SET_IPV4_SRC | \ MLX5_FLOW_ACTION_SET_IPV4_DST | \ @@ -1704,6 +1707,7 @@ struct mlx5_flow_template_table_cfg { struct mlx5_matcher_info { struct mlx5dr_matcher *matcher; /* Template matcher. */ + struct mlx5dr_action *jump; /* Jump to matcher action. */ RTE_ATOMIC(uint32_t) refcnt; }; diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 6c8404ee2c..87daf726fd 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -729,6 +729,9 @@ flow_hw_action_flags_get(const struct rte_flow_action actions[], case MLX5_RTE_FLOW_ACTION_TYPE_DEFAULT_MISS: action_flags |= MLX5_FLOW_ACTION_DEFAULT_MISS; break; + case RTE_FLOW_ACTION_TYPE_JUMP_TO_TABLE_INDEX: + action_flags |= MLX5_FLOW_ACTION_JUMP_TO_TABLE_INDEX; + break; case RTE_FLOW_ACTION_TYPE_VOID: case RTE_FLOW_ACTION_TYPE_END: break; @@ -2925,6 +2928,34 @@ __flow_hw_translate_actions_template(struct rte_eth_dev *dev, src_pos, dr_pos)) goto err; break; + case RTE_FLOW_ACTION_TYPE_JUMP_TO_TABLE_INDEX: + if (masks->conf && + ((const struct rte_flow_action_jump_to_table_index *) + masks->conf)->table) { + struct rte_flow_template_table *jump_table = + ((const struct rte_flow_action_jump_to_table_index *) + actions->conf)->table; + acts->rule_acts[dr_pos].jump_to_matcher.offset = + ((const struct rte_flow_action_jump_to_table_index *) + actions->conf)->index; + if (likely(!rte_flow_template_table_resizable(dev->data->port_id, + &jump_table->cfg.attr))) { + acts->rule_acts[dr_pos].action = + jump_table->matcher_info[0].jump; + } else { + uint32_t selector; + rte_rwlock_read_lock(&jump_table->matcher_replace_rwlk); + selector = jump_table->matcher_selector; + acts->rule_acts[dr_pos].action = + jump_table->matcher_info[selector].jump; + rte_rwlock_read_unlock(&jump_table->matcher_replace_rwlk); + } + } else if (__flow_hw_act_data_general_append + (priv, acts, actions->type, + src_pos, dr_pos)){ + goto err; + } + break; case RTE_FLOW_ACTION_TYPE_END: actions_end = true; break; @@ -3527,6 +3558,7 @@ flow_hw_actions_construct(struct rte_eth_dev *dev, cnt_id_t cnt_id; uint32_t *cnt_queue; uint32_t mtr_id; + struct rte_flow_template_table *jump_table; action = &actions[act_data->action_src]; /* @@ -3759,6 +3791,25 @@ flow_hw_actions_construct(struct rte_eth_dev *dev, rule_acts[act_data->action_dst].action = priv->action_nat64[table->type][nat64_c->type]; break; + case RTE_FLOW_ACTION_TYPE_JUMP_TO_TABLE_INDEX: + jump_table = ((const struct rte_flow_action_jump_to_table_index *) + action->conf)->table; + if (likely(!rte_flow_template_table_resizable(dev->data->port_id, + &table->cfg.attr))) { + rule_acts[act_data->action_dst].action = + jump_table->matcher_info[0].jump; + } else { + uint32_t selector; + rte_rwlock_read_lock(&table->matcher_replace_rwlk); + selector = table->matcher_selector; + rule_acts[act_data->action_dst].action = + jump_table->matcher_info[selector].jump; + rte_rwlock_read_unlock(&table->matcher_replace_rwlk); + } + rule_acts[act_data->action_dst].jump_to_matcher.offset = + ((const struct rte_flow_action_jump_to_table_index *) + action->conf)->index; + break; default: break; } @@ -4963,6 +5014,10 @@ flow_hw_table_create(struct rte_eth_dev *dev, }; struct mlx5_priv *priv = dev->data->dev_private; struct mlx5dr_matcher_attr matcher_attr = {0}; + struct mlx5dr_action_jump_to_matcher_attr jump_attr = { + .type = MLX5DR_ACTION_JUMP_TO_MATCHER_BY_INDEX, + .matcher = NULL, + }; struct rte_flow_template_table *tbl = NULL; struct mlx5_flow_group *grp; struct mlx5dr_match_template *mt[MLX5_HW_TBL_MAX_ITEM_TEMPLATE]; @@ -5153,6 +5208,13 @@ flow_hw_table_create(struct rte_eth_dev *dev, tbl->type = attr->flow_attr.transfer ? MLX5DR_TABLE_TYPE_FDB : (attr->flow_attr.egress ? MLX5DR_TABLE_TYPE_NIC_TX : MLX5DR_TABLE_TYPE_NIC_RX); + if (matcher_attr.isolated) { + jump_attr.matcher = tbl->matcher_info[0].matcher; + tbl->matcher_info[0].jump = mlx5dr_action_create_jump_to_matcher(priv->dr_ctx, + &jump_attr, mlx5_hw_act_flag[!!attr->flow_attr.group][tbl->type]); + if (!tbl->matcher_info[0].jump) + goto jtm_error; + } /* * Only the matcher supports update and needs more than 1 WQE, an additional * index is needed. Or else the flow index can be reused. @@ -5175,6 +5237,9 @@ flow_hw_table_create(struct rte_eth_dev *dev, rte_rwlock_init(&tbl->matcher_replace_rwlk); return tbl; res_error: + if (tbl->matcher_info[0].jump) + mlx5dr_action_destroy(tbl->matcher_info[0].jump); +jtm_error: if (tbl->matcher_info[0].matcher) (void)mlx5dr_matcher_destroy(tbl->matcher_info[0].matcher); at_error: @@ -5439,8 +5504,12 @@ flow_hw_table_destroy(struct rte_eth_dev *dev, 1, rte_memory_order_relaxed); } flow_hw_destroy_table_multi_pattern_ctx(table); + if (table->matcher_info[0].jump) + mlx5dr_action_destroy(table->matcher_info[0].jump); if (table->matcher_info[0].matcher) mlx5dr_matcher_destroy(table->matcher_info[0].matcher); + if (table->matcher_info[1].jump) + mlx5dr_action_destroy(table->matcher_info[1].jump); if (table->matcher_info[1].matcher) mlx5dr_matcher_destroy(table->matcher_info[1].matcher); mlx5_hlist_unregister(priv->sh->groups, &table->grp->entry); @@ -6545,6 +6614,7 @@ flow_hw_template_expand_modify_field(struct rte_flow_action actions[], case RTE_FLOW_ACTION_TYPE_DROP: case RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL: case RTE_FLOW_ACTION_TYPE_JUMP: + case RTE_FLOW_ACTION_TYPE_JUMP_TO_TABLE_INDEX: case RTE_FLOW_ACTION_TYPE_QUEUE: case RTE_FLOW_ACTION_TYPE_RSS: case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT: @@ -6761,6 +6831,43 @@ flow_hw_validate_action_jump(struct rte_eth_dev *dev, return 0; } +static int +mlx5_flow_validate_action_jump_to_table_index(const struct rte_flow_action *action, + const struct rte_flow_action *mask, + struct rte_flow_error *error) +{ + const struct rte_flow_action_jump_to_table_index *m = mask->conf; + const struct rte_flow_action_jump_to_table_index *v = action->conf; + struct mlx5dr_action *jump_action; + uint32_t t_group = 0; + + if (!m || !m->table) + return 0; + if (!v) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "Invalid jump to matcher action configuration"); + t_group = v->table->grp->group_id; + if (t_group == 0) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "Unsupported action - jump to root table"); + if (likely(!rte_flow_template_table_resizable(0, &v->table->cfg.attr))) { + jump_action = v->table->matcher_info[0].jump; + } else { + uint32_t selector; + rte_rwlock_read_lock(&v->table->matcher_replace_rwlk); + selector = v->table->matcher_selector; + jump_action = v->table->matcher_info[selector].jump; + rte_rwlock_read_unlock(&v->table->matcher_replace_rwlk); + } + if (jump_action == NULL) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "Unsupported action - table is not an rule array"); + return 0; +} + static int mlx5_hw_validate_action_mark(struct rte_eth_dev *dev, const struct rte_flow_action *template_action, @@ -7242,6 +7349,12 @@ mlx5_flow_hw_actions_validate(struct rte_eth_dev *dev, return ret; action_flags |= MLX5_FLOW_ACTION_DEFAULT_MISS; break; + case RTE_FLOW_ACTION_TYPE_JUMP_TO_TABLE_INDEX: + ret = mlx5_flow_validate_action_jump_to_table_index(action, mask, error); + if (ret < 0) + return ret; + action_flags |= MLX5_FLOW_ACTION_JUMP_TO_TABLE_INDEX; + break; default: return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, @@ -7286,6 +7399,7 @@ static enum mlx5dr_action_type mlx5_hw_dr_action_types[] = { [RTE_FLOW_ACTION_TYPE_IPV6_EXT_PUSH] = MLX5DR_ACTION_TYP_PUSH_IPV6_ROUTE_EXT, [RTE_FLOW_ACTION_TYPE_IPV6_EXT_REMOVE] = MLX5DR_ACTION_TYP_POP_IPV6_ROUTE_EXT, [RTE_FLOW_ACTION_TYPE_NAT64] = MLX5DR_ACTION_TYP_NAT64, + [RTE_FLOW_ACTION_TYPE_JUMP_TO_TABLE_INDEX] = MLX5DR_ACTION_TYP_JUMP_TO_MATCHER, }; static inline void @@ -7513,6 +7627,11 @@ flow_hw_parse_flow_actions_to_dr_actions(struct rte_eth_dev *dev, at->dr_off[i] = curr_off; action_types[curr_off++] = MLX5DR_ACTION_TYP_MISS; break; + case RTE_FLOW_ACTION_TYPE_JUMP_TO_TABLE_INDEX: + *tmpl_flags |= MLX5DR_ACTION_TEMPLATE_FLAG_RELAXED_ORDER; + at->dr_off[i] = curr_off; + action_types[curr_off++] = MLX5DR_ACTION_TYP_JUMP_TO_MATCHER; + break; default: type = mlx5_hw_dr_action_types[at->actions[i].type]; at->dr_off[i] = curr_off; @@ -13949,6 +14068,7 @@ mlx5_mirror_destroy_clone(struct rte_eth_dev *dev, case RTE_FLOW_ACTION_TYPE_JUMP: flow_hw_jump_release(dev, clone->action_ctx); break; + case RTE_FLOW_ACTION_TYPE_JUMP_TO_TABLE_INDEX: case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT: case RTE_FLOW_ACTION_TYPE_PORT_REPRESENTOR: case RTE_FLOW_ACTION_TYPE_RAW_ENCAP: @@ -13982,6 +14102,7 @@ mlx5_mirror_terminal_action(const struct rte_flow_action *action) case RTE_FLOW_ACTION_TYPE_QUEUE: case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT: case RTE_FLOW_ACTION_TYPE_PORT_REPRESENTOR: + case RTE_FLOW_ACTION_TYPE_JUMP_TO_TABLE_INDEX: return true; default: break; @@ -14024,6 +14145,8 @@ mlx5_mirror_validate_sample_action(struct rte_eth_dev *dev, action[1].type != RTE_FLOW_ACTION_TYPE_RAW_ENCAP) return false; break; + case RTE_FLOW_ACTION_TYPE_JUMP_TO_TABLE_INDEX: + break; default: return false; } @@ -14758,8 +14881,14 @@ flow_hw_table_resize(struct rte_eth_dev *dev, struct mlx5dr_action_template *at[MLX5_HW_TBL_MAX_ACTION_TEMPLATE]; struct mlx5dr_match_template *mt[MLX5_HW_TBL_MAX_ITEM_TEMPLATE]; struct mlx5dr_matcher_attr matcher_attr = table->matcher_attr; + struct mlx5dr_action_jump_to_matcher_attr jump_attr = { + .type = MLX5DR_ACTION_JUMP_TO_MATCHER_BY_INDEX, + .matcher = NULL, + }; struct mlx5_multi_pattern_segment *segment = NULL; struct mlx5dr_matcher *matcher = NULL; + struct mlx5dr_action *jump = NULL; + struct mlx5_priv *priv = dev->data->dev_private; uint32_t i, selector = table->matcher_selector; uint32_t other_selector = (selector + 1) & 1; int ret; @@ -14807,6 +14936,17 @@ flow_hw_table_resize(struct rte_eth_dev *dev, table, "failed to create new matcher"); goto error; } + if (matcher_attr.isolated) { + jump_attr.matcher = matcher; + jump = mlx5dr_action_create_jump_to_matcher(priv->dr_ctx, &jump_attr, + mlx5_hw_act_flag[!!table->cfg.attr.flow_attr.group][table->type]); + if (!jump) { + ret = rte_flow_error_set(error, rte_errno, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + table, "failed to create jump to matcher action"); + goto error; + } + } rte_rwlock_write_lock(&table->matcher_replace_rwlk); ret = mlx5dr_matcher_resize_set_target (table->matcher_info[selector].matcher, matcher); @@ -14819,6 +14959,7 @@ flow_hw_table_resize(struct rte_eth_dev *dev, } table->cfg.attr.nb_flows = nb_flows; table->matcher_info[other_selector].matcher = matcher; + table->matcher_info[other_selector].jump = jump; table->matcher_selector = other_selector; rte_atomic_store_explicit(&table->matcher_info[other_selector].refcnt, 0, rte_memory_order_relaxed); @@ -14827,6 +14968,8 @@ flow_hw_table_resize(struct rte_eth_dev *dev, error: if (segment) mlx5_destroy_multi_pattern_segment(segment); + if (jump) + mlx5dr_action_destroy(jump); if (matcher) { ret = mlx5dr_matcher_destroy(matcher); return rte_flow_error_set(error, rte_errno, @@ -14857,6 +15000,8 @@ flow_hw_table_resize_complete(__rte_unused struct rte_eth_dev *dev, return rte_flow_error_set(error, EBUSY, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, table, "cannot complete table resize"); + if (matcher_info->jump) + mlx5dr_action_destroy(matcher_info->jump); ret = mlx5dr_matcher_destroy(matcher_info->matcher); if (ret) return rte_flow_error_set(error, rte_errno, -- 2.18.2