[dpdk-dev] [PATCH] net/mlx5: fix VLAN actions with wildcard VLAN iten

[Raslan Darawsheh]

Hi,

> -----Original Message-----
> From: Dekel Peled <dekelp at mellanox.com>
> Sent: Wednesday, May 13, 2020 10:49 PM
> To: Matan Azrad <matan at mellanox.com>; Slava Ovsiienko
> <viacheslavo at mellanox.com>; Raslan Darawsheh <rasland at mellanox.com>
> Cc: dev at dpdk.org; stable at dpdk.org
> Subject: [PATCH] net/mlx5: fix VLAN actions with wildcard VLAN iten
> 
> Previous patch added support of VLAN item without VLAN ID value,
> i.e. using wildcard VLAN item, to match VLAN with any VLAN ID.
> The implication on VLAN actions was not taken into consideration.
> VLAN actions (e.g. push vlan) use the VLAN ID value in the VLAN item,
> and expect it to be valid.
> 
> This patch updates function flow_dev_get_vlan_info_from_items() to
> check the VLAN item contents before trying to use it.
> 
> Fixes: 92818d839e8e ("net/mlx5: fix match on empty VLAN item in DV
> mode")
> Cc: stable at dpdk.org
> 
> Signed-off-by: Dekel Peled <dekelp at mellanox.com>
> Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_flow_dv.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c
> index 8b018fb..ed2ecd2 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -1881,6 +1881,9 @@ struct field_modify_info modify_tcp[] = {
>  		const struct rte_flow_item_vlan *vlan_m = items->mask;
>  		const struct rte_flow_item_vlan *vlan_v = items->spec;
> 
> +		/* If VLAN item in pattern doesn't contain data, return here.
> */
> +		if (!vlan_v)
> +			return;
>  		if (!vlan_m)
>  			vlan_m = &nic_mask;
>  		/* Only full match values are accepted */
> --
> 1.8.3.1


Fixed typo in commit title (iten->item)

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh