ethdev: close device

The patch adds function pointer to rte_pci_driver and eth_driver
structure. These function pointers are used when ports are detached.
Also, the patch adds rte_eth_dev_uninit(). So far, it's not called
by anywhere, but it will be called when port hotplug function is
implemented.

Signed-off-by: Tetsuya Mukawa <mukawa@igel.co.jp>

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index a089557..a26af75 100644 (file)
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -255,6 +255,24 @@ rte_eth_dev_allocate(const char *name)
        return eth_dev;
 }
 
+static inline int
+rte_eth_dev_create_unique_device_name(char *name, size_t size,
+               struct rte_pci_device *pci_dev)
+{
+       int ret;
+
+       if ((name == NULL) || (pci_dev == NULL))
+               return -EINVAL;
+
+       ret = snprintf(name, size, "%d:%d.%d",
+                       pci_dev->addr.bus, pci_dev->addr.devid,
+                       pci_dev->addr.function);
+       if (ret < 0)
+               return ret;
+
+       return 0;
+}
+
 int
 rte_eth_dev_release_port(struct rte_eth_dev *eth_dev)
 {
@@ -279,8 +297,8 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv,
        eth_drv = (struct eth_driver *)pci_drv;
 
        /* Create unique Ethernet device name using PCI address */
-       snprintf(ethdev_name, RTE_ETH_NAME_MAX_LEN, "%d:%d.%d",
-                       pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function);
+       rte_eth_dev_create_unique_device_name(ethdev_name,
+                       sizeof(ethdev_name), pci_dev);
 
        eth_dev = rte_eth_dev_allocate(ethdev_name);
        if (eth_dev == NULL)
@@ -321,6 +339,47 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv,
        return diag;
 }
 
+static int
+rte_eth_dev_uninit(struct rte_pci_device *pci_dev)
+{
+       const struct eth_driver *eth_drv;
+       struct rte_eth_dev *eth_dev;
+       char ethdev_name[RTE_ETH_NAME_MAX_LEN];
+       int ret;
+
+       if (pci_dev == NULL)
+               return -EINVAL;
+
+       /* Create unique Ethernet device name using PCI address */
+       rte_eth_dev_create_unique_device_name(ethdev_name,
+                       sizeof(ethdev_name), pci_dev);
+
+       eth_dev = rte_eth_dev_allocated(ethdev_name);
+       if (eth_dev == NULL)
+               return -ENODEV;
+
+       eth_drv = (const struct eth_driver *)pci_dev->driver;
+
+       /* Invoke PMD device uninit function */
+       if (*eth_drv->eth_dev_uninit) {
+               ret = (*eth_drv->eth_dev_uninit)(eth_drv, eth_dev);
+               if (ret)
+                       return ret;
+       }
+
+       /* free ether device */
+       rte_eth_dev_release_port(eth_dev);
+
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+               rte_free(eth_dev->data->dev_private);
+
+       eth_dev->pci_dev = NULL;
+       eth_dev->driver = NULL;
+       eth_dev->data = NULL;
+
+       return 0;
+}
+
 /**
  * Register an Ethernet [Poll Mode] driver.
  *
@@ -339,6 +398,7 @@ void
 rte_eth_driver_register(struct eth_driver *eth_drv)
 {
        eth_drv->pci_drv.devinit = rte_eth_dev_init;
+       eth_drv->pci_drv.devuninit = rte_eth_dev_uninit;
        rte_eal_pci_register(&eth_drv->pci_drv);
 }
 

diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index e4964b7..cea230e 100644 (file)
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1586,6 +1586,27 @@ struct eth_driver;
 typedef int (*eth_dev_init_t)(struct eth_driver  *eth_drv,
                              struct rte_eth_dev *eth_dev);
 
+/**
+ * @internal
+ * Finalization function of an Ethernet driver invoked for each matching
+ * Ethernet PCI device detected during the PCI closing phase.
+ *
+ * @param eth_drv
+ *   The pointer to the [matching] Ethernet driver structure supplied by
+ *   the PMD when it registered itself.
+ * @param eth_dev
+ *   The *eth_dev* pointer is the address of the *rte_eth_dev* structure
+ *   associated with the matching device and which have been [automatically]
+ *   allocated in the *rte_eth_devices* array.
+ * @return
+ *   - 0: Success, the device is properly finalized by the driver.
+ *        In particular, the driver MUST free the *dev_ops* pointer
+ *        of the *eth_dev* structure.
+ *   - <0: Error code of the device initialization failure.
+ */
+typedef int (*eth_dev_uninit_t)(const struct eth_driver  *eth_drv,
+                                 struct rte_eth_dev *eth_dev);
+
 /**
  * @internal
  * The structure associated with a PMD Ethernet driver.
@@ -1597,11 +1618,14 @@ typedef int (*eth_dev_init_t)(struct eth_driver  *eth_drv,
  *
  * - The *eth_dev_init* function invoked for each matching PCI device.
  *
+ * - The *eth_dev_uninit* function invoked for each matching PCI device.
+ *
  * - The size of the private data to allocate for each matching device.
  */
 struct eth_driver {
        struct rte_pci_driver pci_drv;    /**< The PMD is also a PCI driver. */
        eth_dev_init_t eth_dev_init;      /**< Device init function. */
+       eth_dev_uninit_t eth_dev_uninit;  /**< Device uninit function. */
        unsigned int dev_private_size;    /**< Size of device private data. */
 };