patch 'net/iavf: fix VLAN offload with AVX2' has been queued to stable release 22.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/01/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=c0280459158695a9d64bd6a43fc27c3eb7b8bff8

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From c0280459158695a9d64bd6a43fc27c3eb7b8bff8 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt at redhat.com>
Date: Thu, 8 Dec 2022 13:19:16 +0100
Subject: [PATCH] net/iavf: fix VLAN offload with AVX2
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit eb24917428a1db11d6736e8c076077a47b991f01 ]

It has been observed that mbufs of some received VLAN packets had the
VLAN tag correctly set in vlan_tci, but ol_flags were missing the
VLAN-indicating flags.

_mm256_shuffle_epi8 operates as two independent 128-bit operations,
not as a single 256-bit operation. To have the RTE_MBUF_F_RX_VLAN* flags
reflected in the resulting vlan_flags for all 8 rx descriptors, the
input l2tag2_flags_shuf must contain the required pattern in both
128-bit halves.

Fixes: 3a1aca384d3a ("net/iavf: fix VLAN tag extraction handling")

Signed-off-by: Michal Schmidt <mschmidt at redhat.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
Acked-by: Wenzhuo Lu <wenzhuo.lu at intel.com>
---
 .mailmap                              | 1 +
 drivers/net/iavf/iavf_rxtx_vec_avx2.c | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index eb5bd55eb1..c5ee0741b7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -888,6 +888,7 @@ Michal Litwicki <michalx.litwicki at intel.com>
 Michal Mazurek <maz at semihalf.com>
 Michal Michalik <michal.michalik at intel.com>
 Michał Mirosław <michal.miroslaw at atendesoftware.pl> <mirq-linux at rere.qmqm.pl>
+Michal Schmidt <mschmidt at redhat.com>
 Michal Swiatkowski <michal.swiatkowski at intel.com>
 Michal Wilczynski <michal.wilczynski at intel.com>
 Michel Machado <michel at digirati.com.br>
diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
index 862f6eb0c0..b4ebac9d34 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_avx2.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
@@ -1074,7 +1074,10 @@ _iavf_recv_raw_pkts_vec_avx2_flex_rxd(struct iavf_rx_queue *rxq,
 					_mm256_set_epi8(0, 0, 0, 0,
 							0, 0, 0, 0,
 							0, 0, 0, 0,
-							0, 0, 0, 0,
+							0, 0,
+							RTE_MBUF_F_RX_VLAN |
+							RTE_MBUF_F_RX_VLAN_STRIPPED,
+							0,
 							/* end up 128-bits */
 							0, 0, 0, 0,
 							0, 0, 0, 0,
--
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-27 14:08:45.394777600 +0800
+++ 0142-net-iavf-fix-VLAN-offload-with-AVX2.patch	2023-02-27 14:08:40.929237000 +0800
@@ -1 +1 @@
-From eb24917428a1db11d6736e8c076077a47b991f01 Mon Sep 17 00:00:00 2001
+From c0280459158695a9d64bd6a43fc27c3eb7b8bff8 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit eb24917428a1db11d6736e8c076077a47b991f01 ]
@@ -17 +19,0 @@
-Cc: stable at dpdk.org
@@ -28 +30 @@
-index 2cb7f5accb..e111e05bc2 100644
+index eb5bd55eb1..c5ee0741b7 100644
@@ -31 +33 @@
-@@ -894,6 +894,7 @@ Michal Litwicki <michalx.litwicki at intel.com>
+@@ -888,6 +888,7 @@ Michal Litwicki <michalx.litwicki at intel.com>