d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eventdev: restructure release function

Browse Source 
Remove rte_event_dev_close() from rte_event_pmd_release() function so
that rte_event_pmd_release() can be used in stateless way. This will
enable rte_event_pmd_vdev_uninit() function to avoid using
eventdev_globals global variable and the need for exposing the a
global variable to PMD.

Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
This commit is contained in:
Jerin Jacob 2017-06-09 14:07:27 +05:30
parent 7214438d93
commit 6d0784e491
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/librte_eventdev/rte_eventdev.c
View File

@ -1171,10 +1171,6 @@ rte_event_pmd_release(struct rte_eventdev *eventdev)
if (eventdev == NULL) if (eventdev == NULL)
return -EINVAL; return -EINVAL;
ret = rte_event_dev_close(eventdev->data->dev_id);
if (ret < 0)
return ret;
eventdev->attached = RTE_EVENTDEV_DETACHED; eventdev->attached = RTE_EVENTDEV_DETACHED;
eventdev_globals.nb_devs--; eventdev_globals.nb_devs--;
@ -1230,6 +1226,7 @@ rte_event_pmd_vdev_init(const char *name, size_t dev_private_size,
int int
rte_event_pmd_vdev_uninit(const char *name) rte_event_pmd_vdev_uninit(const char *name)
{ {
int ret;
struct rte_eventdev *eventdev; struct rte_eventdev *eventdev;
if (name == NULL) if (name == NULL)
@ -1239,6 +1236,10 @@ rte_event_pmd_vdev_uninit(const char *name)
if (eventdev == NULL) if (eventdev == NULL)
return -ENODEV; return -ENODEV;
ret = rte_event_dev_close(eventdev->data->dev_id);
if (ret < 0)
return ret;
/* Free the event device */ /* Free the event device */
rte_event_pmd_release(eventdev); rte_event_pmd_release(eventdev);
@ -1293,11 +1294,7 @@ rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,
(unsigned int) pci_dev->id.vendor_id, (unsigned int) pci_dev->id.vendor_id,
(unsigned int) pci_dev->id.device_id); (unsigned int) pci_dev->id.device_id);
if (rte_eal_process_type() == RTE_PROC_PRIMARY) rte_event_pmd_release(eventdev);
rte_free(eventdev->data->dev_private);
eventdev->attached = RTE_EVENTDEV_DETACHED;
eventdev_globals.nb_devs--;
return -ENXIO; return -ENXIO;
} }
@ -1320,6 +1317,10 @@ rte_event_pmd_pci_remove(struct rte_pci_device *pci_dev,
if (eventdev == NULL) if (eventdev == NULL)
return -ENODEV; return -ENODEV;
ret = rte_event_dev_close(eventdev->data->dev_id);
if (ret < 0)
return ret;
/* Invoke PMD device un-init function */ /* Invoke PMD device un-init function */
if (devuninit) if (devuninit)
ret = devuninit(eventdev); ret = devuninit(eventdev);