[PATCH v4 13/26] eal: do not panic on memory init
From: Aaron Conole <aconole@redhat.com>
Date: 2017-02-25 16:03:19
Subsystem:
library code, the rest · Maintainers:
Andrew Morton, Linus Torvalds
This can only happen when access to hugepages (either as primary or secondary process) fails (and that is usually permissions). Since the manner of failure is not reversible, we cannot allow retry. Signed-off-by: Aaron Conole <aconole@redhat.com> --- lib/librte_eal/linuxapp/eal/eal.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 0e7e8c8..30d6a7d 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c@@ -847,8 +847,11 @@ rte_eal_init(int argc, char **argv) } #endif - if (rte_eal_memory_init() < 0) - rte_panic("Cannot init memory\n"); + if (rte_eal_memory_init() < 0) { + RTE_LOG(ERR, EAL, "Cannot init memory\n"); + rte_errno = ENOMEM; + return -1; + } /* the directories are locked during eal_hugepage_info_init */ eal_hugedirs_unlock();
--
2.9.3