patch 'net/mlx5: fix assertion on flags set in packet mbuf' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/26/22. 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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/032e27c0b27fa089a70abc502f84590768d90e58

Thanks.

Kevin

---
>From 032e27c0b27fa089a70abc502f84590768d90e58 Mon Sep 17 00:00:00 2001
From: Lior Margalit <lmargalit at nvidia.com>
Date: Thu, 23 Dec 2021 10:15:41 +0200
Subject: [PATCH] net/mlx5: fix assertion on flags set in packet mbuf

[ upstream commit 0c7606b75be4f56a109f61f3cf2c7a819e760cd2 ]

Fixed the assertion on the flags set in pkt->ol_flags for vectorized
MPRQ.  With vectorized MPRQ the CQs are processed before copying the
MPRQ bufs so the valid assertion is that the expected flag is set and
not that the pkt->ol_flags equlas this flag alone.

Fixes: 0f20acbf5eda ("net/mlx5: implement vectorized MPRQ burst")

Signed-off-by: Lior Margalit <lmargalit at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/net/mlx5/mlx5_rx.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_rx.h b/drivers/net/mlx5/mlx5_rx.h
index adb759c235..c178f9a24b 100644
--- a/drivers/net/mlx5/mlx5_rx.h
+++ b/drivers/net/mlx5/mlx5_rx.h
@@ -544,5 +544,5 @@ mprq_buf_to_pkt(struct mlx5_rxq_data *rxq, struct rte_mbuf *pkt, uint32_t len,
 		/* Set mbuf head-room. */
 		SET_DATA_OFF(pkt, RTE_PKTMBUF_HEADROOM);
-		MLX5_ASSERT(pkt->ol_flags == RTE_MBUF_F_EXTERNAL);
+		MLX5_ASSERT(pkt->ol_flags & RTE_MBUF_F_EXTERNAL);
 		MLX5_ASSERT(rte_pktmbuf_tailroom(pkt) >=
 			len - (hdrm_overlap > 0 ? hdrm_overlap : 0));
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-21 15:22:45.598420777 +0000
+++ 0044-net-mlx5-fix-assertion-on-flags-set-in-packet-mbuf.patch	2022-02-21 15:22:44.088704119 +0000
@@ -1 +1 @@
-From 0c7606b75be4f56a109f61f3cf2c7a819e760cd2 Mon Sep 17 00:00:00 2001
+From 032e27c0b27fa089a70abc502f84590768d90e58 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0c7606b75be4f56a109f61f3cf2c7a819e760cd2 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org