net/mlx5: fix flow META item validation

Message ID 20200628093631.56672-1-shys@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Raslan Darawsheh
Headers
Series net/mlx5: fix flow META item validation |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-nxp-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/Intel-compilation success Compilation OK

Commit Message

Shy Shyman June 28, 2020, 9:36 a.m. UTC
  When flow is inserted with meta match item it requires a certain
register support.
As part of the flow validation of such flows, the validation
function is missing a check that the mlx5 driver is not in
legacy mode in terms of extended meta data support
(MLX5_XMETA_MODE_LEGACY flag).
If the driver is in legacy mode it will cause downstream
function that allocates needed register for meta data.

The fix checks explicitly the conditions for support of
meta data in FDB mode. if the conditions are not met
an error message will be issued.

Fixes: 9bf26e1318 ("ethdev: move egress metadata to dynamic field")
Cc: viacheslavo@mellanox.com
Cc: stable@dpdk.org

Signed-off-by: Shy Shyman <shys@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 7 +++++++
 1 file changed, 7 insertions(+)
  

Comments

Matan Azrad July 1, 2020, 6:02 p.m. UTC | #1
From: Shy Shyman
> When flow is inserted with meta match item it requires a certain register
> support.
> As part of the flow validation of such flows, the validation function is missing
> a check that the mlx5 driver is not in legacy mode in terms of extended meta
> data support (MLX5_XMETA_MODE_LEGACY flag).
> If the driver is in legacy mode it will cause downstream function that allocates
> needed register for meta data.
> 
> The fix checks explicitly the conditions for support of meta data in FDB mode.
> if the conditions are not met an error message will be issued.
> 
> Fixes: 9bf26e1318 ("ethdev: move egress metadata to dynamic field")
> Cc: viacheslavo@mellanox.com
> Cc: stable@dpdk.org
> 
> Signed-off-by: Shy Shyman <shys@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>
  
Raslan Darawsheh July 5, 2020, 8:05 a.m. UTC | #2
Hi,

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Shy Shyman
> Sent: Sunday, June 28, 2020 12:37 PM
> To: dev@dpdk.org
> Cc: Matan Azrad <matan@mellanox.com>; Slava Ovsiienko
> <viacheslavo@mellanox.com>; stable@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/mlx5: fix flow META item validation
> 
> When flow is inserted with meta match item it requires a certain
> register support.
> As part of the flow validation of such flows, the validation
> function is missing a check that the mlx5 driver is not in
> legacy mode in terms of extended meta data support
> (MLX5_XMETA_MODE_LEGACY flag).
> If the driver is in legacy mode it will cause downstream
> function that allocates needed register for meta data.
> 
> The fix checks explicitly the conditions for support of
> meta data in FDB mode. if the conditions are not met
> an error message will be issued.
> 
> Fixes: 9bf26e1318 ("ethdev: move egress metadata to dynamic field")
> Cc: viacheslavo@mellanox.com
> Cc: stable@dpdk.org
> 
> Signed-off-by: Shy Shyman <shys@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_flow_dv.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c
> index 6318bd99cd..e037643c98 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -1479,6 +1479,13 @@ flow_dv_validate_item_meta(struct rte_eth_dev
> *dev __rte_unused,
>  					  "isn't supported");
>  		if (reg != REG_A)
>  			nic_mask.data = priv->sh->dv_meta_mask;
> +	} else if (attr->transfer) {
> +		return rte_flow_error_set(error, ENOTSUP,
> +					RTE_FLOW_ERROR_TYPE_ITEM, item,
> +					"extended metadata feature "
> +					"should be enabled when "
> +					"meta item is requested "
> +					"with e-switch mode ");
>  	}
>  	if (!mask)
>  		mask = &rte_flow_item_meta_mask;
> --
> 2.21.0


Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh
  

Patch

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 6318bd99cd..e037643c98 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1479,6 +1479,13 @@  flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused,
 					  "isn't supported");
 		if (reg != REG_A)
 			nic_mask.data = priv->sh->dv_meta_mask;
+	} else if (attr->transfer) {
+		return rte_flow_error_set(error, ENOTSUP,
+					RTE_FLOW_ERROR_TYPE_ITEM, item,
+					"extended metadata feature "
+					"should be enabled when "
+					"meta item is requested "
+					"with e-switch mode ");
 	}
 	if (!mask)
 		mask = &rte_flow_item_meta_mask;