From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 9FB061DBE for ; Wed, 25 Apr 2018 11:07:18 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2018 02:07:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,325,1520924400"; d="scan'208";a="36888052" Received: from aburakov-mobl.ger.corp.intel.com (HELO [10.237.220.109]) ([10.237.220.109]) by orsmga006.jf.intel.com with ESMTP; 25 Apr 2018 02:07:14 -0700 To: Arnon Warshavsky , thomas@monjalon.net, wenzhuo.lu@intel.com, declan.doherty@intel.com, jerin.jacob@caviumnetworks.com, bruce.richardson@intel.com, ferruh.yigit@intel.com Cc: dev@dpdk.org References: <1524608213-2080-1-git-send-email-arnon@qwilt.com> <1524608213-2080-11-git-send-email-arnon@qwilt.com> From: "Burakov, Anatoly" Message-ID: Date: Wed, 25 Apr 2018 10:07:13 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <1524608213-2080-11-git-send-email-arnon@qwilt.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v7 10/11] eal: replace rte_panic instances in init sequence 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: , X-List-Received-Date: Wed, 25 Apr 2018 09:07:19 -0000 On 24-Apr-18 11:16 PM, Arnon Warshavsky wrote: > Change some local functions return type from void to int. > This change does not break ABI as the functions are internal. > Panic thrown from threads was not handled in this patch > > Signed-off-by: Arnon Warshavsky > --- <...> > > + if (rte_config_init() != 0) { > + rte_eal_init_alert("Failed to init configuration"); > + rte_errno = EFAULT; > + return -1; > + } > + > + if (rte_mp_channel_init() < 0) { > + rte_eal_init_alert("failed to init mp channel\n"); > + if (rte_eal_process_type() == RTE_PROC_PRIMARY) { > + rte_errno = EFAULT; > + return -1; > + } > + } ^^^ this change looks unintended. Rebase artifact? > + > /* in secondary processes, memory init may allocate additional fbarrays > * not present in primary processes, so to avoid any potential issues, > * initialize memzones first. > @@ -671,6 +712,7 @@ static void rte_eal_init_alert(const char *msg) > */ > if (pipe(lcore_config[i].pipe_master2slave) < 0) > rte_panic("Cannot create pipe\n"); > + > if (pipe(lcore_config[i].pipe_slave2master) < 0) > rte_panic("Cannot create pipe\n"); ^^^ this looks unintended as well. > > diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c > index 5b23bf0..54adaec 100644 > --- a/lib/librte_eal/linuxapp/eal/eal.c > +++ b/lib/librte_eal/linuxapp/eal/eal.c > @@ -160,7 +160,7 @@ enum rte_iova_mode > * We also don't lock the whole file, so that in future we can use read-locks > * on other parts, e.g. memzones, to detect if there are running secondary > * processes. */ > -static void > +static int > rte_eal_config_create(void) > { > void *rte_mem_cfg_addr; > @@ -169,7 +169,7 @@ enum rte_iova_mode > const char *pathname = eal_runtime_config_path(); > > if (internal_config.no_shconf) > - return; <...> > } > > rte_mem_cfg_addr = mmap(rte_mem_cfg_addr, sizeof(*rte_config.mem_config), > PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0); > > - if (rte_mem_cfg_addr == MAP_FAILED){ > - rte_panic("Cannot mmap memory for rte_config\n"); > + if (rte_mem_cfg_addr == MAP_FAILED) { > + RTE_LOG(CRIT, EAL, "%s(): Cannot mmap memory for rte_config\n", > + __func__); > + return -1; > } I think you forgot to close mem_cfg_fd and set it to -1 in case of error here. > memcpy(rte_mem_cfg_addr, &early_mem_config, sizeof(early_mem_config)); > rte_config.mem_config = rte_mem_cfg_addr; > @@ -211,10 +221,11 @@ enum rte_iova_mode > * processes could later map the config into this exact location */ > rte_config.mem_config->mem_cfg_addr = (uintptr_t) rte_mem_cfg_addr; > > + return 0; > } > <...> > > /* map it as read-only first */ > mem_config = (struct rte_mem_config *) mmap(NULL, sizeof(*mem_config), > PROT_READ, MAP_SHARED, mem_cfg_fd, 0); > - if (mem_config == MAP_FAILED) > - rte_panic("Cannot mmap memory for rte_config! error %i (%s)\n", > - errno, strerror(errno)); > + if (mem_config == MAP_FAILED) { > + mem_cfg_fd = -1; Forgot close() here, i think. > + RTE_LOG(CRIT, EAL, "%s(): Cannot mmap memory for rte_config! error %i (%s)\n", > + __func__, errno, strerror(errno)); > + return -1; > + } > > rte_config.mem_config = mem_config; > + > + return 0; > } > > /* reattach the shared config at exact memory location primary process has it */ <...> > + if (rte_config_init() != 0) > + return -1; > + > if (rte_eal_log_init(logid, internal_config.syslog_facility) < 0) { > rte_eal_init_alert("Cannot init logging."); > rte_errno = ENOMEM; > @@ -914,6 +946,7 @@ static void rte_eal_init_alert(const char *msg) > */ > if (pipe(lcore_config[i].pipe_master2slave) < 0) > rte_panic("Cannot create pipe\n"); > + > if (pipe(lcore_config[i].pipe_slave2master) < 0) Again, looks like unintended whitespace change. > rte_panic("Cannot create pipe\n"); > > -- Thanks, Anatoly