[dpdk-stable] patch 'net/sfc: discard last seen VLAN TCI if Tx packet is dropped' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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/07/19. 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.

Kevin Traynor

---
>From ca3d65836161370e7593d4b85fe944b71e551fd8 Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov at oktetlabs.ru>
Date: Wed, 9 Jan 2019 11:06:39 +0000
Subject: [PATCH] net/sfc: discard last seen VLAN TCI if Tx packet is dropped

[ upstream commit 649885c08e51bcb8680ed2aa522d0f5160dd8fb1 ]

Early processing of a packet on transmit may change last seen
VLAN TCI in the queue context. If such a packet is eventually
dropped, last seen VLAN TCI must be set to its previous value.

Fixes: 7fd636815a43 ("net/sfc: support VLAN offload on transmit path")

Signed-off-by: Ivan Malov <ivan.malov at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 drivers/net/sfc/sfc_tx.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c
index cce823954..aa73d2642 100644
--- a/drivers/net/sfc/sfc_tx.c
+++ b/drivers/net/sfc/sfc_tx.c
@@ -713,4 +713,5 @@ sfc_efx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 	     (pkts_sent < nb_pkts) && (fill_level <= soft_max_fill);
 	     pkts_sent++, pktp++) {
+		uint16_t		hw_vlan_tci_prev = txq->hw_vlan_tci;
 		struct rte_mbuf		*m_seg = *pktp;
 		size_t			pkt_len = m_seg->pkt_len;
@@ -751,4 +752,5 @@ sfc_efx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 				 */
 				pend -= pkt_descs;
+				txq->hw_vlan_tci = hw_vlan_tci_prev;
 
 				rte_pktmbuf_free(*pktp);
@@ -820,8 +822,10 @@ sfc_efx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 				if (fill_level > hard_max_fill) {
 					pend -= pkt_descs;
+					txq->hw_vlan_tci = hw_vlan_tci_prev;
 					break;
 				}
 			} else {
 				pend -= pkt_descs;
+				txq->hw_vlan_tci = hw_vlan_tci_prev;
 				break;
 			}
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-31 15:44:06.655119402 +0000
+++ 0039-net-sfc-discard-last-seen-VLAN-TCI-if-Tx-packet-is-d.patch	2019-01-31 15:44:05.000000000 +0000
@@ -1,14 +1,15 @@
-From 649885c08e51bcb8680ed2aa522d0f5160dd8fb1 Mon Sep 17 00:00:00 2001
+From ca3d65836161370e7593d4b85fe944b71e551fd8 Mon Sep 17 00:00:00 2001
 From: Ivan Malov <ivan.malov at oktetlabs.ru>
 Date: Wed, 9 Jan 2019 11:06:39 +0000
 Subject: [PATCH] net/sfc: discard last seen VLAN TCI if Tx packet is dropped
 
+[ upstream commit 649885c08e51bcb8680ed2aa522d0f5160dd8fb1 ]
+
 Early processing of a packet on transmit may change last seen
 VLAN TCI in the queue context. If such a packet is eventually
 dropped, last seen VLAN TCI must be set to its previous value.
 
 Fixes: 7fd636815a43 ("net/sfc: support VLAN offload on transmit path")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ivan Malov <ivan.malov at oktetlabs.ru>
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>