[dpdk-stable] patch 'net/qede: fix Tx tunnel offload support mask' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.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 12/08/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 2f99aad6ec549118d30f2cf038ba0644fc3f043d Mon Sep 17 00:00:00 2001
From: Shahed Shaikh <shahed.shaikh at cavium.com>
Date: Mon, 12 Nov 2018 18:19:38 +0000
Subject: [PATCH] net/qede: fix Tx tunnel offload support mask

[ upstream commit 49d3978d5723a3a71c348e1623cd10d489c0d4c0 ]

Tunneling offloads are represented by multi-bit values. So, feature
wise tunneling offload can only be entirely supported/unsupported
using PKT_TX_TUNNEL_MASK. Its upon PMDs to further isolate which of
the tunneling offload types are supported by respective PMD.
Using subset of bits from PKT_TX_TUNNEL_MASK to indicate supported vs
unsupported offloads can lead to undesired result.

Use PKT_TX_TUNNEL_MASK in QEDE_TX_OFFLOAD_MASK and use independent
value of supported PKT_TX_TUNNEL_* in .tx_pkt_prepare() to mark
supported tunnel offloads.

Fixes: 44346c24b790 ("net/qede: fix VXLAN tunnel Tx offload flag setting")

Suggested-by: Ferruh Yigit <ferruh.yigit at intel.com>
Signed-off-by: Shahed Shaikh <shahed.shaikh at cavium.com>
Reviewed-by: Rasesh Mody <rasesh.mody at cavium.com>
---
 drivers/net/qede/qede_rxtx.c | 12 ++++++++++++
 drivers/net/qede/qede_rxtx.h |  5 +----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
index 963a8b421..23494d0f3 100644
--- a/drivers/net/qede/qede_rxtx.c
+++ b/drivers/net/qede/qede_rxtx.c
@@ -1762,4 +1762,16 @@ qede_xmit_prep_pkts(__rte_unused void *p_txq, struct rte_mbuf **tx_pkts,
 		}
 		if (ol_flags & QEDE_TX_OFFLOAD_NOTSUP_MASK) {
+			/* We support only limited tunnel protocols */
+			if (ol_flags & PKT_TX_TUNNEL_MASK) {
+				uint64_t temp;
+
+				temp = ol_flags & PKT_TX_TUNNEL_MASK;
+				if (temp == PKT_TX_TUNNEL_VXLAN ||
+				    temp == PKT_TX_TUNNEL_GENEVE ||
+				    temp == PKT_TX_TUNNEL_MPLSINUDP ||
+				    temp == PKT_TX_TUNNEL_GRE)
+					break;
+			}
+
 			rte_errno = -ENOTSUP;
 			break;
diff --git a/drivers/net/qede/qede_rxtx.h b/drivers/net/qede/qede_rxtx.h
index 8bd8d1c5a..70e6a1df2 100644
--- a/drivers/net/qede/qede_rxtx.h
+++ b/drivers/net/qede/qede_rxtx.h
@@ -154,8 +154,5 @@
 #define QEDE_TX_OFFLOAD_MASK (QEDE_TX_CSUM_OFFLOAD_MASK | \
 			      PKT_TX_VLAN_PKT		| \
-			      PKT_TX_TUNNEL_VXLAN	| \
-			      PKT_TX_TUNNEL_GENEVE	| \
-			      PKT_TX_TUNNEL_MPLSINUDP   | \
-			      PKT_TX_TUNNEL_GRE)
+			      PKT_TX_TUNNEL_MASK)
 
 #define QEDE_TX_OFFLOAD_NOTSUP_MASK \
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-29 13:11:35.634915768 +0000
+++ 0023-net-qede-fix-Tx-tunnel-offload-support-mask.patch	2018-11-29 13:11:34.000000000 +0000
@@ -1,8 +1,10 @@
-From 49d3978d5723a3a71c348e1623cd10d489c0d4c0 Mon Sep 17 00:00:00 2001
+From 2f99aad6ec549118d30f2cf038ba0644fc3f043d Mon Sep 17 00:00:00 2001
 From: Shahed Shaikh <shahed.shaikh at cavium.com>
 Date: Mon, 12 Nov 2018 18:19:38 +0000
 Subject: [PATCH] net/qede: fix Tx tunnel offload support mask
 
+[ upstream commit 49d3978d5723a3a71c348e1623cd10d489c0d4c0 ]
+
 Tunneling offloads are represented by multi-bit values. So, feature
 wise tunneling offload can only be entirely supported/unsupported
 using PKT_TX_TUNNEL_MASK. Its upon PMDs to further isolate which of
@@ -15,7 +17,6 @@
 supported tunnel offloads.
 
 Fixes: 44346c24b790 ("net/qede: fix VXLAN tunnel Tx offload flag setting")
-Cc: stable at dpdk.org
 
 Suggested-by: Ferruh Yigit <ferruh.yigit at intel.com>
 Signed-off-by: Shahed Shaikh <shahed.shaikh at cavium.com>
@@ -26,7 +27,7 @@
  2 files changed, 13 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
-index 296189107..0e33be1a3 100644
+index 963a8b421..23494d0f3 100644
 --- a/drivers/net/qede/qede_rxtx.c
 +++ b/drivers/net/qede/qede_rxtx.c
 @@ -1762,4 +1762,16 @@ qede_xmit_prep_pkts(__rte_unused void *p_txq, struct rte_mbuf **tx_pkts,
@@ -47,7 +48,7 @@
  			rte_errno = -ENOTSUP;
  			break;
 diff --git a/drivers/net/qede/qede_rxtx.h b/drivers/net/qede/qede_rxtx.h
-index d3a41e92e..0afadd8da 100644
+index 8bd8d1c5a..70e6a1df2 100644
 --- a/drivers/net/qede/qede_rxtx.h
 +++ b/drivers/net/qede/qede_rxtx.h
 @@ -154,8 +154,5 @@