[dpdk-stable] patch 'net/sfc/base: fix tunnel configuration' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

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

Luca Boccassi

---
>From 32e242838581c3748fb36a1669c040ca5cc2304e Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov at oktetlabs.ru>
Date: Tue, 8 Sep 2020 10:20:22 +0100
Subject: [PATCH] net/sfc/base: fix tunnel configuration

[ upstream commit 33f4e56dda2764eb62970a2c83f224fef43456c1 ]

Tunnel configuration may fail because of insufficient access rights
on a virtual function. Ignore the failure if a tunnel configuration
with empty UDP ports is requested.

Fixes: 17551f6dffcc ("net/sfc/base: add API to control UDP tunnel ports")

Signed-off-by: Igor Romanov <igor.romanov at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 drivers/net/sfc/base/efx_tunnel.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/net/sfc/base/efx_tunnel.c b/drivers/net/sfc/base/efx_tunnel.c
index edb6be028f..c92c02cfa2 100644
--- a/drivers/net/sfc/base/efx_tunnel.c
+++ b/drivers/net/sfc/base/efx_tunnel.c
@@ -421,7 +421,7 @@ ef10_tunnel_reconfigure(
 {
 	efx_tunnel_cfg_t *etcp = &enp->en_tunnel_cfg;
 	efx_rc_t rc;
-	boolean_t resetting;
+	boolean_t resetting = B_FALSE;
 	efsys_lock_state_t state;
 	efx_tunnel_cfg_t etc;
 
@@ -446,8 +446,14 @@ ef10_tunnel_reconfigure(
 		 */
 		rc = efx_mcdi_set_tunnel_encap_udp_ports(enp, &etc, B_FALSE,
 		    &resetting);
-		if (rc != 0)
-			goto fail2;
+		if (rc != 0) {
+			/*
+			 * Do not fail if the access is denied when no
+			 * tunnel encap UDP ports are configured.
+			 */
+			if (rc != EACCES || etc.etc_udp_entries_num != 0)
+				goto fail2;
+		}
 
 		/*
 		 * Although the caller should be able to handle MC reboot,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:13.314537070 +0000
+++ 0049-net-sfc-base-fix-tunnel-configuration.patch	2020-10-28 10:35:11.512830142 +0000
@@ -1,14 +1,15 @@
-From 33f4e56dda2764eb62970a2c83f224fef43456c1 Mon Sep 17 00:00:00 2001
+From 32e242838581c3748fb36a1669c040ca5cc2304e Mon Sep 17 00:00:00 2001
 From: Igor Romanov <igor.romanov at oktetlabs.ru>
 Date: Tue, 8 Sep 2020 10:20:22 +0100
 Subject: [PATCH] net/sfc/base: fix tunnel configuration
 
+[ upstream commit 33f4e56dda2764eb62970a2c83f224fef43456c1 ]
+
 Tunnel configuration may fail because of insufficient access rights
 on a virtual function. Ignore the failure if a tunnel configuration
 with empty UDP ports is requested.
 
 Fixes: 17551f6dffcc ("net/sfc/base: add API to control UDP tunnel ports")
-Cc: stable at dpdk.org
 
 Signed-off-by: Igor Romanov <igor.romanov at oktetlabs.ru>
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
@@ -17,7 +18,7 @@
  1 file changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/sfc/base/efx_tunnel.c b/drivers/net/sfc/base/efx_tunnel.c
-index 3a034412cd..1cc072f0d9 100644
+index edb6be028f..c92c02cfa2 100644
 --- a/drivers/net/sfc/base/efx_tunnel.c
 +++ b/drivers/net/sfc/base/efx_tunnel.c
 @@ -421,7 +421,7 @@ ef10_tunnel_reconfigure(