[dpdk-stable] patch 'net/mlx5: fix metadata storing for NEON Rx' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/08/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 0fb94e1cf48787f268615e519fa2640183bc4d29 Mon Sep 17 00:00:00 2001
From: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
Date: Thu, 23 Jul 2020 10:53:32 +0000
Subject: [PATCH] net/mlx5: fix metadata storing for NEON Rx

[ upstream commit 4ffab7b9e199d6253e0b7fdcf4bef137930d0914 ]

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")

Signed-off-by: Viacheslav Ovsiienko <viacheslavo at 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 b2cf857fd..607659a62 100644
--- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
+++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
@@ -710,20 +710,20 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n,
 					container_of(p3, struct mlx5_cqe,
 						     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 *))
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:16.668130493 +0100
+++ 0022-net-mlx5-fix-metadata-storing-for-NEON-Rx.patch	2020-08-06 10:53:15.792597243 +0100
@@ -1,13 +1,14 @@
-From 4ffab7b9e199d6253e0b7fdcf4bef137930d0914 Mon Sep 17 00:00:00 2001
+From 0fb94e1cf48787f268615e519fa2640183bc4d29 Mon Sep 17 00:00:00 2001
 From: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
 Date: Thu, 23 Jul 2020 10:53:32 +0000
 Subject: [PATCH] net/mlx5: fix metadata storing for NEON Rx
 
+[ upstream commit 4ffab7b9e199d6253e0b7fdcf4bef137930d0914 ]
+
 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 at dpdk.org
 
 Signed-off-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
 ---
@@ -15,12 +16,12 @@
  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 6c3149523..af924b709 100644
+index b2cf857fd..607659a62 100644
 --- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
 +++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
-@@ -736,20 +736,20 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n,
- 						      pkt_info)->timestamp);
- 			}
+@@ -710,20 +710,20 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n,
+ 					container_of(p3, struct mlx5_cqe,
+ 						     pkt_info)->timestamp);
  		}
 -		if (!!rxq->flow_meta_mask) {
 +		if (rxq->dynf_meta) {