[dpdk-stable] patch 'net/vdev_netvsc: fix device probing error flow' has been queued to LTS release 18.11.11

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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/24/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.

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/e304c6da914b1a70d6bfb5ef9f58be5dd14ed943

Thanks.

Kevin.

---
From e304c6da914b1a70d6bfb5ef9f58be5dd14ed943 Mon Sep 17 00:00:00 2001
From: Long Li <longli@microsoft.com>
Date: Thu, 22 Oct 2020 01:11:34 -0700
Subject: [PATCH] net/vdev_netvsc: fix device probing error flow

[ upstream commit 702b27d3fc4b82643d08d4b072e6d61b6d73e6be ]

If a device probe fails, the alarm is canceled and will no longer work
for previously probed devices.

Fix this by checking if alarm is necessary at the end of each device
probe.  Reset the alarm if there are vdev_netvsc_ctx created.

Fixes: e7dc5d7becc5 ("net/vdev_netvsc: implement core functionality")

Signed-off-by: Long Li <longli@microsoft.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
 drivers/net/vdev_netvsc/vdev_netvsc.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/drivers/net/vdev_netvsc/vdev_netvsc.c b/drivers/net/vdev_netvsc/vdev_netvsc.c
index a865a82811..9ed8a4949d 100644
--- a/drivers/net/vdev_netvsc/vdev_netvsc.c
+++ b/drivers/net/vdev_netvsc/vdev_netvsc.c
@@ -685,4 +685,5 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)
 
 	DRV_LOG(DEBUG, "invoked as \"%s\", using arguments \"%s\"", name, args);
+	rte_eal_alarm_cancel(vdev_netvsc_alarm, NULL);
 	if (!kvargs) {
 		DRV_LOG(ERR, "cannot parse arguments list");
@@ -700,9 +701,6 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)
 			++specified;
 	}
-	if (ignore) {
-		if (kvargs)
-			rte_kvargs_free(kvargs);
-		return 0;
-	}
+	if (ignore)
+		goto ignore;
 	if (specified > 1) {
 		DRV_LOG(ERR, "More than one way used to specify the netvsc"
@@ -710,5 +708,4 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)
 		goto error;
 	}
-	rte_eal_alarm_cancel(vdev_netvsc_alarm, NULL);
 	/* Gather interfaces. */
 	ret = vdev_netvsc_foreach_iface(vdev_netvsc_netvsc_probe, 1, name,
@@ -731,15 +728,17 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)
 		DRV_LOG(WARNING, "non-netvsc device was probed as netvsc");
 	}
-	ret = rte_eal_alarm_set(VDEV_NETVSC_PROBE_MS * 1000,
-				vdev_netvsc_alarm, NULL);
-	if (ret < 0) {
-		DRV_LOG(ERR, "unable to schedule alarm callback: %s",
-			rte_strerror(-ret));
-		goto error;
-	}
 error:
+	++vdev_netvsc_ctx_inst;
+ignore:
 	if (kvargs)
 		rte_kvargs_free(kvargs);
-	++vdev_netvsc_ctx_inst;
+	/* Reset alarm if there are device context created */
+	if (vdev_netvsc_ctx_count) {
+		ret = rte_eal_alarm_set(VDEV_NETVSC_PROBE_MS * 1000,
+					vdev_netvsc_alarm, NULL);
+		if (ret < 0)
+			DRV_LOG(ERR, "unable to schedule alarm callback: %s",
+				rte_strerror(-ret));
+	}
 	return 0;
 }
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-18 16:33:39.173266366 +0000
+++ 0066-net-vdev_netvsc-fix-device-probing-error-flow.patch	2020-11-18 16:33:37.993215103 +0000
@@ -1 +1 @@
-From 702b27d3fc4b82643d08d4b072e6d61b6d73e6be Mon Sep 17 00:00:00 2001
+From e304c6da914b1a70d6bfb5ef9f58be5dd14ed943 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 702b27d3fc4b82643d08d4b072e6d61b6d73e6be ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 1ecb0b3e6a..c1b7099717 100644
+index a865a82811..9ed8a4949d 100644
@@ -25 +26 @@
-@@ -672,4 +672,5 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)
+@@ -685,4 +685,5 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)
@@ -31 +32 @@
-@@ -687,9 +688,6 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)
+@@ -700,9 +701,6 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)
@@ -43 +44 @@
-@@ -697,5 +695,4 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)
+@@ -710,5 +708,4 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)
@@ -49 +50 @@
-@@ -718,15 +715,17 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)
+@@ -731,15 +728,17 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)