[dpdk-stable] patch 'net/enic: explicitly disable overlay offload' 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 11/27/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 cd3f20a1025595d25179ccd30000c30285a4b7dd Mon Sep 17 00:00:00 2001
From: Hyong Youb Kim <hyonkim at cisco.com>
Date: Tue, 25 Sep 2018 19:54:22 -0700
Subject: [PATCH] net/enic: explicitly disable overlay offload

[ upstream commit 308b514b8e8f712e5df1aa40b6bbd8958dc5e6b4 ]

Reopening vNIC does not automatically disable overlay offload. If it
is previously enabled, it remains enabled even when the user restarts
DPDK and requests overlay offload to be disabled via devarg
disable-overlay=1. So explicitly disable overlay offload when
requested.

Fixes: 93fb21fdbe23 ("net/enic: enable overlay offload for VXLAN and GENEVE")

Signed-off-by: Hyong Youb Kim <hyonkim at cisco.com>
Reviewed-by: John Daley <johndale at cisco.com>
---
 drivers/net/enic/enic_main.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index fd940c583..c3c2e4fdf 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -1645,4 +1645,17 @@ static int enic_dev_init(struct enic *enic)
 
 	enic->overlay_offload = false;
+	if (enic->disable_overlay && enic->vxlan) {
+		/*
+		 * Explicitly disable overlay offload as the setting is
+		 * sticky, and resetting vNIC does not disable it.
+		 */
+		if (vnic_dev_overlay_offload_ctrl(enic->vdev,
+						  OVERLAY_FEATURE_VXLAN,
+						  OVERLAY_OFFLOAD_DISABLE)) {
+			dev_err(enic, "failed to disable overlay offload\n");
+		} else {
+			dev_info(enic, "Overlay offload is disabled\n");
+		}
+	}
 	if (!enic->disable_overlay && enic->vxlan &&
 	    /* 'VXLAN feature' enables VXLAN, NVGRE, and GENEVE. */
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 16:44:31.610486196 +0000
+++ 0025-net-enic-explicitly-disable-overlay-offload.patch	2018-11-21 16:44:30.000000000 +0000
@@ -1,8 +1,10 @@
-From 308b514b8e8f712e5df1aa40b6bbd8958dc5e6b4 Mon Sep 17 00:00:00 2001
+From cd3f20a1025595d25179ccd30000c30285a4b7dd Mon Sep 17 00:00:00 2001
 From: Hyong Youb Kim <hyonkim at cisco.com>
 Date: Tue, 25 Sep 2018 19:54:22 -0700
 Subject: [PATCH] net/enic: explicitly disable overlay offload
 
+[ upstream commit 308b514b8e8f712e5df1aa40b6bbd8958dc5e6b4 ]
+
 Reopening vNIC does not automatically disable overlay offload. If it
 is previously enabled, it remains enabled even when the user restarts
 DPDK and requests overlay offload to be disabled via devarg
@@ -10,7 +12,6 @@
 requested.
 
 Fixes: 93fb21fdbe23 ("net/enic: enable overlay offload for VXLAN and GENEVE")
-Cc: stable at dpdk.org
 
 Signed-off-by: Hyong Youb Kim <hyonkim at cisco.com>
 Reviewed-by: John Daley <johndale at cisco.com>
@@ -19,10 +20,10 @@
  1 file changed, 13 insertions(+)
 
 diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
-index 03c5ef741..af29f9d90 100644
+index fd940c583..c3c2e4fdf 100644
 --- a/drivers/net/enic/enic_main.c
 +++ b/drivers/net/enic/enic_main.c
-@@ -1653,4 +1653,17 @@ static int enic_dev_init(struct enic *enic)
+@@ -1645,4 +1645,17 @@ static int enic_dev_init(struct enic *enic)
  
  	enic->overlay_offload = false;
 +	if (enic->disable_overlay && enic->vxlan) {