[dpdk-dev,RFC,13/23] eal: do not panic on memory init

Message ID 1483111580-5397-14-git-send-email-aconole@redhat.com (mailing list archive)
State RFC, archived
Headers

Checks

Context Check Description
ci/Intel compilation fail Compilation issues

Commit Message

Aaron Conole Dec. 30, 2016, 3:26 p.m. UTC
  This can only happen when access to hugepages (either as primary or
secondary process) fails (and that is usually permissions).

Signed-off-by: Aaron Conole <aconole@redhat.com>
---
 lib/librte_eal/linuxapp/eal/eal.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
  

Patch

diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 878ba7a..050543c 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -833,8 +833,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");
+		errno = EACCES;
+		return -1;
+	}
 
 	/* the directories are locked during eal_hugepage_info_init */
 	eal_hugedirs_unlock();