eventdev: amend timeout criteria comment for burst dequeue

[dpdk.git] / lib / librte_eventdev / rte_eventdev.c

diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c
index c8f3e94..68bfc3b 100644 (file)
--- a/lib/librte_eventdev/rte_eventdev.c
+++ b/lib/librte_eventdev/rte_eventdev.c
@@ -798,11 +798,11 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
        }
 
        for (i = 0; i < nb_links; i++)
-               if (queues[i] >= RTE_EVENT_MAX_QUEUES_PER_DEV)
+               if (queues[i] >= dev->data->nb_queues)
                        return -EINVAL;
 
-       diag = (*dev->dev_ops->port_link)(dev->data->ports[port_id], queues,
-                                               priorities, nb_links);
+       diag = (*dev->dev_ops->port_link)(dev, dev->data->ports[port_id],
+                                               queues, priorities, nb_links);
        if (diag < 0)
                return diag;
 
@@ -843,11 +843,11 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
        }
 
        for (i = 0; i < nb_unlinks; i++)
-               if (queues[i] >= RTE_EVENT_MAX_QUEUES_PER_DEV)
+               if (queues[i] >= dev->data->nb_queues)
                        return -EINVAL;
 
-       diag = (*dev->dev_ops->port_unlink)(dev->data->ports[port_id], queues,
-                                       nb_unlinks);
+       diag = (*dev->dev_ops->port_unlink)(dev, dev->data->ports[port_id],
+                                       queues, nb_unlinks);
 
        if (diag < 0)
                return diag;
@@ -879,7 +879,7 @@ rte_event_port_links_get(uint8_t dev_id, uint8_t port_id,
        links_map = dev->data->links_map;
        /* Point links_map to this port specific area */
        links_map += (port_id * RTE_EVENT_MAX_QUEUES_PER_DEV);
-       for (i = 0; i < RTE_EVENT_MAX_QUEUES_PER_DEV; i++) {
+       for (i = 0; i < dev->data->nb_queues; i++) {
                if (links_map[i] != EVENT_QUEUE_SERVICE_PRIORITY_INVALID) {
                        queues[count] = i;
                        priorities[count] = (uint8_t)links_map[i];
@@ -1080,6 +1080,8 @@ int
 rte_event_pmd_release(struct rte_eventdev *eventdev)
 {
        int ret;
+       char mz_name[RTE_EVENTDEV_NAME_MAX_LEN];
+       const struct rte_memzone *mz;
 
        if (eventdev == NULL)
                return -EINVAL;
@@ -1090,8 +1092,26 @@ rte_event_pmd_release(struct rte_eventdev *eventdev)
 
        eventdev->attached = RTE_EVENTDEV_DETACHED;
        eventdev_globals.nb_devs--;
-       eventdev->data = NULL;
 
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+               rte_free(eventdev->data->dev_private);
+
+               /* Generate memzone name */
+               ret = snprintf(mz_name, sizeof(mz_name), "rte_eventdev_data_%u",
+                               eventdev->data->dev_id);
+               if (ret >= (int)sizeof(mz_name))
+                       return -EINVAL;
+
+               mz = rte_memzone_lookup(mz_name);
+               if (mz == NULL)
+                       return -ENOMEM;
+
+               ret = rte_memzone_free(mz);
+               if (ret)
+                       return ret;
+       }
+
+       eventdev->data = NULL;
        return 0;
 }
 
@@ -1122,6 +1142,24 @@ rte_event_pmd_vdev_init(const char *name, size_t dev_private_size,
        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)
@@ -1212,9 +1250,6 @@ rte_event_pmd_pci_remove(struct rte_pci_device *pci_dev)
        /* Free event device */
        rte_event_pmd_release(eventdev);
 
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-               rte_free(eventdev->data->dev_private);
-
        eventdev->pci_dev = NULL;
        eventdev->driver = NULL;