patch 'net/iavf: fix order of tags for AVX512 Tx QinQ offload' has been queued to stable release 25.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 25.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 03/23/26. 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/30cbcba9866f2cda4241ec7a225b0777c04b73b0

Thanks.

Kevin

---
>From 30cbcba9866f2cda4241ec7a225b0777c04b73b0 Mon Sep 17 00:00:00 2001
From: Ciara Loftus <ciara.loftus at intel.com>
Date: Fri, 6 Mar 2026 15:10:32 +0000
Subject: [PATCH] net/iavf: fix order of tags for AVX512 Tx QinQ offload

[ upstream commit 079095da2a7e2d62f46893f34f6e094e381ebd75 ]

The tags were not inserted the correct order in the bulk context
descriptor function on the AVX512 path. Fix it so that it is consistent
with the single packet function and the scalar path implementation.

Fixes: 23ef9b485dec ("net/iavf: fix conditions for AVX-512 VLAN offload")

Signed-off-by: Ciara Loftus <ciara.loftus at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c b/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c
index 3aced29784..096e056b8b 100644
--- a/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c
+++ b/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c
@@ -2139,6 +2139,6 @@ ctx_vtx(volatile struct iavf_tx_desc *txdp,
 			if (pkt[1]->ol_flags & RTE_MBUF_F_TX_QINQ) {
 				uint64_t qinq_tag = vlan_flag & IAVF_TX_FLAGS_VLAN_TAG_LOC_L2TAG2 ?
-					(uint64_t)pkt[1]->vlan_tci :
-					(uint64_t)pkt[1]->vlan_tci_outer;
+					(uint64_t)pkt[1]->vlan_tci_outer :
+					(uint64_t)pkt[1]->vlan_tci;
 				hi_ctx_qw1 |= IAVF_TX_CTX_DESC_IL2TAG2 <<
 						IAVF_TXD_CTX_QW1_CMD_SHIFT;
@@ -2161,6 +2161,6 @@ ctx_vtx(volatile struct iavf_tx_desc *txdp,
 			if (pkt[0]->ol_flags & RTE_MBUF_F_TX_QINQ) {
 				uint64_t qinq_tag = vlan_flag & IAVF_TX_FLAGS_VLAN_TAG_LOC_L2TAG2 ?
-					(uint64_t)pkt[0]->vlan_tci :
-					(uint64_t)pkt[0]->vlan_tci_outer;
+					(uint64_t)pkt[0]->vlan_tci_outer :
+					(uint64_t)pkt[0]->vlan_tci;
 				hi_ctx_qw0 |= IAVF_TX_CTX_DESC_IL2TAG2 <<
 						IAVF_TXD_CTX_QW1_CMD_SHIFT;
-- 
2.53.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-03-19 10:01:07.811192166 +0000
+++ 0023-net-iavf-fix-order-of-tags-for-AVX512-Tx-QinQ-offloa.patch	2026-03-19 10:01:07.085331262 +0000
@@ -1 +1 @@
-From 079095da2a7e2d62f46893f34f6e094e381ebd75 Mon Sep 17 00:00:00 2001
+From 30cbcba9866f2cda4241ec7a225b0777c04b73b0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 079095da2a7e2d62f46893f34f6e094e381ebd75 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 9a93a0b062..4e8bf94fa0 100644
+index 3aced29784..096e056b8b 100644
@@ -23 +24 @@
-@@ -2126,6 +2126,6 @@ ctx_vtx(volatile struct ci_tx_desc *txdp,
+@@ -2139,6 +2139,6 @@ ctx_vtx(volatile struct iavf_tx_desc *txdp,
@@ -30,3 +31,3 @@
- 				hi_ctx_qw1 |= CI_TX_CTX_DESC_IL2TAG2 << CI_TXD_QW1_CMD_S;
- 				low_ctx_qw1 |= qinq_tag << IAVF_TXD_CTX_QW0_L2TAG2_PARAM;
-@@ -2146,6 +2146,6 @@ ctx_vtx(volatile struct ci_tx_desc *txdp,
+ 				hi_ctx_qw1 |= IAVF_TX_CTX_DESC_IL2TAG2 <<
+ 						IAVF_TXD_CTX_QW1_CMD_SHIFT;
+@@ -2161,6 +2161,6 @@ ctx_vtx(volatile struct iavf_tx_desc *txdp,
@@ -39,2 +40,2 @@
- 				hi_ctx_qw0 |= IAVF_TX_CTX_DESC_IL2TAG2 << CI_TXD_QW1_CMD_S;
- 				low_ctx_qw0 |= qinq_tag << IAVF_TXD_CTX_QW0_L2TAG2_PARAM;
+ 				hi_ctx_qw0 |= IAVF_TX_CTX_DESC_IL2TAG2 <<
+ 						IAVF_TXD_CTX_QW1_CMD_SHIFT;