DPDK patches and discussions
 help / color / mirror / Atom feed
From: Yongseok Koh <yskoh@mellanox.com>
To: Dekel Peled <dekelp@mellanox.com>
Cc: Shahaf Shuler <shahafs@mellanox.com>,
	"dev@dpdk.org" <dev@dpdk.org>, Ori Kam <orika@mellanox.com>
Subject: Re: [dpdk-dev] [PATCH v3 3/4] net/mlx5: add L2 and L3 encap to Direct Verbs flow
Date: Wed, 10 Oct 2018 00:43:18 +0000	[thread overview]
Message-ID: <20181010004308.GG9031@mtidpdk.mti.labs.mlnx> (raw)
In-Reply-To: <1539113137-4914-4-git-send-email-dekelp@mellanox.com>

On Tue, Oct 09, 2018 at 10:25:36PM +0300, Dekel Peled wrote:
> This patch adds support for Direct Verbs encap operations, L2 and L3.
> 
> Signed-off-by: Dekel Peled <dekelp@mellanox.com>
> ---

Acked-by: Yongseok Koh <yskoh@mellanox.com>

Thanks

>  drivers/net/mlx5/mlx5_flow_dv.c | 227 +++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 222 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
> index 80e7b24..73a22ba 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -84,6 +84,168 @@
>  }
>  
>  /**
> + * Validate the tunnel encap action.
> + *
> + * @param[in] action_flags
> + *   holds the actions detected until now.
> + * @param[in] action
> + *   Pointer to the encap 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_encap(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_encap *tunnel_encap = action->conf;
> +
> +	if (!tunnel_encap || !(tunnel_encap->buf))
> +		return rte_flow_error_set(error, EINVAL,
> +					  RTE_FLOW_ERROR_TYPE_ACTION, action,
> +					  "configuration cannot be null");
> +	if (action_flags & MLX5_FLOW_ACTION_DROP)
> +		return rte_flow_error_set(error, EINVAL,
> +					  RTE_FLOW_ERROR_TYPE_ACTION, NULL,
> +					  "can't drop and encap 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,
> +					  "can't have 2 encap actions in same"
> +					  " flow");
> +	if (attr->ingress)
> +		return rte_flow_error_set(error, ENOTSUP,
> +					  RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
> +					  NULL,
> +					  "encap action not supported for "
> +					  "ingress");
> +	return 0;
> +}
> +
> +/**
> + * Validate the tunnel encap L3 action
> + *
> + * @param[in] action_flags
> + *   holds the actions detected until now.
> + * @param[in] action
> + *   Pointer to the encap 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_encap_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_encap_l3 *tunnel_encap_l3 =
> +			action->conf;
> +
> +	if (!tunnel_encap_l3 || !(tunnel_encap_l3->buf))
> +		return rte_flow_error_set(error, EINVAL,
> +					  RTE_FLOW_ERROR_TYPE_ACTION, action,
> +					  "configuration cannot be null");
> +	if (action_flags & MLX5_FLOW_ACTION_DROP)
> +		return rte_flow_error_set(error, EINVAL,
> +					  RTE_FLOW_ERROR_TYPE_ACTION, NULL,
> +					  "can't drop and encap 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,
> +					  "can't have 2 encap actions in same"
> +					  " flow");
> +	if (attr->ingress)
> +		return rte_flow_error_set(error, ENOTSUP,
> +					  RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
> +					  NULL,
> +					  "encap action not supported for "
> +					  "ingress");
> +	return 0;
> +}
> +
> +/**
> + * Convert encap action to DV specification.
> + *
> + * @param[in] dev
> + *   Pointer to rte_eth_dev structure.
> + * @param[in] action
> + *   Pointer to action 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_encap(struct rte_eth_dev *dev,
> +		     const struct rte_flow_action *action,
> +		     struct rte_flow_error *error)
> +{
> +	struct ibv_flow_action *encap_verb = NULL;
> +	const struct rte_flow_action_tunnel_encap *encap_data;
> +	struct priv *priv = dev->data->dev_private;
> +
> +	encap_data = (const struct rte_flow_action_tunnel_encap *)action->conf;
> +	encap_verb = mlx5_glue->dv_create_flow_action_packet_reformat
> +		(priv->ctx, encap_data->size,
> +		 encap_data->size ? encap_data->buf : NULL,
> +		 MLX5DV_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TO_L2_TUNNEL,
> +		 MLX5DV_FLOW_TABLE_TYPE_NIC_TX);
> +	if (!encap_verb)
> +		rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
> +				   NULL, "cannot create encap action");
> +	return encap_verb;
> +}
> +
> +/**
> + * Convert encap L3 action to DV specification.
> + *
> + * @param[in] dev
> + *   Pointer to rte_eth_dev structure.
> + * @param[in] action
> + *   Pointer to action 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_encap_l3(struct rte_eth_dev *dev,
> +			const struct rte_flow_action *action,
> +			struct rte_flow_error *error)
> +{
> +	struct ibv_flow_action *encap_l3_verb = NULL;
> +	const struct rte_flow_action_tunnel_encap_l3 *encap_l3_data;
> +	struct priv *priv = dev->data->dev_private;
> +
> +	encap_l3_data =
> +		(const struct rte_flow_action_tunnel_encap_l3 *)action->conf;
> +	encap_l3_verb = mlx5_glue->dv_create_flow_action_packet_reformat
> +		(priv->ctx, encap_l3_data->size,
> +		 encap_l3_data->size ? encap_l3_data->buf : NULL,
> +		 MLX5DV_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TO_L3_TUNNEL,
> +		 MLX5DV_FLOW_TABLE_TYPE_NIC_TX);
> +	if (!encap_l3_verb)
> +		rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
> +				   NULL, "cannot create encap L3 action");
> +	return encap_l3_verb;
> +}
> +
> +/**
>   * Verify the @p attributes will be correctly understood by the NIC and store
>   * them in the @p flow if everything is correct.
>   *
> @@ -330,6 +492,20 @@
>  			action_flags |= MLX5_FLOW_ACTION_COUNT;
>  			++actions_n;
>  			break;
> +		case RTE_FLOW_ACTION_TYPE_TUNNEL_ENCAP:
> +			ret = flow_dv_validate_action_tunnel_encap
> +				(action_flags, actions, attr, error);
> +			if (ret < 0)
> +				return ret;
> +			action_flags |= MLX5_FLOW_ACTION_TUNNEL_ENCAP;
> +			break;
> +		case RTE_FLOW_ACTION_TYPE_TUNNEL_ENCAP_L3:
> +			ret = flow_dv_validate_action_tunnel_encap_l3
> +				(action_flags, actions, attr, error);
> +			if (ret < 0)
> +				return ret;
> +			action_flags |= MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3;
> +			break;
>  		default:
>  			return rte_flow_error_set(error, ENOTSUP,
>  						  RTE_FLOW_ERROR_TYPE_ACTION,
> @@ -1038,14 +1214,23 @@
>  /**
>   * Store the requested actions in an array.
>   *
> + * @param[in] dev
> + *   Pointer to rte_eth_dev structure.
>   * @param[in] action
>   *   Flow action to translate.
>   * @param[in, out] dev_flow
>   *   Pointer to the mlx5_flow.
> + * @param[out] error
> + *   Pointer to the error structure.
> + *
> + * @return
> + *   0 on success, a negative errno value otherwise and rte_ernno is set.
>   */
> -static void
> -flow_dv_create_action(const struct rte_flow_action *action,
> -		      struct mlx5_flow *dev_flow)
> +static int
> +flow_dv_create_action(struct rte_eth_dev *dev,
> +		      const struct rte_flow_action *action,
> +		      struct mlx5_flow *dev_flow,
> +		      struct rte_flow_error *error)
>  {
>  	const struct rte_flow_action_queue *queue;
>  	const struct rte_flow_action_rss *rss;
> @@ -1092,10 +1277,35 @@
>  		/* Added to array only in apply since we need the QP */
>  		flow->actions |= MLX5_FLOW_ACTION_RSS;
>  		break;
> +	case RTE_FLOW_ACTION_TYPE_TUNNEL_ENCAP:
> +		dev_flow->dv.actions[actions_n].type =
> +			MLX5DV_FLOW_ACTION_IBV_FLOW_ACTION;
> +		dev_flow->dv.actions[actions_n].action =
> +			flow_dv_create_encap(dev, action, error);
> +		if (!(dev_flow->dv.actions[actions_n].action))
> +			return -rte_errno;
> +		dev_flow->dv.encap_verb =
> +			dev_flow->dv.actions[actions_n].action;
> +		flow->actions |= MLX5_FLOW_ACTION_TUNNEL_ENCAP;
> +		actions_n++;
> +		break;
> +	case RTE_FLOW_ACTION_TYPE_TUNNEL_ENCAP_L3:
> +		dev_flow->dv.actions[actions_n].type =
> +			MLX5DV_FLOW_ACTION_IBV_FLOW_ACTION;
> +		dev_flow->dv.actions[actions_n].action =
> +			flow_dv_create_encap_l3(dev, action, error);
> +		if (!(dev_flow->dv.actions[actions_n].action))
> +			return -rte_errno;
> +		dev_flow->dv.encap_verb =
> +			dev_flow->dv.actions[actions_n].action;
> +		flow->actions |= MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3;
> +		actions_n++;
> +		break;
>  	default:
>  		break;
>  	}
>  	dev_flow->dv.actions_n = actions_n;
> +	return 0;
>  }
>  
>  static uint32_t matcher_zero[MLX5_ST_SZ_DW(fte_match_param)] = { 0 };
> @@ -1259,8 +1469,10 @@
>  	matcher.egress = attr->egress;
>  	if (flow_dv_matcher_register(dev, &matcher, dev_flow, error))
>  		return -rte_errno;
> -	for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++)
> -		flow_dv_create_action(actions, dev_flow);
> +	for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
> +		if (flow_dv_create_action(dev, actions, dev_flow, error))
> +			return -rte_errno;
> +	}
>  	return 0;
>  }
>  
> @@ -1444,6 +1656,11 @@
>  		LIST_REMOVE(dev_flow, next);
>  		if (dev_flow->dv.matcher)
>  			flow_dv_matcher_release(dev, dev_flow->dv.matcher);
> +		if (dev_flow->dv.encap_verb) {
> +			claim_zero(mlx5_glue->destroy_flow_action
> +						(dev_flow->dv.encap_verb));
> +			dev_flow->dv.encap_verb = NULL;
> +		}
>  		rte_free(dev_flow);
>  	}
>  }
> -- 
> 1.8.3.1
> 

  reply	other threads:[~2018-10-10  0:43 UTC|newest]

Thread overview: 94+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-27 14:50 [dpdk-dev] [PATCH 0/4] support DV encap and decap actions Dekel Peled
2018-09-27 14:50 ` [dpdk-dev] [PATCH 1/4] net/mlx5: add flow action functions to glue Dekel Peled
2018-10-02  1:02   ` Yongseok Koh
2018-10-03  6:59     ` Dekel Peled
2018-09-27 14:50 ` [dpdk-dev] [PATCH 2/4] net/mlx5: add definitions for DV encap and decap Dekel Peled
2018-10-03  2:58   ` Yongseok Koh
2018-10-03  7:27     ` Dekel Peled
2018-09-27 14:50 ` [dpdk-dev] [PATCH 3/4] net/mlx5: add DV encap L2 and L3 operations Dekel Peled
2018-10-03  6:58   ` Yongseok Koh
2018-10-03  8:35     ` Dekel Peled
2018-10-03  9:32       ` Yongseok Koh
2018-10-03 11:35         ` Dekel Peled
2018-10-03 11:47       ` Dekel Peled
2018-10-03 13:55         ` Dekel Peled
2018-09-27 14:50 ` [dpdk-dev] [PATCH 4/4] net/mlx5: add DV decap " Dekel Peled
2018-10-03  7:07   ` Yongseok Koh
2018-10-03 16:14     ` Dekel Peled
2018-10-07 14:25 ` [dpdk-dev] [PATCH v2 0/4] add support of Direct Verbs encap and decap actions Dekel Peled
2018-10-09 19:25   ` [dpdk-dev] [PATCH v3 " Dekel Peled
2018-10-10  8:35     ` [dpdk-dev] [PATCH v4 " Dekel Peled
2018-10-11 12:12       ` [dpdk-dev] [PATCH v5 " Dekel Peled
2018-10-25 20:08         ` [dpdk-dev] [PATCH v6 0/6] add encap and decap actions to Direct Verbs flow in MLX5 PMD Dekel Peled
2018-10-29 10:03           ` Shahaf Shuler
2018-10-29 14:42             ` Dekel Peled
2018-10-31  7:10           ` [dpdk-dev] [PATCH v7 0/7] " Dekel Peled
2018-10-31 15:09             ` Shahaf Shuler
2018-11-01  9:37             ` [dpdk-dev] [PATCH v8 " Dekel Peled
2018-11-01 12:51               ` Shahaf Shuler
2018-11-01 17:17                 ` Ferruh Yigit
2018-11-04  7:12                   ` Shahaf Shuler
2018-11-01  9:37             ` [dpdk-dev] [PATCH v8 1/7] net/mlx5: add flow action functions to glue Dekel Peled
2018-11-01  9:37             ` [dpdk-dev] [PATCH v8 2/7] net/mlx5: add VXLAN encap action to Direct Verbs Dekel Peled
2018-11-01  9:37             ` [dpdk-dev] [PATCH v8 3/7] net/mlx5: add VXLAN decap " Dekel Peled
2018-11-01  9:37             ` [dpdk-dev] [PATCH v8 4/7] net/mlx5: add NVGRE encap " Dekel Peled
2018-11-01  9:37             ` [dpdk-dev] [PATCH v8 5/7] net/mlx5: add NVGRE decap " Dekel Peled
2018-11-01  9:37             ` [dpdk-dev] [PATCH v8 6/7] net/mlx5: add raw data encap decap " Dekel Peled
2018-11-01  9:37             ` [dpdk-dev] [PATCH v8 7/7] net/mlx5: add caching of encap decap actions Dekel Peled
2018-10-31  7:10           ` [dpdk-dev] [PATCH v7 1/7] net/mlx5: add flow action functions to glue Dekel Peled
2018-10-31  7:10           ` [dpdk-dev] [PATCH v7 2/7] net/mlx5: add VXLAN encap action to Direct Verbs Dekel Peled
2018-10-31 15:09             ` Shahaf Shuler
2018-11-01  8:22               ` Dekel Peled
2018-10-31  7:10           ` [dpdk-dev] [PATCH v7 3/7] net/mlx5: add VXLAN decap " Dekel Peled
2018-10-31  7:10           ` [dpdk-dev] [PATCH v7 4/7] net/mlx5: add NVGRE encap " Dekel Peled
2018-10-31 15:09             ` Shahaf Shuler
2018-11-01  9:13               ` Dekel Peled
2018-10-31  7:10           ` [dpdk-dev] [PATCH v7 5/7] net/mlx5: add NVGRE decap " Dekel Peled
2018-10-31  7:10           ` [dpdk-dev] [PATCH v7 6/7] net/mlx5: add raw data encap decap " Dekel Peled
2018-10-31  7:10           ` [dpdk-dev] [PATCH v7 7/7] net/mlx5: add caching of encap decap actions Dekel Peled
2018-10-31 15:09             ` Shahaf Shuler
2018-11-01  9:15               ` Dekel Peled
2018-10-25 20:08         ` [dpdk-dev] [PATCH v6 1/6] net/mlx5: add flow action functions to glue Dekel Peled
2018-10-29 10:03           ` Shahaf Shuler
2018-10-25 20:08         ` [dpdk-dev] [PATCH v6 2/6] net/mlx5: add VXLAN encap action to Direct Verbs Dekel Peled
2018-10-29 10:03           ` Shahaf Shuler
2018-10-29 16:44             ` Dekel Peled
2018-10-25 20:08         ` [dpdk-dev] [PATCH v6 3/6] net/mlx5: add VXLAN decap " Dekel Peled
2018-10-29 10:03           ` Shahaf Shuler
2018-10-29 16:46             ` Dekel Peled
2018-10-25 20:08         ` [dpdk-dev] [PATCH v6 4/6] net/mlx5: add NVGRE encap " Dekel Peled
2018-10-25 20:08         ` [dpdk-dev] [PATCH v6 5/6] net/mlx5: add NVGRE decap " Dekel Peled
2018-10-25 20:08         ` [dpdk-dev] [PATCH v6 6/6] net/mlx5: add raw data encap decap " Dekel Peled
2018-10-29 10:03           ` Shahaf Shuler
2018-10-29 16:54             ` Dekel Peled
2018-10-11 12:12       ` [dpdk-dev] [PATCH v5 1/4] net/mlx5: add flow action functions to glue Dekel Peled
2018-10-11 17:05         ` Yongseok Koh
2018-10-11 12:12       ` [dpdk-dev] [PATCH v5 2/4] net/mlx5: add Direct Verbs encap and decap defs Dekel Peled
2018-10-11 12:12       ` [dpdk-dev] [PATCH v5 3/4] net/mlx5: add L2 and L3 encap to Direct Verbs flow Dekel Peled
2018-10-11 12:12       ` [dpdk-dev] [PATCH v5 4/4] net/mlx5: add L2 and L3 decap " Dekel Peled
2018-10-10  8:35     ` [dpdk-dev] [PATCH v4 1/4] net/mlx5: add flow action functions to glue Dekel Peled
2018-10-10 21:22       ` Yongseok Koh
2018-10-10  8:35     ` [dpdk-dev] [PATCH v4 2/4] net/mlx5: add Direct Verbs encap and decap defs Dekel Peled
2018-10-10  8:35     ` [dpdk-dev] [PATCH v4 3/4] net/mlx5: add L2 and L3 encap to Direct Verbs flow Dekel Peled
2018-10-10  8:35     ` [dpdk-dev] [PATCH v4 4/4] net/mlx5: add L2 and L3 decap " Dekel Peled
2018-10-09 19:25   ` [dpdk-dev] [PATCH v3 1/4] net/mlx5: add flow action functions to glue Dekel Peled
2018-10-10  0:36     ` Yongseok Koh
2018-10-10  7:41       ` Dekel Peled
2018-10-10  0:38     ` Yongseok Koh
2018-10-09 19:25   ` [dpdk-dev] [PATCH v3 2/4] net/mlx5: add Direct Verbs encap and decap defs Dekel Peled
2018-10-10  0:40     ` Yongseok Koh
2018-10-09 19:25   ` [dpdk-dev] [PATCH v3 3/4] net/mlx5: add L2 and L3 encap to Direct Verbs flow Dekel Peled
2018-10-10  0:43     ` Yongseok Koh [this message]
2018-10-09 19:25   ` [dpdk-dev] [PATCH v3 4/4] net/mlx5: add L2 and L3 decap " Dekel Peled
2018-10-10  0:45     ` Yongseok Koh
2018-10-07 14:25 ` [dpdk-dev] [PATCH v2 1/4] net/mlx5: add flow action functions to glue Dekel Peled
2018-10-08 19:43   ` Yongseok Koh
2018-10-09 18:49     ` Dekel Peled
2018-10-07 14:25 ` [dpdk-dev] [PATCH v2 2/4] net/mlx5: add Direct Verbs encap and decap defs Dekel Peled
2018-10-08 20:46   ` Yongseok Koh
2018-10-07 14:25 ` [dpdk-dev] [PATCH v2 3/4] net/mlx5: add L2 and L3 encap to Direct Verbs flow Dekel Peled
2018-10-08 21:04   ` Yongseok Koh
2018-10-09 15:55     ` Dekel Peled
2018-10-07 14:25 ` [dpdk-dev] [PATCH v2 4/4] net/mlx5: add L2 and L3 decap " Dekel Peled
2018-10-08 21:19   ` Yongseok Koh
2018-10-09 16:56     ` Dekel Peled

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181010004308.GG9031@mtidpdk.mti.labs.mlnx \
    --to=yskoh@mellanox.com \
    --cc=dekelp@mellanox.com \
    --cc=dev@dpdk.org \
    --cc=orika@mellanox.com \
    --cc=shahafs@mellanox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).