From patchwork Fri Dec 30 15:26:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 18743 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id E78B6F936; Fri, 30 Dec 2016 16:27:43 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id F3A1E2C6D for ; Fri, 30 Dec 2016 16:26:28 +0100 (CET) Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 70638C0467D1 for ; Fri, 30 Dec 2016 15:26:28 +0000 (UTC) Received: from dhcp-25-97.bos.redhat.com (unused [10.10.52.171] (may be forged)) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uBUFQLth031288 for ; Fri, 30 Dec 2016 10:26:28 -0500 From: Aaron Conole To: dev@dpdk.org Date: Fri, 30 Dec 2016 10:26:10 -0500 Message-Id: <1483111580-5397-14-git-send-email-aconole@redhat.com> In-Reply-To: <1483111580-5397-1-git-send-email-aconole@redhat.com> References: <1483111580-5397-1-git-send-email-aconole@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 30 Dec 2016 15:26:28 +0000 (UTC) Subject: [dpdk-dev] [RFC 13/23] eal: do not panic on memory init X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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 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();