diff mbox series

[v5,5/7] net/mlx5: support modify VLAN priority on VLAN hdr

Message ID 672cb17b8fd1c7171bb2714840124de51c004fd0.1567951423.git.motih@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Raslan Darawsheh
Headers
Series net/mlx5: support for flow action on VLAN header |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Moti Haimovsky Sept. 9, 2019, 3:56 p.m. UTC 
  This commit adds support for modifying the VLAN priority (PCP) field
in about-to-be-pushed VLAN header.
This feature can only modify the PCP field of a new VLAN header yet
to be pushed. It does not support modifying an existing or already
pushed VLAN headers.

Signed-off-by: Moti Haimovsky <motih@mellanox.com>
---
v4:
- Fixed typo in an error message.
---
 doc/guides/nics/mlx5.rst               |  5 ++-
 doc/guides/rel_notes/release_19_11.rst |  1 +
 drivers/net/mlx5/mlx5_flow_dv.c        | 62 ++++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)

Comments

Slava Ovsiienko Sept. 10, 2019, 8:13 a.m. UTC | #1 
> -----Original Message-----
> From: Moti Haimovsky <motih@mellanox.com>
> Sent: Monday, September 9, 2019 18:57
> To: Slava Ovsiienko <viacheslavo@mellanox.com>; Raslan Darawsheh
> <rasland@mellanox.com>
> Cc: dev@dpdk.org
> Subject: [PATCH v5 5/7] net/mlx5: support modify VLAN priority on VLAN hdr
> 
> This commit adds support for modifying the VLAN priority (PCP) field in
> about-to-be-pushed VLAN header.
> This feature can only modify the PCP field of a new VLAN header yet to be
> pushed. It does not support modifying an existing or already pushed VLAN
> headers.
> 
> Signed-off-by: Moti Haimovsky <motih@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>

> ---
> v4:
> - Fixed typo in an error message.
> ---
>  doc/guides/nics/mlx5.rst               |  5 ++-
>  doc/guides/rel_notes/release_19_11.rst |  1 +
>  drivers/net/mlx5/mlx5_flow_dv.c        | 62
> ++++++++++++++++++++++++++++++++++
>  3 files changed, 67 insertions(+), 1 deletion(-)
> 
> diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index
> 875a87f..01215f4 100644
> --- a/doc/guides/nics/mlx5.rst
> +++ b/doc/guides/nics/mlx5.rst
> @@ -132,6 +132,8 @@ Limitations
> 
>  - VLAN push offload is not supported on ingress traffic.
> 
> +- VLAN set PCP offload is not supported on existing headers.
> +
>  - A multi segment packet must have not more segments than reported by
> dev_infos_get()
>    in tx_desc_lim.nb_seg_max field. This value depends on maximal supported
> Tx descriptor
>    size and ``txq_inline_min`` settings and may be from 2 (worst case forced
> by maximal @@ -1042,7 +1044,8 @@ Supported hardware offloads
>     +-----------------------+-----------------+-----------------+
>     | | VLAN                | | DPDK 19.11    | | DPDK 19.11    |
>     | | (of_pop_vlan /      | | OFED 4.6-4    | | OFED 4.6-4    |
> -   | | of_push_vlan)       | | ConnectX-5    | | ConnectX-5    |
> +   | | of_push_vlan /      | | ConnectX-5    | | ConnectX-5    |
> +   | | of_set_vlan_pcp)    |                 |                 |
>     +-----------------------+-----------------+-----------------+
> 
>  Notes for testpmd
> diff --git a/doc/guides/rel_notes/release_19_11.rst
> b/doc/guides/rel_notes/release_19_11.rst
> index afe92ab..5067a1c 100644
> --- a/doc/guides/rel_notes/release_19_11.rst
> +++ b/doc/guides/rel_notes/release_19_11.rst
> @@ -229,4 +229,5 @@ Tested Platforms
> 
>    * Added support for VLAN pop flow offload command.
>    * Added support for VLAN push flow offload command.
> +  * Added support for VLAN set PCP offload command.
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c index 2780735..73459a0 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -974,6 +974,47 @@ struct field_modify_info modify_tcp[] = {  }
> 
>  /**
> + * Validate the set VLAN PCP.
> + *
> + * @param[in] action_flags
> + *   Holds the actions detected until now.
> + * @param[in] actions
> + *   Pointer to the list of actions remaining in the flow rule.
> + * @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_errno is set.
> + */
> +static int
> +flow_dv_validate_action_set_vlan_pcp(uint64_t action_flags,
> +				     const struct rte_flow_action actions[],
> +				     struct rte_flow_error *error)
> +{
> +	const struct rte_flow_action *action = actions;
> +	const struct rte_flow_action_of_set_vlan_pcp *conf = action->conf;
> +
> +	if (conf->vlan_pcp > 7)
> +		return rte_flow_error_set(error, EINVAL,
> +					  RTE_FLOW_ERROR_TYPE_ACTION,
> action,
> +					  "VLAN PCP value is too big");
> +	if (mlx5_flow_find_action(actions,
> +
> RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN) == NULL)
> +		return rte_flow_error_set(error, ENOTSUP,
> +					  RTE_FLOW_ERROR_TYPE_ACTION,
> action,
> +					  "set VLAN PCP can only be used "
> +					  "with push VLAN action");
> +	if (action_flags & MLX5_FLOW_ACTION_OF_PUSH_VLAN)
> +		return rte_flow_error_set(error, ENOTSUP,
> +					  RTE_FLOW_ERROR_TYPE_ACTION,
> action,
> +					  "set VLAN PCP action must precede
> "
> +					  "the push VLAN action");
> +	return 0;
> +}
> +
> +/**
>   * Validate count action.
>   *
>   * @param[in] dev
> @@ -3396,6 +3437,13 @@ struct field_modify_info modify_tcp[] = {
>  			action_flags |=
> MLX5_FLOW_ACTION_OF_PUSH_VLAN;
>  			++actions_n;
>  			break;
> +		case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP:
> +			ret = flow_dv_validate_action_set_vlan_pcp
> +						(action_flags, actions, error);
> +			if (ret < 0)
> +				return ret;
> +			/* Count PCP with push_vlan command. */
> +			break;
>  		case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP:
>  		case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP:
>  			ret =
> flow_dv_validate_action_l2_encap(action_flags,
> @@ -4989,6 +5037,7 @@ struct field_modify_info modify_tcp[] = {
>  	uint8_t next_protocol = 0xff;
>  	struct rte_vlan_hdr vlan = { 0 };
>  	bool vlan_inherited = false;
> +	uint16_t vlan_tci;
> 
>  	flow->group = attr->group;
>  	if (attr->transfer)
> @@ -5118,6 +5167,19 @@ struct field_modify_info modify_tcp[] = {
>  					   dev_flow->dv.push_vlan_res-
> >action;
>  			action_flags |=
> MLX5_FLOW_ACTION_OF_PUSH_VLAN;
>  			break;
> +		case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP:
> +			if (!vlan_inherited) {
> +				flow_dev_get_vlan_info_from_items(items,
> &vlan);
> +				vlan_inherited = true;
> +			}
> +			vlan_tci =
> +			    ((const struct rte_flow_action_of_set_vlan_pcp *)
> +						       actions->conf)-
> >vlan_pcp;
> +			vlan_tci = vlan_tci <<
> MLX5DV_FLOW_VLAN_PCP_SHIFT;
> +			vlan.vlan_tci &= ~MLX5DV_FLOW_VLAN_PCP_MASK;
> +			vlan.vlan_tci |= vlan_tci;
> +			/* Push VLAN command will use this value */
> +			break;
>  		case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP:
>  		case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP:
>  			if (flow_dv_create_action_l2_encap(dev, actions,
> --
> 1.8.3.1
Slava Ovsiienko Sept. 10, 2019, 8:13 a.m. UTC | #2 
> -----Original Message-----
> From: Moti Haimovsky <motih@mellanox.com>
> Sent: Monday, September 9, 2019 18:57
> To: Slava Ovsiienko <viacheslavo@mellanox.com>; Raslan Darawsheh
> <rasland@mellanox.com>
> Cc: dev@dpdk.org
> Subject: [PATCH v5 5/7] net/mlx5: support modify VLAN priority on VLAN hdr
> 
> This commit adds support for modifying the VLAN priority (PCP) field in
> about-to-be-pushed VLAN header.
> This feature can only modify the PCP field of a new VLAN header yet to be
> pushed. It does not support modifying an existing or already pushed VLAN
> headers.
> 
> Signed-off-by: Moti Haimovsky <motih@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>

> ---
> v4:
> - Fixed typo in an error message.
> ---
>  doc/guides/nics/mlx5.rst               |  5 ++-
>  doc/guides/rel_notes/release_19_11.rst |  1 +
>  drivers/net/mlx5/mlx5_flow_dv.c        | 62
> ++++++++++++++++++++++++++++++++++
>  3 files changed, 67 insertions(+), 1 deletion(-)
> 
> diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index
> 875a87f..01215f4 100644
> --- a/doc/guides/nics/mlx5.rst
> +++ b/doc/guides/nics/mlx5.rst
> @@ -132,6 +132,8 @@ Limitations
> 
>  - VLAN push offload is not supported on ingress traffic.
> 
> +- VLAN set PCP offload is not supported on existing headers.
> +
>  - A multi segment packet must have not more segments than reported by
> dev_infos_get()
>    in tx_desc_lim.nb_seg_max field. This value depends on maximal supported
> Tx descriptor
>    size and ``txq_inline_min`` settings and may be from 2 (worst case forced
> by maximal @@ -1042,7 +1044,8 @@ Supported hardware offloads
>     +-----------------------+-----------------+-----------------+
>     | | VLAN                | | DPDK 19.11    | | DPDK 19.11    |
>     | | (of_pop_vlan /      | | OFED 4.6-4    | | OFED 4.6-4    |
> -   | | of_push_vlan)       | | ConnectX-5    | | ConnectX-5    |
> +   | | of_push_vlan /      | | ConnectX-5    | | ConnectX-5    |
> +   | | of_set_vlan_pcp)    |                 |                 |
>     +-----------------------+-----------------+-----------------+
> 
>  Notes for testpmd
> diff --git a/doc/guides/rel_notes/release_19_11.rst
> b/doc/guides/rel_notes/release_19_11.rst
> index afe92ab..5067a1c 100644
> --- a/doc/guides/rel_notes/release_19_11.rst
> +++ b/doc/guides/rel_notes/release_19_11.rst
> @@ -229,4 +229,5 @@ Tested Platforms
> 
>    * Added support for VLAN pop flow offload command.
>    * Added support for VLAN push flow offload command.
> +  * Added support for VLAN set PCP offload command.
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c index 2780735..73459a0 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -974,6 +974,47 @@ struct field_modify_info modify_tcp[] = {  }
> 
>  /**
> + * Validate the set VLAN PCP.
> + *
> + * @param[in] action_flags
> + *   Holds the actions detected until now.
> + * @param[in] actions
> + *   Pointer to the list of actions remaining in the flow rule.
> + * @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_errno is set.
> + */
> +static int
> +flow_dv_validate_action_set_vlan_pcp(uint64_t action_flags,
> +				     const struct rte_flow_action actions[],
> +				     struct rte_flow_error *error)
> +{
> +	const struct rte_flow_action *action = actions;
> +	const struct rte_flow_action_of_set_vlan_pcp *conf = action->conf;
> +
> +	if (conf->vlan_pcp > 7)
> +		return rte_flow_error_set(error, EINVAL,
> +					  RTE_FLOW_ERROR_TYPE_ACTION,
> action,
> +					  "VLAN PCP value is too big");
> +	if (mlx5_flow_find_action(actions,
> +
> RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN) == NULL)
> +		return rte_flow_error_set(error, ENOTSUP,
> +					  RTE_FLOW_ERROR_TYPE_ACTION,
> action,
> +					  "set VLAN PCP can only be used "
> +					  "with push VLAN action");
> +	if (action_flags & MLX5_FLOW_ACTION_OF_PUSH_VLAN)
> +		return rte_flow_error_set(error, ENOTSUP,
> +					  RTE_FLOW_ERROR_TYPE_ACTION,
> action,
> +					  "set VLAN PCP action must precede
> "
> +					  "the push VLAN action");
> +	return 0;
> +}
> +
> +/**
>   * Validate count action.
>   *
>   * @param[in] dev
> @@ -3396,6 +3437,13 @@ struct field_modify_info modify_tcp[] = {
>  			action_flags |=
> MLX5_FLOW_ACTION_OF_PUSH_VLAN;
>  			++actions_n;
>  			break;
> +		case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP:
> +			ret = flow_dv_validate_action_set_vlan_pcp
> +						(action_flags, actions, error);
> +			if (ret < 0)
> +				return ret;
> +			/* Count PCP with push_vlan command. */
> +			break;
>  		case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP:
>  		case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP:
>  			ret =
> flow_dv_validate_action_l2_encap(action_flags,
> @@ -4989,6 +5037,7 @@ struct field_modify_info modify_tcp[] = {
>  	uint8_t next_protocol = 0xff;
>  	struct rte_vlan_hdr vlan = { 0 };
>  	bool vlan_inherited = false;
> +	uint16_t vlan_tci;
> 
>  	flow->group = attr->group;
>  	if (attr->transfer)
> @@ -5118,6 +5167,19 @@ struct field_modify_info modify_tcp[] = {
>  					   dev_flow->dv.push_vlan_res-
> >action;
>  			action_flags |=
> MLX5_FLOW_ACTION_OF_PUSH_VLAN;
>  			break;
> +		case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP:
> +			if (!vlan_inherited) {
> +				flow_dev_get_vlan_info_from_items(items,
> &vlan);
> +				vlan_inherited = true;
> +			}
> +			vlan_tci =
> +			    ((const struct rte_flow_action_of_set_vlan_pcp *)
> +						       actions->conf)-
> >vlan_pcp;
> +			vlan_tci = vlan_tci <<
> MLX5DV_FLOW_VLAN_PCP_SHIFT;
> +			vlan.vlan_tci &= ~MLX5DV_FLOW_VLAN_PCP_MASK;
> +			vlan.vlan_tci |= vlan_tci;
> +			/* Push VLAN command will use this value */
> +			break;
>  		case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP:
>  		case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP:
>  			if (flow_dv_create_action_l2_encap(dev, actions,
> --
> 1.8.3.1
diff mbox series

Patch

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 875a87f..01215f4 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -132,6 +132,8 @@  Limitations
 
 - VLAN push offload is not supported on ingress traffic.
 
+- VLAN set PCP offload is not supported on existing headers.
+
 - A multi segment packet must have not more segments than reported by dev_infos_get()
   in tx_desc_lim.nb_seg_max field. This value depends on maximal supported Tx descriptor
   size and ``txq_inline_min`` settings and may be from 2 (worst case forced by maximal
@@ -1042,7 +1044,8 @@  Supported hardware offloads
    +-----------------------+-----------------+-----------------+
    | | VLAN                | | DPDK 19.11    | | DPDK 19.11    |
    | | (of_pop_vlan /      | | OFED 4.6-4    | | OFED 4.6-4    |
-   | | of_push_vlan)       | | ConnectX-5    | | ConnectX-5    |
+   | | of_push_vlan /      | | ConnectX-5    | | ConnectX-5    |
+   | | of_set_vlan_pcp)    |                 |                 |
    +-----------------------+-----------------+-----------------+
 
 Notes for testpmd
diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_notes/release_19_11.rst
index afe92ab..5067a1c 100644
--- a/doc/guides/rel_notes/release_19_11.rst
+++ b/doc/guides/rel_notes/release_19_11.rst
@@ -229,4 +229,5 @@  Tested Platforms
 
   * Added support for VLAN pop flow offload command.
   * Added support for VLAN push flow offload command.
+  * Added support for VLAN set PCP offload command.
 
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 2780735..73459a0 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -974,6 +974,47 @@  struct field_modify_info modify_tcp[] = {
 }
 
 /**
+ * Validate the set VLAN PCP.
+ *
+ * @param[in] action_flags
+ *   Holds the actions detected until now.
+ * @param[in] actions
+ *   Pointer to the list of actions remaining in the flow rule.
+ * @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_errno is set.
+ */
+static int
+flow_dv_validate_action_set_vlan_pcp(uint64_t action_flags,
+				     const struct rte_flow_action actions[],
+				     struct rte_flow_error *error)
+{
+	const struct rte_flow_action *action = actions;
+	const struct rte_flow_action_of_set_vlan_pcp *conf = action->conf;
+
+	if (conf->vlan_pcp > 7)
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ACTION, action,
+					  "VLAN PCP value is too big");
+	if (mlx5_flow_find_action(actions,
+				  RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN) == NULL)
+		return rte_flow_error_set(error, ENOTSUP,
+					  RTE_FLOW_ERROR_TYPE_ACTION, action,
+					  "set VLAN PCP can only be used "
+					  "with push VLAN action");
+	if (action_flags & MLX5_FLOW_ACTION_OF_PUSH_VLAN)
+		return rte_flow_error_set(error, ENOTSUP,
+					  RTE_FLOW_ERROR_TYPE_ACTION, action,
+					  "set VLAN PCP action must precede "
+					  "the push VLAN action");
+	return 0;
+}
+
+/**
  * Validate count action.
  *
  * @param[in] dev
@@ -3396,6 +3437,13 @@  struct field_modify_info modify_tcp[] = {
 			action_flags |= MLX5_FLOW_ACTION_OF_PUSH_VLAN;
 			++actions_n;
 			break;
+		case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP:
+			ret = flow_dv_validate_action_set_vlan_pcp
+						(action_flags, actions, error);
+			if (ret < 0)
+				return ret;
+			/* Count PCP with push_vlan command. */
+			break;
 		case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP:
 		case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP:
 			ret = flow_dv_validate_action_l2_encap(action_flags,
@@ -4989,6 +5037,7 @@  struct field_modify_info modify_tcp[] = {
 	uint8_t next_protocol = 0xff;
 	struct rte_vlan_hdr vlan = { 0 };
 	bool vlan_inherited = false;
+	uint16_t vlan_tci;
 
 	flow->group = attr->group;
 	if (attr->transfer)
@@ -5118,6 +5167,19 @@  struct field_modify_info modify_tcp[] = {
 					   dev_flow->dv.push_vlan_res->action;
 			action_flags |= MLX5_FLOW_ACTION_OF_PUSH_VLAN;
 			break;
+		case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP:
+			if (!vlan_inherited) {
+				flow_dev_get_vlan_info_from_items(items, &vlan);
+				vlan_inherited = true;
+			}
+			vlan_tci =
+			    ((const struct rte_flow_action_of_set_vlan_pcp *)
+						       actions->conf)->vlan_pcp;
+			vlan_tci = vlan_tci << MLX5DV_FLOW_VLAN_PCP_SHIFT;
+			vlan.vlan_tci &= ~MLX5DV_FLOW_VLAN_PCP_MASK;
+			vlan.vlan_tci |= vlan_tci;
+			/* Push VLAN command will use this value */
+			break;
 		case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP:
 		case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP:
 			if (flow_dv_create_action_l2_encap(dev, actions,