The command "port detach" is removing the EAL rte_device
of the ethdev port specified as parameter.
After detaching, the pointer, which maps a port to its device,
is resetted. This way, it is possible to check whether a port
is still associated to a (not removed) device.
Signed-off-by: Thomas Monjalon <tho...@monjalon.net>
---
app/test-pmd/testpmd.c | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 14647fa19..2a357affc 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2353,8 +2353,17 @@ setup_attached_port(portid_t pi)
void
detach_port(portid_t port_id)
{
+ struct rte_device *dev;
+ portid_t sibling;
+
printf("Removing a device...\n");
+ dev = rte_eth_devices[port_id].device;
+ if (dev == NULL) {
+ printf("Device already removed\n");
+ return;
+ }
+
if (ports[port_id].port_status != RTE_PORT_CLOSED) {
if (ports[port_id].port_status != RTE_PORT_STOPPED) {
printf("Port not stopped\n");
@@ -2365,15 +2374,25 @@ detach_port(portid_t port_id)
port_flow_flush(port_id);
}
- if (rte_dev_remove(rte_eth_devices[port_id].device) != 0) {
+ if (rte_dev_remove(dev) != 0) {
TESTPMD_LOG(ERR, "Failed to detach port %u\n", port_id);
return;
}
+ /* reset mapping between old ports and removed device */
+ for (sibling = 0; sibling < RTE_MAX_ETHPORTS; sibling++)
+ if (rte_eth_devices[sibling].device == dev) {
+ rte_eth_devices[sibling].device = NULL;
+ if (ports[sibling].port_status != RTE_PORT_CLOSED) {
+ ports[sibling].port_status = RTE_PORT_CLOSED;
+ printf("Port %u (%s) is closed\n", sibling,
+ rte_eth_devices[sibling].data->name);
+ }
+ }
+
remove_unused_fwd_ports();
- printf("Port %u is detached. Now total ports is %d\n",
- port_id, nb_ports);
+ printf("Now total ports is %d\n", nb_ports);
printf("Done\n");
return;
}
--
2.19.0
