Skip to contentSkip to conversation

net/vdev_netvsc: prevent alarm loss on failed device probe

PATCH Applied Long Li 3 participants 3 messages Oct 22, 2020 – Oct 29, 2020 Network drivers

lore
Share & tools
lore

Long Li

author
#0 lore raw

PATCH v2 1/1 net/vdev_netvsc: prevent alarm loss on failed device probe

From: Long Li <[email protected]>

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.

Change log:
v2: removed lock and flags, use counter to decide if alarm should be reset

---
 drivers/net/vdev_netvsc/vdev_netvsc.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)
drivers/net/vdev_netvsc/vdev_netvsc.c +13 -14
index a865a82811..9ed8a4949d 100644
@@ -684,6 +684,7 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)
 	int ret;
 
 	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");
 		goto error;
@@ -699,17 +700,13 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)
 			 !strcmp(pair->key, VDEV_NETVSC_ARG_MAC))
 			++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"
 			" device.");
 		goto error;
 	}
-	rte_eal_alarm_cancel(vdev_netvsc_alarm, NULL);
 	/* Gather interfaces. */
 	ret = vdev_netvsc_foreach_iface(vdev_netvsc_netvsc_probe, 1, name,
 					kvargs, specified, &matched);
@@ -730,17 +727,19 @@ 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;
 }
 
Signature · 1 line
2.25.1
Acked-by on v2 1/1
#1 lore raw

Hi Long

From: Long Li <[email protected]>

Quoted 11 lines

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.

Change log:
v2: removed lock and flags, use counter to decide if alarm should be reset

I suggest the next title:
net/vdev_netvsc: fix device probing error flow

and the next fixes line:

Fixes e7dc5d7becc5 ("net/vdev_netvsc: implement core functionality")
Applied
#2 lore raw
Quoted 15 lines · Matan Azrad

Hi Long

From: Long Li <[email protected]>

Quoted 11 lines

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.

Change log:
v2: removed lock and flags, use counter to decide if alarm should be reset

Quoted 8 lines

I suggest the next title:
net/vdev_netvsc: fix device probing error flow

and the next fixes line:

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

Applied to dpdk-next-net/main, thanks.

(Used suggested title)