From: Long Li <lon...@microsoft.com>
An RTE device can have multiple Ethernet devices. On hot plug events, it
can't be removed until all its Ethernet devices have been removed.
Fixes: a2a23a794b3a ("net/netvsc: support VF device hot add/remove")
Cc: sta...@dpdk.org
Signed-off-by: Long Li <lon...@microsoft.com>
---
drivers/net/netvsc/hn_vf.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/net/netvsc/hn_vf.c b/drivers/net/netvsc/hn_vf.c
index b664beaa5d..5d8058774d 100644
--- a/drivers/net/netvsc/hn_vf.c
+++ b/drivers/net/netvsc/hn_vf.c
@@ -102,6 +102,7 @@ static void hn_remove_delayed(void *args)
uint16_t port_id = hv->vf_ctx.vf_port;
struct rte_device *dev = rte_eth_devices[port_id].device;
int ret;
+ bool all_eth_removed;
/* Tell VSP to switch data path to synthetic */
hn_vf_remove(hv);
@@ -138,7 +139,17 @@ static void hn_remove_delayed(void *args)
PMD_DRV_LOG(ERR, "rte_eth_dev_close failed port_id=%u ret=%d",
port_id, ret);
- ret = rte_dev_remove(dev);
+ /* Remove the rte device when all its eth devices are removed */
+ all_eth_removed = true;
+ RTE_ETH_FOREACH_DEV_OF(port_id, dev) {
+ if (rte_eth_devices[port_id].state != RTE_ETH_DEV_UNUSED) {
+ all_eth_removed = false;
+ break;
+ }
+ }
+ if (all_eth_removed)
+ ret = rte_dev_remove(dev);
+
hv->vf_ctx.vf_state = vf_removed;
rte_rwlock_write_unlock(&hv->vf_lock);
--
2.34.1
