Thanks, PSB.

-----Original Message-----
From: Yongseok Koh
Sent: Tuesday, October 9, 2018 12:19 AM
To: Dekel Peled <redacted>
Cc: Shahaf Shuler <redacted>; dev@dpdk.org; Ori Kam
[off-list ref]
Subject: Re: [PATCH v2 4/4] net/mlx5: add L2 and L3 decap to Direct Verbs
flow

On Sun, Oct 07, 2018 at 05:25:08PM +0300, Dekel Peled wrote:

quoted

This patch adds support for Direct Verbs decap operations, L2 and L3.

Signed-off-by: Dekel Peled <redacted>

Same comment for the order of 'dev' arg.

Done.

quoted

Conflicts:
	drivers/net/mlx5/mlx5_flow_dv.c

What is this? Conflicts?

My bad, fixed.

quoted

---
 drivers/net/mlx5/mlx5_flow_dv.c | 224
+++++++++++++++++++++++++++++++++++++++-
 1 file changed, 219 insertions(+), 5 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c

b/drivers/net/mlx5/mlx5_flow_dv.c index 221c76a..5b44f5b 100644

--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c

@@ -120,11 +120,18 @@
 					  RTE_FLOW_ERROR_TYPE_ACTION,

NULL,

quoted

 					  "can't have 2 encap actions in same"
 					  " flow");
+	if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_DECAP |
+			    MLX5_FLOW_ACTION_TUNNEL_DECAP_L3))
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ACTION,

NULL,

quoted

+					  "can't encap and decap in same"
+					  " flow");
 	if (attr->ingress)
 		return rte_flow_error_set(error, ENOTSUP,
-

	RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, NULL,

quoted

-					"encap action not supported for "
-					"ingress");
+

RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,

quoted

+					  NULL,
+					  "encap action not supported for "
+					  "ingress");

It seems to be mistakenly included in this patch when you rebase the
previous patch. Please fix it in [4/4] and [3/4].

Done.

quoted

 	return 0;
 }

@@ -166,6 +173,12 @@
 					  RTE_FLOW_ERROR_TYPE_ACTION,

NULL,

quoted

 					  "can't have 2 encap actions in same"
 					  " flow");
+	if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_DECAP |
+			    MLX5_FLOW_ACTION_TUNNEL_DECAP_L3))
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ACTION,

NULL,

quoted

+					  "can't encap and decap in same"
+					  " flow");
 	if (attr->ingress)
 		return rte_flow_error_set(error, ENOTSUP,

RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, @@ -176,6 +189,100 @@  }

quoted

 /**
+ * Validate the tunnel decap action
+ *
+ * @param[in] action_flags
+ *   holds the actions detected until now.
+ * @param[in] attr
+ *   Pointer to flow attributes
+ * @param[out] error
+ *   Pointer to error structure.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_ernno is set.
+ */
+static int
+flow_dv_validate_action_tunnel_decap(uint64_t action_flags,
+				     const struct rte_flow_attr *attr,
+				     struct rte_flow_error *error) {
+	if (action_flags & MLX5_FLOW_ACTION_DROP)
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ACTION,

NULL,

quoted

+					  "can't drop and decap in same

flow");

quoted

+	if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_DECAP |
+			    MLX5_FLOW_ACTION_TUNNEL_DECAP_L3))
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ACTION,

NULL,

quoted

+					  "can't have 2 decap actions in same"
+					  " flow");
+	if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_ENCAP |
+			    MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3))
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ACTION,

NULL,

quoted

+					  "can't encap and decap in same"
+					  " flow");
+	if (attr->egress)
+		return rte_flow_error_set(error, ENOTSUP,
+

RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, NULL,

quoted

+					  "decap action not supported for "
+					  "egress");
+	return 0;
+}
+
+/**
+ * Validate the tunnel decap L3 action
+ *
+ * @param[in] action_flags
+ *   holds the actions detected until now.
+ * @param[in] action
+ *   Pointer to the decap action.
+ * @param[in] attr
+ *   Pointer to flow attributes
+ * @param[out] error
+ *   Pointer to error structure.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_ernno is set.
+ */
+static int
+flow_dv_validate_action_tunnel_decap_l3(uint64_t action_flags,
+					const struct rte_flow_action *action,
+					const struct rte_flow_attr *attr,
+					struct rte_flow_error *error)
+{
+	const struct rte_flow_action_tunnel_decap_l3 *tunnel_decap_l3 =
+			action->conf;
+
+	if (!tunnel_decap_l3 || !(tunnel_decap_l3->buf))
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ACTION,

action,

quoted

+					  "configuration cannot be null");
+	if (action_flags & MLX5_FLOW_ACTION_DROP)
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ACTION,

NULL,

quoted

+					  "can't drop and decap in same

flow");

quoted

+	if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_DECAP |
+			    MLX5_FLOW_ACTION_TUNNEL_DECAP_L3))
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ACTION,

NULL,

quoted

+					  "can't have 2 decap actions in same"
+					  " flow");
+	if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_ENCAP |
+			    MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3))
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ACTION,

NULL,

quoted

+					  "can't encap and decap in same"
+					  " flow");
+	if (attr->egress)
+		return rte_flow_error_set(error, ENOTSUP,
+

RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, NULL,

quoted

+					  "decap action not supported for "
+					  "egress");
+	return 0;
+}
+
+/**
  * Convert encap action to DV specification.
  *
  * @param[in] action

@@ -245,6 +352,72 @@
 }

 /**
+ * Convert decap action to DV specification.
+ *
+ * @param[in] action
+ *   Pointer to action structure.
+ * @param[in] dev
+ *   Pointer to rte_eth_dev structure.
+ * @param[out] error
+ *   Pointer to the error structure.
+ *
+ * @return
+ *   Pointer to action on success, NULL otherwise and rte_errno is set.
+ */
+static struct ibv_flow_action *
+flow_dv_create_decap(const struct rte_flow_action *action

__rte_unused,

quoted

+		     struct rte_eth_dev *dev,
+		     struct rte_flow_error *error)
+{
+	struct ibv_flow_action *decap_verb = NULL;
+	struct priv *priv = dev->data->dev_private;
+
+	decap_verb = mlx5_glue->dv_create_flow_action_packet_reformat
+		(priv->ctx, 0, NULL,
+

MLX5DV_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TUNNEL_TO_L2,

quoted

+		 MLX5DV_FLOW_TABLE_TYPE_NIC_RX);
+	if (!decap_verb)
+		rte_flow_error_set(error, EINVAL,

RTE_FLOW_ERROR_TYPE_ACTION,

quoted

+				   NULL, "cannot create decap action");
+	return decap_verb;
+}
+
+/**
+ * Convert decap L3 action to DV specification.
+ *
+ * @param[in] action
+ *   Pointer to action structure.
+ * @param[in] dev
+ *   Pointer to rte_eth_dev structure.
+ * @param[out] error
+ *   Pointer to the error structure.
+ *
+ * @return
+ *   Pointer to action on success, NULL otherwise and rte_errno is set.
+ */
+static struct ibv_flow_action *
+flow_dv_create_decap_l3(const struct rte_flow_action *action,
+			struct rte_eth_dev *dev,
+			struct rte_flow_error *error)
+{
+	struct ibv_flow_action *decap_l3_verb = NULL;
+	const struct rte_flow_action_tunnel_decap_l3 *decap_l3_data;
+	struct priv *priv = dev->data->dev_private;
+
+	decap_l3_data =
+		(const struct rte_flow_action_tunnel_decap_l3 *)action-
conf;
+	decap_l3_verb = mlx5_glue-
dv_create_flow_action_packet_reformat
+		(priv->ctx, decap_l3_data->size,
+		 decap_l3_data->size ? decap_l3_data->buf : NULL,
+

MLX5DV_FLOW_ACTION_PACKET_REFORMAT_TYPE_L3_TUNNEL_TO_L2,

quoted

+		 MLX5DV_FLOW_TABLE_TYPE_NIC_RX);
+	if (!decap_l3_verb)
+		rte_flow_error_set(error, EINVAL,

RTE_FLOW_ERROR_TYPE_ACTION,

quoted

+				   NULL, "cannot create decap L3 action");
+	return decap_l3_verb;
+}
+
+/**
  * Verify the @p attributes will be correctly understood by the NIC and

store

quoted

  * them in the @p flow if everything is correct.
  *

@@ -505,6 +678,20 @@
 				return ret;
 			action_flags |=

MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3;

quoted

 			break;
+		case RTE_FLOW_ACTION_TYPE_TUNNEL_DECAP:
+			ret = flow_dv_validate_action_tunnel_decap
+				(action_flags, attr, error);
+			if (ret < 0)
+				return ret;
+			action_flags |=

MLX5_FLOW_ACTION_TUNNEL_DECAP;

quoted

+			break;
+		case RTE_FLOW_ACTION_TYPE_TUNNEL_DECAP_L3:
+			ret = flow_dv_validate_action_tunnel_decap_l3
+				(action_flags, actions, attr, error);
+			if (ret < 0)
+				return ret;
+			action_flags |=

MLX5_FLOW_ACTION_TUNNEL_DECAP_L3;

quoted

+			break;
 		default:
 			return rte_flow_error_set(error, ENOTSUP,

RTE_FLOW_ERROR_TYPE_ACTION,

quoted

@@ -1300,6 +1487,30 @@
 		flow->actions |= MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3;
 		actions_n++;
 		break;
+	case RTE_FLOW_ACTION_TYPE_TUNNEL_DECAP:
+		dev_flow->dv.actions[actions_n].type =
+			MLX5DV_FLOW_ACTION_IBV_FLOW_ACTION;
+		dev_flow->dv.actions[actions_n].action =
+			flow_dv_create_decap(action, dev, error);
+		if (!(dev_flow->dv.actions[actions_n].action))
+			return -rte_errno;
+		dev_flow->dv.decap_verb =
+			dev_flow->dv.actions[actions_n].action;
+		flow->actions |= MLX5_FLOW_ACTION_TUNNEL_DECAP;
+		actions_n++;
+		break;
+	case RTE_FLOW_ACTION_TYPE_TUNNEL_DECAP_L3:
+		dev_flow->dv.actions[actions_n].type =
+			MLX5DV_FLOW_ACTION_IBV_FLOW_ACTION;
+		dev_flow->dv.actions[actions_n].action =
+			flow_dv_create_decap_l3(action, dev, error);
+		if (!(dev_flow->dv.actions[actions_n].action))
+			return -rte_errno;
+		dev_flow->dv.decap_verb =
+			dev_flow->dv.actions[actions_n].action;
+		flow->actions |= MLX5_FLOW_ACTION_TUNNEL_DECAP_L3;
+		actions_n++;
+		break;
 	default:
 		break;
 	}

@@ -1655,13 +1866,16 @@
 		LIST_REMOVE(dev_flow, next);
 		if (dev_flow->dv.matcher)
 			flow_dv_matcher_release(dev, dev_flow-

dv.matcher);
-

It seems to be mistakenly included in this patch when you rebase the
previous patch. Please fix it in [4/4] and [3/4].

Done.

quoted

 		if (dev_flow->dv.encap_verb) {
 			claim_zero(mlx5_glue->destroy_flow_action
 						(dev_flow->dv.encap_verb));
 			dev_flow->dv.encap_verb = NULL;
 		}
-

Same here.

Done.

quoted

+		if (dev_flow->dv.decap_verb) {
+			claim_zero(mlx5_glue->destroy_flow_action
+						(dev_flow->dv.decap_verb));
+			dev_flow->dv.decap_verb = NULL;
+		}
 		rte_free(dev_flow);
 	}
 }
--
1.8.3.1