eventdev: make vdev init and uninit functions optional
[dpdk.git] / lib / librte_eventdev / rte_eventdev.c
index 89f98cd..a246965 100644 (file)
@@ -45,7 +45,6 @@
 #include <rte_log.h>
 #include <rte_debug.h>
 #include <rte_dev.h>
-#include <rte_pci.h>
 #include <rte_memory.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
@@ -126,8 +125,6 @@ rte_event_dev_info_get(uint8_t dev_id, struct rte_event_dev_info *dev_info)
        dev_info->dequeue_timeout_ns = dev->data->dev_conf.dequeue_timeout_ns;
 
        dev_info->dev = dev->dev;
-       if (dev->driver)
-               dev_info->driver_name = dev->driver->pci_drv.driver.name;
        return 0;
 }
 
@@ -368,7 +365,7 @@ rte_event_dev_configure(uint8_t dev_id,
        (*dev->dev_ops->dev_infos_get)(dev, &info);
 
        /* Check dequeue_timeout_ns value is in limit */
-       if (!dev_conf->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT) {
+       if (!(dev_conf->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT)) {
                if (dev_conf->dequeue_timeout_ns < info.min_dequeue_timeout_ns
                        || dev_conf->dequeue_timeout_ns >
                                 info.max_dequeue_timeout_ns) {
@@ -602,7 +599,6 @@ rte_event_queue_setup(uint8_t dev_id, uint8_t queue_id,
                RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_def_conf,
                                        -ENOTSUP);
                (*dev->dev_ops->queue_def_conf)(dev, queue_id, &def_conf);
-               def_conf.event_queue_cfg = RTE_EVENT_QUEUE_CFG_DEFAULT;
                queue_conf = &def_conf;
        }
 
@@ -909,8 +905,7 @@ rte_event_dequeue_timeout_ticks(uint8_t dev_id, uint64_t ns,
        if (timeout_ticks == NULL)
                return -EINVAL;
 
-       (*dev->dev_ops->timeout_ticks)(dev, ns, timeout_ticks);
-       return 0;
+       return (*dev->dev_ops->timeout_ticks)(dev, ns, timeout_ticks);
 }
 
 int
@@ -927,6 +922,89 @@ rte_event_dev_dump(uint8_t dev_id, FILE *f)
 
 }
 
+static int
+xstats_get_count(uint8_t dev_id, enum rte_event_dev_xstats_mode mode,
+               uint8_t queue_port_id)
+{
+       struct rte_eventdev *dev = &rte_eventdevs[dev_id];
+       if (dev->dev_ops->xstats_get_names != NULL)
+               return (*dev->dev_ops->xstats_get_names)(dev, mode,
+                                                       queue_port_id,
+                                                       NULL, NULL, 0);
+       return 0;
+}
+
+int
+rte_event_dev_xstats_names_get(uint8_t dev_id,
+               enum rte_event_dev_xstats_mode mode, uint8_t queue_port_id,
+               struct rte_event_dev_xstats_name *xstats_names,
+               unsigned int *ids, unsigned int size)
+{
+       RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -ENODEV);
+       const int cnt_expected_entries = xstats_get_count(dev_id, mode,
+                                                         queue_port_id);
+       if (xstats_names == NULL || cnt_expected_entries < 0 ||
+                       (int)size < cnt_expected_entries)
+               return cnt_expected_entries;
+
+       /* dev_id checked above */
+       const struct rte_eventdev *dev = &rte_eventdevs[dev_id];
+
+       if (dev->dev_ops->xstats_get_names != NULL)
+               return (*dev->dev_ops->xstats_get_names)(dev, mode,
+                               queue_port_id, xstats_names, ids, size);
+
+       return -ENOTSUP;
+}
+
+/* retrieve eventdev extended statistics */
+int
+rte_event_dev_xstats_get(uint8_t dev_id, enum rte_event_dev_xstats_mode mode,
+               uint8_t queue_port_id, const unsigned int ids[],
+               uint64_t values[], unsigned int n)
+{
+       RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -ENODEV);
+       const struct rte_eventdev *dev = &rte_eventdevs[dev_id];
+
+       /* implemented by the driver */
+       if (dev->dev_ops->xstats_get != NULL)
+               return (*dev->dev_ops->xstats_get)(dev, mode, queue_port_id,
+                               ids, values, n);
+       return -ENOTSUP;
+}
+
+uint64_t
+rte_event_dev_xstats_by_name_get(uint8_t dev_id, const char *name,
+               unsigned int *id)
+{
+       RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, 0);
+       const struct rte_eventdev *dev = &rte_eventdevs[dev_id];
+       unsigned int temp = -1;
+
+       if (id != NULL)
+               *id = (unsigned int)-1;
+       else
+               id = &temp; /* ensure driver never gets a NULL value */
+
+       /* implemented by driver */
+       if (dev->dev_ops->xstats_get_by_name != NULL)
+               return (*dev->dev_ops->xstats_get_by_name)(dev, name, id);
+       return -ENOTSUP;
+}
+
+int rte_event_dev_xstats_reset(uint8_t dev_id,
+               enum rte_event_dev_xstats_mode mode, int16_t queue_port_id,
+               const uint32_t ids[], uint32_t nb_ids)
+{
+       RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
+       struct rte_eventdev *dev = &rte_eventdevs[dev_id];
+
+       if (dev->dev_ops->xstats_reset != NULL)
+               return (*dev->dev_ops->xstats_reset)(dev, mode, queue_port_id,
+                                                       ids, nb_ids);
+       return -ENOTSUP;
+}
+
 int
 rte_event_dev_start(uint8_t dev_id)
 {
@@ -1093,10 +1171,6 @@ rte_event_pmd_release(struct rte_eventdev *eventdev)
        if (eventdev == NULL)
                return -EINVAL;
 
-       ret = rte_event_dev_close(eventdev->data->dev_id);
-       if (ret < 0)
-               return ret;
-
        eventdev->attached = RTE_EVENTDEV_DETACHED;
        eventdev_globals.nb_devs--;
 
@@ -1121,144 +1195,3 @@ rte_event_pmd_release(struct rte_eventdev *eventdev)
        eventdev->data = NULL;
        return 0;
 }
-
-struct rte_eventdev *
-rte_event_pmd_vdev_init(const char *name, size_t dev_private_size,
-               int socket_id)
-{
-       struct rte_eventdev *eventdev;
-
-       /* Allocate device structure */
-       eventdev = rte_event_pmd_allocate(name, socket_id);
-       if (eventdev == NULL)
-               return NULL;
-
-       /* Allocate private device structure */
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-               eventdev->data->dev_private =
-                               rte_zmalloc_socket("eventdev device private",
-                                               dev_private_size,
-                                               RTE_CACHE_LINE_SIZE,
-                                               socket_id);
-
-               if (eventdev->data->dev_private == NULL)
-                       rte_panic("Cannot allocate memzone for private device"
-                                       " data");
-       }
-
-       return eventdev;
-}
-
-int
-rte_event_pmd_vdev_uninit(const char *name)
-{
-       struct rte_eventdev *eventdev;
-
-       if (name == NULL)
-               return -EINVAL;
-
-       eventdev = rte_event_pmd_get_named_dev(name);
-       if (eventdev == NULL)
-               return -ENODEV;
-
-       /* Free the event device */
-       rte_event_pmd_release(eventdev);
-
-       return 0;
-}
-
-int
-rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,
-                       struct rte_pci_device *pci_dev)
-{
-       struct rte_eventdev_driver *eventdrv;
-       struct rte_eventdev *eventdev;
-
-       char eventdev_name[RTE_EVENTDEV_NAME_MAX_LEN];
-
-       int retval;
-
-       eventdrv = (struct rte_eventdev_driver *)pci_drv;
-       if (eventdrv == NULL)
-               return -ENODEV;
-
-       rte_eal_pci_device_name(&pci_dev->addr, eventdev_name,
-                       sizeof(eventdev_name));
-
-       eventdev = rte_event_pmd_allocate(eventdev_name,
-                        pci_dev->device.numa_node);
-       if (eventdev == NULL)
-               return -ENOMEM;
-
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-               eventdev->data->dev_private =
-                               rte_zmalloc_socket(
-                                               "eventdev private structure",
-                                               eventdrv->dev_private_size,
-                                               RTE_CACHE_LINE_SIZE,
-                                               rte_socket_id());
-
-               if (eventdev->data->dev_private == NULL)
-                       rte_panic("Cannot allocate memzone for private "
-                                       "device data");
-       }
-
-       eventdev->dev = &pci_dev->device;
-       eventdev->driver = eventdrv;
-
-       /* Invoke PMD device initialization function */
-       retval = (*eventdrv->eventdev_init)(eventdev);
-       if (retval == 0)
-               return 0;
-
-       RTE_EDEV_LOG_ERR("driver %s: (vendor_id=0x%x device_id=0x%x)"
-                       " failed", pci_drv->driver.name,
-                       (unsigned int) pci_dev->id.vendor_id,
-                       (unsigned int) pci_dev->id.device_id);
-
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-               rte_free(eventdev->data->dev_private);
-
-       eventdev->attached = RTE_EVENTDEV_DETACHED;
-       eventdev_globals.nb_devs--;
-
-       return -ENXIO;
-}
-
-int
-rte_event_pmd_pci_remove(struct rte_pci_device *pci_dev)
-{
-       const struct rte_eventdev_driver *eventdrv;
-       struct rte_eventdev *eventdev;
-       char eventdev_name[RTE_EVENTDEV_NAME_MAX_LEN];
-       int ret;
-
-       if (pci_dev == NULL)
-               return -EINVAL;
-
-       rte_eal_pci_device_name(&pci_dev->addr, eventdev_name,
-                       sizeof(eventdev_name));
-
-       eventdev = rte_event_pmd_get_named_dev(eventdev_name);
-       if (eventdev == NULL)
-               return -ENODEV;
-
-       eventdrv = (const struct rte_eventdev_driver *)pci_dev->driver;
-       if (eventdrv == NULL)
-               return -ENODEV;
-
-       /* Invoke PMD device un-init function */
-       if (*eventdrv->eventdev_uninit) {
-               ret = (*eventdrv->eventdev_uninit)(eventdev);
-               if (ret)
-                       return ret;
-       }
-
-       /* Free event device */
-       rte_event_pmd_release(eventdev);
-
-       eventdev->dev = NULL;
-       eventdev->driver = NULL;
-
-       return 0;
-}