[v1] net/mlx5: fix VLAN PCP item calculation
diff mbox series

Message ID 20200226082748.18445-1-ophirmu@mellanox.com
State Accepted
Delegated to: Raslan Darawsheh
Headers show
Series
  • [v1] net/mlx5: fix VLAN PCP item calculation
Related show

Checks

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

Commit Message

Ophir Munk Feb. 26, 2020, 8:27 a.m. UTC
The VLAN 16 bits tci field contains both values of PCP and VID. When
extracting any one of them - it is required not to affect the other one.
Previous to this commit in routine flow_dev_get_vlan_info_from_items()
we calcualted the PCP as follows:
    (1) vlan->vlan_tci &= MLX5DV_FLOW_VLAN_PCP_MASK;
    (2) vlan->vlan_tci |= <3 bits value of PCP>
In line (1) we should have used the negated mask ('~' operator) such
that only the PCP bits will be nullified before ORing them with the
updated PCP value.

Fixes: 9aee7a8418 ("net/mlx5: support push flow action on VLAN header")

Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Slava Ovsiienko Feb. 26, 2020, 9:34 a.m. UTC | #1
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Ophir Munk
> Sent: Wednesday, February 26, 2020 10:28
> To: dev@dpdk.org
> Cc: Thomas Monjalon <thomas@monjalon.net>; Raslan Darawsheh
> <rasland@mellanox.com>; Ophir Munk <ophirmu@mellanox.com>
> Subject: [dpdk-dev] [PATCH v1] net/mlx5: fix VLAN PCP item calculation
> 
> The VLAN 16 bits tci field contains both values of PCP and VID. When
> extracting any one of them - it is required not to affect the other one.
> Previous to this commit in routine flow_dev_get_vlan_info_from_items()
> we calcualted the PCP as follows:
>     (1) vlan->vlan_tci &= MLX5DV_FLOW_VLAN_PCP_MASK;
>     (2) vlan->vlan_tci |= <3 bits value of PCP> In line (1) we should have used
> the negated mask ('~' operator) such that only the PCP bits will be nullified
> before ORing them with the updated PCP value.
> 
> Fixes: 9aee7a8418 ("net/mlx5: support push flow action on VLAN header")
> 
> Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>

PS. Ophir, I suppose this patch should be sent to the stable@dpdk.org either.

> ---
>  drivers/net/mlx5/mlx5_flow_dv.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c index 06592b5..2414a97 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -1771,7 +1771,7 @@ flow_dev_get_vlan_info_from_items(const struct
> rte_flow_item *items,
>  		/* Only full match values are accepted */
>  		if ((vlan_m->tci & MLX5DV_FLOW_VLAN_PCP_MASK_BE) ==
>  		     MLX5DV_FLOW_VLAN_PCP_MASK_BE) {
> -			vlan->vlan_tci &= MLX5DV_FLOW_VLAN_PCP_MASK;
> +			vlan->vlan_tci &= ~MLX5DV_FLOW_VLAN_PCP_MASK;
>  			vlan->vlan_tci |=
>  				rte_be_to_cpu_16(vlan_v->tci &
> 
> MLX5DV_FLOW_VLAN_PCP_MASK_BE);
> --
> 2.8.4
Raslan Darawsheh March 1, 2020, 11:16 a.m. UTC | #2
Hi,

> -----Original Message-----
> From: Ophir Munk <ophirmu@mellanox.com>
> Sent: Wednesday, February 26, 2020 10:28 AM
> To: dev@dpdk.org
> Cc: Thomas Monjalon <thomas@monjalon.net>; Raslan Darawsheh
> <rasland@mellanox.com>; Ophir Munk <ophirmu@mellanox.com>
> Subject: [PATCH v1] net/mlx5: fix VLAN PCP item calculation
> 
> The VLAN 16 bits tci field contains both values of PCP and VID. When
> extracting any one of them - it is required not to affect the other one.
> Previous to this commit in routine flow_dev_get_vlan_info_from_items()
> we calcualted the PCP as follows:
>     (1) vlan->vlan_tci &= MLX5DV_FLOW_VLAN_PCP_MASK;
>     (2) vlan->vlan_tci |= <3 bits value of PCP>
> In line (1) we should have used the negated mask ('~' operator) such
> that only the PCP bits will be nullified before ORing them with the
> updated PCP value.
> 
> Fixes: 9aee7a8418 ("net/mlx5: support push flow action on VLAN header")
> 
> Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_flow_dv.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c
> index 06592b5..2414a97 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -1771,7 +1771,7 @@ flow_dev_get_vlan_info_from_items(const struct
> rte_flow_item *items,
>  		/* Only full match values are accepted */
>  		if ((vlan_m->tci & MLX5DV_FLOW_VLAN_PCP_MASK_BE) ==
>  		     MLX5DV_FLOW_VLAN_PCP_MASK_BE) {
> -			vlan->vlan_tci &=
> MLX5DV_FLOW_VLAN_PCP_MASK;
> +			vlan->vlan_tci &=
> ~MLX5DV_FLOW_VLAN_PCP_MASK;
>  			vlan->vlan_tci |=
>  				rte_be_to_cpu_16(vlan_v->tci &
> 
> MLX5DV_FLOW_VLAN_PCP_MASK_BE);
> --
> 2.8.4



Added Cc: stable@dpdk.org,

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh

Patch
diff mbox series

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 06592b5..2414a97 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1771,7 +1771,7 @@  flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items,
 		/* Only full match values are accepted */
 		if ((vlan_m->tci & MLX5DV_FLOW_VLAN_PCP_MASK_BE) ==
 		     MLX5DV_FLOW_VLAN_PCP_MASK_BE) {
-			vlan->vlan_tci &= MLX5DV_FLOW_VLAN_PCP_MASK;
+			vlan->vlan_tci &= ~MLX5DV_FLOW_VLAN_PCP_MASK;
 			vlan->vlan_tci |=
 				rte_be_to_cpu_16(vlan_v->tci &
 						 MLX5DV_FLOW_VLAN_PCP_MASK_BE);