[dpdk-dev,v5,05/11] eal: replace rte_panic instances in eventdev
Checks
Commit Message
replace panic calls with log and return value.
Signed-off-by: Arnon Warshavsky <arnon@qwilt.com>
---
lib/librte_eventdev/rte_eventdev_pmd_pci.h | 8 +++++---
lib/librte_eventdev/rte_eventdev_pmd_vdev.h | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
Comments
On 04/23/2018 10:28 PM, Arnon Warshavsky wrote:
> replace panic calls with log and return value.
>
> Signed-off-by: Arnon Warshavsky <arnon@qwilt.com>
> ---
> lib/librte_eventdev/rte_eventdev_pmd_pci.h | 8 +++++---
> lib/librte_eventdev/rte_eventdev_pmd_vdev.h | 8 +++++---
> 2 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/lib/librte_eventdev/rte_eventdev_pmd_pci.h b/lib/librte_eventdev/rte_eventdev_pmd_pci.h
> index 8fb6138..6e08705 100644
> --- a/lib/librte_eventdev/rte_eventdev_pmd_pci.h
> +++ b/lib/librte_eventdev/rte_eventdev_pmd_pci.h
> @@ -66,9 +66,11 @@
> RTE_CACHE_LINE_SIZE,
> rte_socket_id());
>
> - if (eventdev->data->dev_private == NULL)
> - rte_panic("Cannot allocate memzone for private "
> - "device data");
> + if (eventdev->data->dev_private == NULL) {
> + RTE_LOG(CRIT, EAL, "%s(): Cannot allocate memzone for private device data",
> + __func__);
> + return -ENOMEM;
> + }
> }
Similar to 1/11 in that there is some allocate before this and maybe you
should jump to the release at the end of the function
>
> eventdev->dev = &pci_dev->device;
> diff --git a/lib/librte_eventdev/rte_eventdev_pmd_vdev.h b/lib/librte_eventdev/rte_eventdev_pmd_vdev.h
> index 8c64a06..b7c08fa 100644
> --- a/lib/librte_eventdev/rte_eventdev_pmd_vdev.h
> +++ b/lib/librte_eventdev/rte_eventdev_pmd_vdev.h
> @@ -61,9 +61,11 @@
> RTE_CACHE_LINE_SIZE,
> socket_id);
>
> - if (eventdev->data->dev_private == NULL)
> - rte_panic("Cannot allocate memzone for private device"
> - " data");
> + if (eventdev->data->dev_private == NULL) {
> + RTE_LOG(CRIT, EAL, "%s(): Cannot allocate memzone for private device data",
> + __func__);
> + return NULL;
> + }
> }
>
> return eventdev;
>
>
> Similar to 1/11 in that there is some allocate before this and maybe you
> should jump to the release at the end of the function
>
> >
>
Same as I wrote in 1/10 - I want to handle this not in this patchset
@@ -66,9 +66,11 @@
RTE_CACHE_LINE_SIZE,
rte_socket_id());
- if (eventdev->data->dev_private == NULL)
- rte_panic("Cannot allocate memzone for private "
- "device data");
+ if (eventdev->data->dev_private == NULL) {
+ RTE_LOG(CRIT, EAL, "%s(): Cannot allocate memzone for private device data",
+ __func__);
+ return -ENOMEM;
+ }
}
eventdev->dev = &pci_dev->device;
@@ -61,9 +61,11 @@
RTE_CACHE_LINE_SIZE,
socket_id);
- if (eventdev->data->dev_private == NULL)
- rte_panic("Cannot allocate memzone for private device"
- " data");
+ if (eventdev->data->dev_private == NULL) {
+ RTE_LOG(CRIT, EAL, "%s(): Cannot allocate memzone for private device data",
+ __func__);
+ return NULL;
+ }
}
return eventdev;