pci: probe or close device
authorTetsuya Mukawa <mukawa@igel.co.jp>
Wed, 25 Feb 2015 19:32:23 +0000 (04:32 +0900)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Wed, 25 Feb 2015 23:08:25 +0000 (00:08 +0100)
- Add pci_close_all_drivers()
  The function tries to find a driver for the specified device, and
  then close the driver.
- Add rte_eal_pci_probe_one() and rte_eal_pci_close_one()
  The functions are used for probe and close a device.
  First the function tries to find a device that has the specified
  PCI address. Then, probe or close the device.

Signed-off-by: Tetsuya Mukawa <mukawa@igel.co.jp>
lib/librte_eal/common/eal_common_pci.c
lib/librte_eal/common/eal_private.h
lib/librte_eal/common/include/rte_pci.h
lib/librte_eal/linuxapp/eal/eal_pci.c
lib/librte_eal/linuxapp/eal/rte_eal_version.map

index bf2793f..5b6b55d 100644 (file)
@@ -108,7 +108,10 @@ static int
 pci_probe_all_drivers(struct rte_pci_device *dev)
 {
        struct rte_pci_driver *dr = NULL;
-       int rc;
+       int rc = 0;
+
+       if (dev == NULL)
+               return -1;
 
        TAILQ_FOREACH(dr, &pci_driver_list, next) {
                rc = rte_eal_pci_probe_one_driver(dr, dev);
@@ -123,6 +126,99 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
        return 1;
 }
 
+#ifdef RTE_LIBRTE_EAL_HOTPLUG
+/*
+ * If vendor/device ID match, call the devuninit() function of all
+ * registered driver for the given device. Return -1 if initialization
+ * failed, return 1 if no driver is found for this device.
+ */
+static int
+pci_close_all_drivers(struct rte_pci_device *dev)
+{
+       struct rte_pci_driver *dr = NULL;
+       int rc = 0;
+
+       if (dev == NULL)
+               return -1;
+
+       TAILQ_FOREACH(dr, &pci_driver_list, next) {
+               rc = rte_eal_pci_close_one_driver(dr, dev);
+               if (rc < 0)
+                       /* negative value is an error */
+                       return -1;
+               if (rc > 0)
+                       /* positive value means driver not found */
+                       continue;
+               return 0;
+       }
+       return 1;
+}
+
+/*
+ * Find the pci device specified by pci address, then invoke probe function of
+ * the driver of the devive.
+ */
+int
+rte_eal_pci_probe_one(struct rte_pci_addr *addr)
+{
+       struct rte_pci_device *dev = NULL;
+       int ret = 0;
+
+       if (addr == NULL)
+               return -1;
+
+       TAILQ_FOREACH(dev, &pci_device_list, next) {
+               if (rte_eal_compare_pci_addr(&dev->addr, addr))
+                       continue;
+
+               ret = pci_probe_all_drivers(dev);
+               if (ret < 0)
+                       goto err_return;
+               return 0;
+       }
+       return -1;
+
+err_return:
+       RTE_LOG(WARNING, EAL, "Requested device " PCI_PRI_FMT
+                       " cannot be used\n", dev->addr.domain, dev->addr.bus,
+                       dev->addr.devid, dev->addr.function);
+       return -1;
+}
+
+/*
+ * Find the pci device specified by pci address, then invoke close function of
+ * the driver of the devive.
+ */
+int
+rte_eal_pci_close_one(struct rte_pci_addr *addr)
+{
+       struct rte_pci_device *dev = NULL;
+       int ret = 0;
+
+       if (addr == NULL)
+               return -1;
+
+       TAILQ_FOREACH(dev, &pci_device_list, next) {
+               if (rte_eal_compare_pci_addr(&dev->addr, addr))
+                       continue;
+
+               ret = pci_close_all_drivers(dev);
+               if (ret < 0)
+                       goto err_return;
+
+               TAILQ_REMOVE(&pci_device_list, dev, next);
+               return 0;
+       }
+       return -1;
+
+err_return:
+       RTE_LOG(WARNING, EAL, "Requested device " PCI_PRI_FMT
+                       " cannot be used\n", dev->addr.domain, dev->addr.bus,
+                       dev->addr.devid, dev->addr.function);
+       return -1;
+}
+#endif /* RTE_LIBRTE_EAL_HOTPLUG */
+
 /*
  * Scan the content of the PCI bus, and call the devinit() function for
  * all registered drivers that have a matching entry in its id_table
index 159cd66..4acf5a0 100644 (file)
@@ -164,6 +164,21 @@ struct rte_pci_device;
 int rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr,
                struct rte_pci_device *dev);
 
+/**
+ * Munmap memory for single PCI device
+ *
+ * This function is private to EAL.
+ *
+ * @param      dr
+ *  The pointer to the pci driver structure
+ * @param      dev
+ *  The pointer to the pci device structure
+ * @return
+ *   0 on success, negative on error
+ */
+int rte_eal_pci_close_one_driver(struct rte_pci_driver *dr,
+               struct rte_pci_device *dev);
+
 /**
  * Init tail queues for non-EAL library structures. This is to allow
  * the rings, mempools, etc. lists to be shared among multiple processes
index ec2e2b0..1550d49 100644 (file)
@@ -191,6 +191,11 @@ struct rte_pci_driver;
  */
 typedef int (pci_devinit_t)(struct rte_pci_driver *, struct rte_pci_device *);
 
+/**
+ * Uninitialisation function for the driver called during hotplugging.
+ */
+typedef int (pci_devuninit_t)(struct rte_pci_device *);
+
 /**
  * A structure describing a PCI driver.
  */
@@ -198,6 +203,7 @@ struct rte_pci_driver {
        TAILQ_ENTRY(rte_pci_driver) next;       /**< Next in list. */
        const char *name;                       /**< Driver name. */
        pci_devinit_t *devinit;                 /**< Device init. function. */
+       pci_devuninit_t *devuninit;             /**< Device uninit function. */
        struct rte_pci_id *id_table;            /**< ID table, NULL terminated. */
        uint32_t drv_flags;                     /**< Flags contolling handling of device. */
 };
@@ -317,6 +323,38 @@ rte_eal_compare_pci_addr(struct rte_pci_addr *addr, struct rte_pci_addr *addr2)
  */
 int rte_eal_pci_probe(void);
 
+#ifdef RTE_LIBRTE_EAL_HOTPLUG
+/**
+ * Probe the single PCI device.
+ *
+ * Scan the content of the PCI bus, and find the pci device specified by pci
+ * address, then call the probe() function for registered driver that has a
+ * matching entry in its id_table for discovered device.
+ *
+ * @param addr
+ *     The PCI Bus-Device-Function address to probe.
+ * @return
+ *   - 0 on success.
+ *   - Negative on error.
+ */
+int rte_eal_pci_probe_one(struct rte_pci_addr *addr);
+
+/**
+ * Close the single PCI device.
+ *
+ * Scan the content of the PCI bus, and find the pci device specified by pci
+ * address, then call the close() function for registered driver that has a
+ * matching entry in its id_table for discovered device.
+ *
+ * @param addr
+ *     The PCI Bus-Device-Function address to close.
+ * @return
+ *   - 0 on success.
+ *   - Negative on error.
+ */
+int rte_eal_pci_close_one(struct rte_pci_addr *addr);
+#endif /* RTE_LIBRTE_EAL_HOTPLUG */
+
 /**
  * Dump the content of the PCI bus.
  *
index d03429c..f880f90 100644 (file)
@@ -595,6 +595,31 @@ pci_map_device(struct rte_pci_device *dev)
        return ret;
 }
 
+#ifdef RTE_LIBRTE_EAL_HOTPLUG
+static void
+pci_unmap_device(struct rte_pci_device *dev)
+{
+       if (dev == NULL)
+               return;
+
+       /* try unmapping the NIC resources using VFIO if it exists */
+       switch (dev->pt_driver) {
+       case RTE_PT_VFIO:
+               RTE_LOG(ERR, EAL, "Hotplug doesn't support vfio yet\n");
+               break;
+       case RTE_PT_IGB_UIO:
+       case RTE_PT_UIO_GENERIC:
+               /* unmap resources for devices that use uio */
+               pci_uio_unmap_resource(dev);
+               break;
+       default:
+               RTE_LOG(DEBUG, EAL, "  Not managed by known pt driver,"
+                       " skipped\n");
+               break;
+       }
+}
+#endif /* RTE_LIBRTE_EAL_HOTPLUG */
+
 /*
  * If vendor/device ID match, call the devinit() function of the
  * driver.
@@ -666,6 +691,75 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d
        return 1;
 }
 
+#ifdef RTE_LIBRTE_EAL_HOTPLUG
+/*
+ * If vendor/device ID match, call the devuninit() function of the
+ * driver.
+ */
+int
+rte_eal_pci_close_one_driver(struct rte_pci_driver *dr,
+               struct rte_pci_device *dev)
+{
+       struct rte_pci_id *id_table;
+
+       if ((dr == NULL) || (dev == NULL))
+               return -EINVAL;
+
+       for (id_table = dr->id_table ; id_table->vendor_id != 0; id_table++) {
+
+               /* check if device's identifiers match the driver's ones */
+               if (id_table->vendor_id != dev->id.vendor_id &&
+                   id_table->vendor_id != PCI_ANY_ID)
+                       continue;
+               if (id_table->device_id != dev->id.device_id &&
+                   id_table->device_id != PCI_ANY_ID)
+                       continue;
+               if (id_table->subsystem_vendor_id !=
+                   dev->id.subsystem_vendor_id &&
+                   id_table->subsystem_vendor_id != PCI_ANY_ID)
+                       continue;
+               if (id_table->subsystem_device_id !=
+                   dev->id.subsystem_device_id &&
+                   id_table->subsystem_device_id != PCI_ANY_ID)
+                       continue;
+
+               struct rte_pci_addr *loc = &dev->addr;
+
+               RTE_LOG(DEBUG, EAL,
+                               "PCI device "PCI_PRI_FMT" on NUMA socket %i\n",
+                               loc->domain, loc->bus, loc->devid,
+                               loc->function, dev->numa_node);
+
+               RTE_LOG(DEBUG, EAL, "  remove driver: %x:%x %s\n",
+                               dev->id.vendor_id, dev->id.device_id,
+                               dr->name);
+
+               /* call the driver devuninit() function */
+               if (dr->devuninit && (dr->devuninit(dev) < 0))
+                       return -1;      /* negative value is an error */
+
+               /* clear driver structure */
+               dev->driver = NULL;
+
+               if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING)
+                       /* unmap resources for devices that use igb_uio */
+                       pci_unmap_device(dev);
+
+               return 0;
+       }
+       /* return positive value if driver is not found */
+       return 1;
+}
+#else /* RTE_LIBRTE_EAL_HOTPLUG */
+int
+rte_eal_pci_close_one_driver(struct rte_pci_driver *dr __rte_unused,
+               struct rte_pci_device *dev __rte_unused)
+{
+       RTE_LOG(ERR, EAL, "Hotplug support isn't enabled\n");
+       return -1;
+}
+#endif /* RTE_LIBRTE_EAL_HOTPLUG */
+
 /* Init the PCI EAL subsystem */
 int
 rte_eal_pci_init(void)
index 17515a9..5478492 100644 (file)
@@ -38,8 +38,10 @@ DPDK_2.0 {
        rte_eal_lcore_role;
        rte_eal_mp_remote_launch;
        rte_eal_mp_wait_lcore;
+       rte_eal_pci_close_one;
        rte_eal_pci_dump;
        rte_eal_pci_probe;
+       rte_eal_pci_probe_one;
        rte_eal_pci_register;
        rte_eal_pci_unregister;
        rte_eal_process_type;