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

ethdev: fix error handling in create function

Browse Source 
This patch fixes how function exit is handled when errors inside
rte_eth_dev_create.

Fixes: e489007a41 ("ethdev: add generic create/destroy ethdev APIs")
Cc: stable@dpdk.org

Signed-off-by: Alejandro Lucero <alejandro.lucero@netronome.com>
Reviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>
This commit is contained in:
Alejandro Lucero 2018-09-24 14:43:24 +01:00 committed by Ferruh Yigit
parent 901efc0da9
commit aa3c4fb6a4
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/librte_ethdev/rte_ethdev.c
View File

@ -3467,10 +3467,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
ethdev = rte_eth_dev_allocate(name);
if (!ethdev) {
retval = -ENODEV;
goto probe_failed;
}
if (!ethdev)
return -ENODEV;
if (priv_data_size) {
ethdev->data->dev_private = rte_zmalloc_socket(
@ -3480,7 +3478,7 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
if (!ethdev->data->dev_private) {
RTE_LOG(ERR, EAL, "failed to allocate private data");
retval = -ENOMEM;
goto probe_failed;
goto data_alloc_failed;
}
}
} else {
@ -3488,8 +3486,7 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
if (!ethdev) {
RTE_LOG(ERR, EAL, "secondary process attach failed, "
"ethdev doesn't exist");
retval = -ENODEV;
goto probe_failed;
return -ENODEV;
}
}
@ -3518,6 +3515,7 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
if (rte_eal_process_type() == RTE_PROC_PRIMARY)
rte_free(ethdev->data->dev_private);
data_alloc_failed:
rte_eth_dev_release_port(ethdev);
return retval;