Added hws send to kernel action and root tbl in mlx5_priv.
Initialized in hws configure and used in hws actions translate.
Signed-off-by: Bar Neuman <bneu...@nvidia.com>
---
drivers/net/mlx5/mlx5.h | 2 ++
drivers/net/mlx5/mlx5_flow_hw.c | 59 +++++++++++++++++++++++++++++++--
2 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 021049ad2b..c3f1a49f86 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -1852,6 +1852,8 @@ struct mlx5_priv {
struct mlx5dr_action *hw_drop[2];
/* HW steering global tag action. */
struct mlx5dr_action *hw_tag[2];
+ /* HW steering global send to kernel action. */
+ struct mlx5dr_action *hw_send_to_kernel;
/* HW steering create ongoing rte flow table list header. */
LIST_HEAD(flow_hw_tbl_ongo, rte_flow_template_table) flow_hw_tbl_ongo;
struct mlx5_indexed_pool *acts_ipool; /* Action data indexed pool. */
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index f17a2a0522..74985009df 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -1620,8 +1620,18 @@ __flow_hw_actions_translate(struct rte_eth_dev *dev,
refmt_type = MLX5DR_ACTION_REFORMAT_TYPE_TNL_L2_TO_L2;
break;
case RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL:
- DRV_LOG(ERR, "send to kernel action is not supported in
HW steering.");
- goto err;
+ flow_hw_translate_group(dev, cfg, attr->group,
+ &target_grp, error);
+ if (target_grp == 0) {
+ __flow_hw_action_template_destroy(dev, acts);
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ NULL,
+ "Send to kernel action on root
table is not supported in HW steering mode");
+ }
+ action_pos = at->actions_off[actions - at->actions];
+ acts->rule_acts[action_pos].action =
priv->hw_send_to_kernel;
+ break;
case RTE_FLOW_ACTION_TYPE_MODIFY_FIELD:
err = flow_hw_modify_field_compile(dev, attr,
action_start,
actions, masks,
acts, &mhdr,
@@ -4031,6 +4041,7 @@ flow_hw_template_expand_modify_field(struct
rte_flow_action actions[],
case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP:
case RTE_FLOW_ACTION_TYPE_RAW_ENCAP:
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_QUEUE:
case RTE_FLOW_ACTION_TYPE_RSS:
@@ -4179,6 +4190,21 @@ mlx5_flow_hw_actions_validate(struct rte_eth_dev *dev,
/* TODO: Validation logic */
action_flags |= MLX5_FLOW_ACTION_JUMP;
break;
+#ifdef HAVE_MLX5DV_DR_ACTION_CREATE_DEST_ROOT_TABLE
+ case RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL:
+ if (priv->shared_host)
+ return rte_flow_error_set(error, ENOTSUP,
+
RTE_FLOW_ERROR_TYPE_ACTION,
+ action,
+ "action not supported
in guest port");
+ if (!priv->hw_send_to_kernel)
+ return rte_flow_error_set(error, ENOTSUP,
+
RTE_FLOW_ERROR_TYPE_ACTION,
+ action,
+ "action is not
available");
+ action_flags |= MLX5_FLOW_ACTION_SEND_TO_KERNEL;
+ break;
+#endif
case RTE_FLOW_ACTION_TYPE_QUEUE:
/* TODO: Validation logic */
action_flags |= MLX5_FLOW_ACTION_QUEUE;
@@ -4320,6 +4346,7 @@ static enum mlx5dr_action_type mlx5_hw_dr_action_types[]
= {
[RTE_FLOW_ACTION_TYPE_CONNTRACK] = MLX5DR_ACTION_TYP_ASO_CT,
[RTE_FLOW_ACTION_TYPE_OF_POP_VLAN] = MLX5DR_ACTION_TYP_POP_VLAN,
[RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN] = MLX5DR_ACTION_TYP_PUSH_VLAN,
+ [RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL] = MLX5DR_ACTION_TYP_DEST_ROOT,
};
static int
@@ -5721,6 +5748,30 @@ flow_hw_free_vport_actions(struct mlx5_priv *priv)
priv->hw_vport = NULL;
}
+static void
+flow_hw_create_send_to_kernel_actions(struct mlx5_priv *priv __rte_unused)
+{
+#ifdef HAVE_MLX5DV_DR_ACTION_CREATE_DEST_ROOT_TABLE
+ priv->hw_send_to_kernel =
+ mlx5dr_action_create_dest_root(priv->dr_ctx,
+ MLX5_HW_LOWEST_PRIO_ROOT,
+
MLX5DR_ACTION_FLAG_HWS_RX);
+ if (!priv->hw_send_to_kernel) {
+ DRV_LOG(WARNING, "Unable to create HWS send to kernel action");
+ return;
+ }
+#endif
+}
+
+static void
+flow_hw_destroy_send_to_kernel_action(struct mlx5_priv *priv)
+{
+ if (priv->hw_send_to_kernel) {
+ mlx5dr_action_destroy(priv->hw_send_to_kernel);
+ priv->hw_send_to_kernel = NULL;
+ }
+}
+
/**
* Create an egress pattern template matching on source SQ.
*
@@ -7584,6 +7635,8 @@ flow_hw_configure(struct rte_eth_dev *dev,
goto err;
}
}
+ if (!priv->shared_host)
+ flow_hw_create_send_to_kernel_actions(priv);
if (port_attr->nb_conn_tracks || (host_priv && host_priv->hws_ctpool)) {
mem_size = sizeof(struct mlx5_aso_sq) * nb_q_updated +
sizeof(*priv->ct_mng);
@@ -7646,6 +7699,7 @@ flow_hw_configure(struct rte_eth_dev *dev,
priv->hws_cpool = NULL;
}
mlx5_flow_quota_destroy(dev);
+ flow_hw_destroy_send_to_kernel_action(priv);
flow_hw_free_vport_actions(priv);
for (i = 0; i < MLX5_HW_ACTION_FLAG_MAX; i++) {
if (priv->hw_drop[i])
@@ -7726,6 +7780,7 @@ flow_hw_resource_release(struct rte_eth_dev *dev)
mlx5dr_action_destroy(priv->hw_tag[i]);
}
flow_hw_destroy_vlan(dev);
+ flow_hw_destroy_send_to_kernel_action(priv);
flow_hw_free_vport_actions(priv);
if (priv->acts_ipool) {
mlx5_ipool_destroy(priv->acts_ipool);
--
2.25.1
