[dpdk-stable] patch 'net/ice: fix ptype parsing' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/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 294e71a2e77d47c05925ff316f88d5acc42abdc7 Mon Sep 17 00:00:00 2001
From: Ting Xu <ting.xu at intel.com>
Date: Wed, 16 Sep 2020 11:02:28 +0800
Subject: [PATCH] net/ice: fix ptype parsing

[ upstream commit 0ff55924712e2a35476c0929235b21d2b77d9f97 ]

The ptype mask for flexible descriptor in Rx function ice_recv_pkts_vec
has a reversed order, which leads to an incorrect value of the final
ptype. This patch fix the mask to parse the correct ptype of RX packets.

Fixes: c68a52b8b38c ("net/ice: support vector SSE in Rx")

Signed-off-by: Ting Xu <ting.xu at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_rxtx_vec_sse.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ice/ice_rxtx_vec_sse.c b/drivers/net/ice/ice_rxtx_vec_sse.c
index 9d5f1f194f..70b43e680b 100644
--- a/drivers/net/ice/ice_rxtx_vec_sse.c
+++ b/drivers/net/ice/ice_rxtx_vec_sse.c
@@ -188,10 +188,10 @@ static inline void
 ice_rx_desc_to_ptype_v(__m128i descs[4], struct rte_mbuf **rx_pkts,
 		       uint32_t *ptype_tbl)
 {
-	const __m128i ptype_mask = _mm_set_epi16(0, ICE_RX_FLEX_DESC_PTYPE_M,
-						 0, ICE_RX_FLEX_DESC_PTYPE_M,
-						 0, ICE_RX_FLEX_DESC_PTYPE_M,
-						 0, ICE_RX_FLEX_DESC_PTYPE_M);
+	const __m128i ptype_mask = _mm_set_epi16(ICE_RX_FLEX_DESC_PTYPE_M, 0,
+						 ICE_RX_FLEX_DESC_PTYPE_M, 0,
+						 ICE_RX_FLEX_DESC_PTYPE_M, 0,
+						 ICE_RX_FLEX_DESC_PTYPE_M, 0);
 	__m128i ptype_01 = _mm_unpacklo_epi32(descs[0], descs[1]);
 	__m128i ptype_23 = _mm_unpacklo_epi32(descs[2], descs[3]);
 	__m128i ptype_all = _mm_unpacklo_epi64(ptype_01, ptype_23);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:13.106717229 +0000
+++ 0042-net-ice-fix-ptype-parsing.patch	2020-10-28 10:35:11.504830024 +0000
@@ -1,14 +1,15 @@
-From 0ff55924712e2a35476c0929235b21d2b77d9f97 Mon Sep 17 00:00:00 2001
+From 294e71a2e77d47c05925ff316f88d5acc42abdc7 Mon Sep 17 00:00:00 2001
 From: Ting Xu <ting.xu at intel.com>
 Date: Wed, 16 Sep 2020 11:02:28 +0800
 Subject: [PATCH] net/ice: fix ptype parsing
 
+[ upstream commit 0ff55924712e2a35476c0929235b21d2b77d9f97 ]
+
 The ptype mask for flexible descriptor in Rx function ice_recv_pkts_vec
 has a reversed order, which leads to an incorrect value of the final
 ptype. This patch fix the mask to parse the correct ptype of RX packets.
 
 Fixes: c68a52b8b38c ("net/ice: support vector SSE in Rx")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ting Xu <ting.xu at intel.com>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -17,10 +18,10 @@
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/ice/ice_rxtx_vec_sse.c b/drivers/net/ice/ice_rxtx_vec_sse.c
-index 965cd8b261..c4c9a91265 100644
+index 9d5f1f194f..70b43e680b 100644
 --- a/drivers/net/ice/ice_rxtx_vec_sse.c
 +++ b/drivers/net/ice/ice_rxtx_vec_sse.c
-@@ -237,10 +237,10 @@ static inline void
+@@ -188,10 +188,10 @@ static inline void
  ice_rx_desc_to_ptype_v(__m128i descs[4], struct rte_mbuf **rx_pkts,
  		       uint32_t *ptype_tbl)
  {