drivers/net: accept removing device without any port

The ports can be closed (i.e. completely released)
before removing the whole device.
Such case was wrongly considered an error by some drivers.

If the device supports only one port, there is nothing much
to free after the port is closed.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
Reviewed-by: Rosen Xu <rosen.xu@intel.com>
Reviewed-by: Sachin Saxena <sachin.saxena@oss.nxp.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/drivers/net/ipn3ke/ipn3ke_ethdev.c b/drivers/net/ipn3ke/ipn3ke_ethdev.c
index 027be29bd860aa0e784fc930d26b817b5aa3438b..4446d2af9efe7e104a7c5548f6e65904dbbcaa9a 100644 (file)
--- a/drivers/net/ipn3ke/ipn3ke_ethdev.c
+++ b/drivers/net/ipn3ke/ipn3ke_ethdev.c
@@ -562,10 +562,8 @@ static int ipn3ke_vswitch_remove(struct rte_afu_device *afu_dev)
                        afu_dev->device.name, i);
 
                ethdev = rte_eth_dev_allocated(afu_dev->device.name);
-               if (!ethdev)
-                       return -ENODEV;
-
-               rte_eth_dev_destroy(ethdev, ipn3ke_rpst_uninit);
+               if (ethdev != NULL)
+                       rte_eth_dev_destroy(ethdev, ipn3ke_rpst_uninit);
        }
 
        ret = rte_eth_switch_domain_free(hw->switch_domain_id);

diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c
index 45ab1b17a84efb3c9768876906fcd197c9b8dcba..2a4058f7b06aff8bde9d159495f6a4a2bc56c5ec 100644 (file)
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -488,17 +488,15 @@ eth_kni_remove(struct rte_vdev_device *vdev)
 
        /* find the ethdev entry */
        eth_dev = rte_eth_dev_allocated(name);
-       if (eth_dev == NULL)
-               return -1;
-
-       if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
-               eth_kni_dev_stop(eth_dev);
-               return rte_eth_dev_release_port(eth_dev);
+       if (eth_dev != NULL) {
+               if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+                       eth_kni_dev_stop(eth_dev);
+                       return rte_eth_dev_release_port(eth_dev);
+               }
+               eth_kni_close(eth_dev);
+               rte_eth_dev_release_port(eth_dev);
        }
 
-       eth_kni_close(eth_dev);
-       rte_eth_dev_release_port(eth_dev);
-
        is_kni_initialized--;
        if (is_kni_initialized == 0)
                rte_kni_close();

diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c
index 15d6e9762d92ca24f26afbcd406bdcab16486f77..19a9eb6bc2dd965dd616a0b5f4bd66368eef38c1 100644 (file)
--- a/drivers/net/netvsc/hn_ethdev.c
+++ b/drivers/net/netvsc/hn_ethdev.c
@@ -1092,7 +1092,7 @@ static int eth_hn_remove(struct rte_vmbus_device *dev)
 
        eth_dev = rte_eth_dev_allocated(dev->device.name);
        if (!eth_dev)
-               return -ENODEV;
+               return 0; /* port already released */
 
        ret = eth_hn_dev_uninit(eth_dev);
        if (ret)

diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index 9509dc8bd665bcc2476b31a0d96ff7771845b333..ce25cf1ed47bc16bc035b448d956af0f445a3a13 100644 (file)
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -3739,6 +3739,8 @@ static int eth_nfp_pci_remove(struct rte_pci_device *pci_dev)
        int port = 0;
 
        eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
+       if (eth_dev == NULL)
+               return 0; /* port already released */
        if ((pci_dev->id.device_id == PCI_DEVICE_ID_NFP4000_PF_NIC) ||
            (pci_dev->id.device_id == PCI_DEVICE_ID_NFP6000_PF_NIC)) {
                port = get_pf_port_number(eth_dev->data->name);

diff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c
index 4325b9a30d2478db3f3dc5c3c0ff5b92a535f263..5f589dfa4c93de11c590a7957d246e7de2bd4ca5 100644 (file)
--- a/drivers/net/szedata2/rte_eth_szedata2.c
+++ b/drivers/net/szedata2/rte_eth_szedata2.c
@@ -1910,10 +1910,8 @@ static int szedata2_eth_pci_remove(struct rte_pci_device *pci_dev)
                                pci_dev->device.name, i);
                PMD_DRV_LOG(DEBUG, "Removing eth_dev %s", name);
                eth_dev = rte_eth_dev_allocated(name);
-               if (!eth_dev) {
-                       PMD_DRV_LOG(ERR, "eth_dev %s not found", name);
-                       retval = retval ? retval : -ENODEV;
-               }
+               if (eth_dev == NULL)
+                       continue; /* port already released */
 
                ret = rte_szedata2_eth_dev_uninit(eth_dev);
                if (ret != 0) {