From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 6CF3B1B108 for ; Wed, 21 Nov 2018 17:50:08 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A72C4811DA; Wed, 21 Nov 2018 16:50:07 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1E025C21E; Wed, 21 Nov 2018 16:50:06 +0000 (UTC) From: Kevin Traynor To: Hyong Youb Kim Cc: John Daley , dpdk stable Date: Wed, 21 Nov 2018 16:47:39 +0000 Message-Id: <20181121164828.32249-25-ktraynor@redhat.com> In-Reply-To: <20181121164828.32249-1-ktraynor@redhat.com> References: <20181121164828.32249-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 21 Nov 2018 16:50:07 +0000 (UTC) Subject: [dpdk-stable] patch 'net/enic: explicitly disable overlay offload' has been queued to stable release 18.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Nov 2018 16:50:08 -0000 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 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 Reviewed-by: John Daley --- 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 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@dpdk.org Signed-off-by: Hyong Youb Kim Reviewed-by: John Daley @@ -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) {