[dpdk-dev,v5,03/26] eal: No panic on hugepages info init
Checks
Commit Message
When attempting to scan hugepages, signal to the eal.c that an error has
occurred, rather than performing a panic.
Signed-off-by: Aaron Conole <aconole@redhat.com>
---
lib/librte_eal/linuxapp/eal/eal_hugepage_info.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
Comments
On Mon, Feb 27, 2017 at 11:17:48AM -0500, Aaron Conole wrote:
> When attempting to scan hugepages, signal to the eal.c that an error has
> occurred, rather than performing a panic.
>
> Signed-off-by: Aaron Conole <aconole@redhat.com>
> ---
> lib/librte_eal/linuxapp/eal/eal_hugepage_info.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
> index 18858e2..4d47eaf 100644
> --- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
> +++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
> @@ -283,9 +283,11 @@ eal_hugepage_info_init(void)
> struct dirent *dirent;
>
> dir = opendir(sys_dir_path);
> - if (dir == NULL)
> - rte_panic("Cannot open directory %s to read system hugepage "
> + if (dir == NULL) {
> + RTE_LOG(ERR, EAL, "Cannot open directory %s to read system hugepage "
> "info\n", sys_dir_path);
> + return -1;
> + }
Minor nit.
The error message should go on a line on its own, without any breaks to
make it easy to "grep". This should also eliminate the checkpatch
complaint about it being too long.
/Bruce
Bruce Richardson <bruce.richardson@intel.com> writes:
> On Mon, Feb 27, 2017 at 11:17:48AM -0500, Aaron Conole wrote:
>> When attempting to scan hugepages, signal to the eal.c that an error has
>> occurred, rather than performing a panic.
>>
>> Signed-off-by: Aaron Conole <aconole@redhat.com>
>> ---
>> lib/librte_eal/linuxapp/eal/eal_hugepage_info.c | 6 ++++--
>> 1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
>> index 18858e2..4d47eaf 100644
>> --- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
>> +++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
>> @@ -283,9 +283,11 @@ eal_hugepage_info_init(void)
>> struct dirent *dirent;
>>
>> dir = opendir(sys_dir_path);
>> - if (dir == NULL)
>> - rte_panic("Cannot open directory %s to read system hugepage "
>> + if (dir == NULL) {
>> + RTE_LOG(ERR, EAL, "Cannot open directory %s to read system hugepage "
>> "info\n", sys_dir_path);
>> + return -1;
>> + }
>
> Minor nit.
> The error message should go on a line on its own, without any breaks to
> make it easy to "grep". This should also eliminate the checkpatch
> complaint about it being too long.
Yes, will fix it for v6.
-Aaron
@@ -283,9 +283,11 @@ eal_hugepage_info_init(void)
struct dirent *dirent;
dir = opendir(sys_dir_path);
- if (dir == NULL)
- rte_panic("Cannot open directory %s to read system hugepage "
+ if (dir == NULL) {
+ RTE_LOG(ERR, EAL, "Cannot open directory %s to read system hugepage "
"info\n", sys_dir_path);
+ return -1;
+ }
for (dirent = readdir(dir); dirent != NULL; dirent = readdir(dir)) {
struct hugepage_info *hpi;