[dpdk-dev] [PATCH] net/mlx5: fix metadata storing for NEON vectorized Rx burst

[dpdk-dev] [PATCH] net/mlx5: fix metadata storing for NEON vectorized Rx burst

[Viacheslav Ovsiienko]

There was the typo introducing the bug, affected the mlx5 vectorized
rx_burst on ARM architectures in case if CQE compression was enabled.

Fixes: 6c55b622a956 ("net/mlx5: set dynamic flow metadata in Rx queues")
Cc: stable@dpdk.org

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
---
 drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
index 6c31495..af924b7 100644
--- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
+++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
@@ -736,20 +736,20 @@
 						      pkt_info)->timestamp);
 			}
 		}
-		if (!!rxq->flow_meta_mask) {
+		if (rxq->dynf_meta) {
 			/* This code is subject for futher optimization. */
 			int32_t offs = rxq->flow_meta_offset;
 
 			*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) =
 				container_of(p0, struct mlx5_cqe,
 					     pkt_info)->flow_table_metadata;
-			*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) =
+			*RTE_MBUF_DYNFIELD(pkts[pos + 1], offs, uint32_t *) =
 				container_of(p1, struct mlx5_cqe,
 					     pkt_info)->flow_table_metadata;
-			*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) =
+			*RTE_MBUF_DYNFIELD(pkts[pos + 2], offs, uint32_t *) =
 				container_of(p2, struct mlx5_cqe,
 					     pkt_info)->flow_table_metadata;
-			*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) =
+			*RTE_MBUF_DYNFIELD(pkts[pos + 3], offs, uint32_t *) =
 				container_of(p3, struct mlx5_cqe,
 					     pkt_info)->flow_table_metadata;
 			if (*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *))
-- 
1.8.3.1

Re: [dpdk-dev] [PATCH] net/mlx5: fix metadata storing for NEON vectorized Rx burst

[Raslan Darawsheh]

Hi,

> -----Original Message-----
> From: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
> Sent: Thursday, July 23, 2020 1:54 PM
> To: dev@dpdk.org
> Cc: Matan Azrad <matan@mellanox.com>; Raslan Darawsheh
> <rasland@mellanox.com>; Alexander Kozyrev <akozyrev@mellanox.com>;
> stable@dpdk.org
> Subject: [PATCH] net/mlx5: fix metadata storing for NEON vectorized Rx
> burst
> 
> There was the typo introducing the bug, affected the mlx5 vectorized
> rx_burst on ARM architectures in case if CQE compression was enabled.
> 
> Fixes: 6c55b622a956 ("net/mlx5: set dynamic flow metadata in Rx queues")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
> b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
> index 6c31495..af924b7 100644
> --- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
> +++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
> @@ -736,20 +736,20 @@
>  						      pkt_info)->timestamp);
>  			}
>  		}
> -		if (!!rxq->flow_meta_mask) {
> +		if (rxq->dynf_meta) {
>  			/* This code is subject for futher optimization. */
>  			int32_t offs = rxq->flow_meta_offset;
> 
>  			*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) =
>  				container_of(p0, struct mlx5_cqe,
>  					     pkt_info)->flow_table_metadata;
> -			*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) =
> +			*RTE_MBUF_DYNFIELD(pkts[pos + 1], offs, uint32_t
> *) =
>  				container_of(p1, struct mlx5_cqe,
>  					     pkt_info)->flow_table_metadata;
> -			*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) =
> +			*RTE_MBUF_DYNFIELD(pkts[pos + 2], offs, uint32_t
> *) =
>  				container_of(p2, struct mlx5_cqe,
>  					     pkt_info)->flow_table_metadata;
> -			*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) =
> +			*RTE_MBUF_DYNFIELD(pkts[pos + 3], offs, uint32_t
> *) =
>  				container_of(p3, struct mlx5_cqe,
>  					     pkt_info)->flow_table_metadata;
>  			if (*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t
> *))
> --
> 1.8.3.1


Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh