The custom scan callback unconditionally injects net_vdev_netvsc into
the devargs list on any Hyper-V system without checking whether NetVSC
interfaces actually exist. This causes the eal_flags_vdev_opt_autotest
to fail on GitHub Actions runners (which are Azure/Hyper-V VMs) because
the vdev bus probes both the test's intended vdev and the injected
net_vdev_netvsc, which fails to initialize on systems without NetVSC
interfaces.
Check whether at least one NetVSC interface exists (via the sysfs
class_id check the driver already uses) before adding devargs in the
scan callback.
Fixes: 56252de779a6 ("net/vdev_netvsc: add automatic probing")
Cc: [email protected]
Signed-off-by: Stephen Hemminger <[email protected]>
---
drivers/net/vdev_netvsc/vdev_netvsc.c | 29 +++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/drivers/net/vdev_netvsc/vdev_netvsc.c
b/drivers/net/vdev_netvsc/vdev_netvsc.c
index f4a84783ce..0c7cd4aa4f 100644
--- a/drivers/net/vdev_netvsc/vdev_netvsc.c
+++ b/drivers/net/vdev_netvsc/vdev_netvsc.c
@@ -768,6 +768,32 @@ RTE_PMD_REGISTER_PARAM_STRING(net_vdev_netvsc,
VDEV_NETVSC_ARG_FORCE "=<int> "
VDEV_NETVSC_ARG_IGNORE "=<int>");
+/**
+ * Check whether any NetVSC interface exists on the system.
+ *
+ * @return
+ * Nonzero value when at least one NetVSC interface is found, 0 otherwise.
+ */
+static int
+vdev_netvsc_any_netvsc_exists(void)
+{
+ struct if_nameindex *iface;
+ int ret = 0;
+ unsigned int i;
+
+ iface = if_nameindex();
+ if (iface == NULL)
+ return 0;
+ for (i = 0; iface[i].if_name != NULL; ++i) {
+ if (vdev_netvsc_iface_is_netvsc(&iface[i])) {
+ ret = 1;
+ break;
+ }
+ }
+ if_freenameindex(iface);
+ return ret;
+}
+
/** Compare function for vdev find device operation. */
static int
vdev_netvsc_cmp_rte_device(const struct rte_device *dev1,
@@ -798,6 +824,9 @@ vdev_netvsc_scan_callback(__rte_unused void *arg)
VDEV_NETVSC_DRIVER_NAME);
if (dev)
return;
+ /* Only inject if at least one NetVSC interface actually exists. */
+ if (!vdev_netvsc_any_netvsc_exists())
+ return;
if (rte_devargs_add(RTE_DEVTYPE_VIRTUAL, VDEV_NETVSC_DRIVER_NAME))
DRV_LOG(ERR, "unable to add netvsc devargs.");
}
--
2.51.0