vdevs detach on testpmd exit implemented as workaround to fix
a virtio-user issue. The issue was virtio-user cleanup is not
called and existing socket file not cleaned up which will fail
next run.
The vdev cleanup causing problems in failsafe PMD.
Reduce the cleanup to only virtio-user and add a comment that this
workaround should be converted to a proper cleanup, not something
specific to virtio-user, and not something specific to vdev and
testpmd.
Fixes: fe890955114d ("app/testpmd: fix exit for vdevs")
Signed-off-by: Ferruh Yigit <ferruh.yi...@intel.com>
---
Cc: Zhiyong Yang <zhiyong.y...@intel.com>
Cc: Bernard Iremonger <bernard.iremon...@intel.com>
Cc: Thomas Monjalon <tho...@monjalon.net>
---
app/test-pmd/testpmd.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index cfa6da60c..c3990d693 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2014,7 +2014,6 @@ detach_port(portid_t port_id)
void
pmd_test_exit(void)
{
- const struct rte_bus *bus;
struct rte_device *device;
portid_t pt_id;
int ret;
@@ -2025,13 +2024,21 @@ pmd_test_exit(void)
if (ports != NULL) {
no_link_check = 1;
RTE_ETH_FOREACH_DEV(pt_id) {
- device = rte_eth_devices[pt_id].device;
- bus = rte_bus_find_by_device(device);
printf("\nShutting down port %d...\n", pt_id);
fflush(stdout);
stop_port(pt_id);
close_port(pt_id);
- if (bus && !strcmp(bus->name, "vdev"))
+
+ /*
+ * This is a workaround to fix a virtio-user issue that
+ * requires to call clean-up routine to remove existing
+ * socket.
+ * This workaround valid only for testpmd, needs a fix
+ * valid for all applications.
+ * TODO: Implement proper resource cleanup
+ */
+ device = rte_eth_devices[pt_id].device;
+ if (device && !strcmp(device->driver->name,
"net_virtio_user"))
detach_port(pt_id);
}
}
--
2.14.3
