[dpdk-stable] patch 'net: adjust L2 length on soft VLAN insertion' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/6426f92cf57b3ce5d81497e3d5e3e5eb811452a5

Thanks.

Kevin Traynor

---
>From 6426f92cf57b3ce5d81497e3d5e3e5eb811452a5 Mon Sep 17 00:00:00 2001
From: Dilshod Urazov <dilshod.urazov at oktetlabs.ru>
Date: Mon, 24 Jun 2019 14:46:02 +0100
Subject: [PATCH] net: adjust L2 length on soft VLAN insertion

[ upstream commit 42caa11b370e17bdbba498766b0fbad0975d8fa9 ]

Layer 2 length must be updated after the prepend to mbuf to keep
the length right to be used by other Tx offloads.

If the packet has tunnel encapsulation, outer_l2_len should be
updated. Otherwise l2_len should be updated.

Fixes: c974021a5949 ("ether: add soft vlan encap/decap")

Signed-off-by: Dilshod Urazov <dilshod.urazov at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
Acked-by: Olivier Matz <olivier.matz at 6wind.com>
---
 lib/librte_net/rte_ether.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h
index e0d831113..71299d9e9 100644
--- a/lib/librte_net/rte_ether.h
+++ b/lib/librte_net/rte_ether.h
@@ -411,4 +411,9 @@ static inline int rte_vlan_insert(struct rte_mbuf **m)
 	(*m)->ol_flags &= ~(PKT_RX_VLAN_STRIPPED | PKT_TX_VLAN);
 
+	if ((*m)->ol_flags & PKT_TX_TUNNEL_MASK)
+		(*m)->outer_l2_len += sizeof(struct vlan_hdr);
+	else
+		(*m)->l2_len += sizeof(struct vlan_hdr);
+
 	return 0;
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-28 14:32:32.851666991 +0100
+++ 0019-net-adjust-L2-length-on-soft-VLAN-insertion.patch	2019-08-28 14:32:31.626957694 +0100
@@ -1 +1 @@
-From 42caa11b370e17bdbba498766b0fbad0975d8fa9 Mon Sep 17 00:00:00 2001
+From 6426f92cf57b3ce5d81497e3d5e3e5eb811452a5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 42caa11b370e17bdbba498766b0fbad0975d8fa9 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 8ac1afecc..8a040abf5 100644
+index e0d831113..71299d9e9 100644
@@ -26 +27 @@
-@@ -406,4 +406,9 @@ static inline int rte_vlan_insert(struct rte_mbuf **m)
+@@ -411,4 +411,9 @@ static inline int rte_vlan_insert(struct rte_mbuf **m)
@@ -30 +31 @@
-+		(*m)->outer_l2_len += sizeof(struct rte_vlan_hdr);
++		(*m)->outer_l2_len += sizeof(struct vlan_hdr);
@@ -32 +33 @@
-+		(*m)->l2_len += sizeof(struct rte_vlan_hdr);
++		(*m)->l2_len += sizeof(struct vlan_hdr);