From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3F842A046B for ; Wed, 26 Jun 2019 14:49:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1BBFB2BA5; Wed, 26 Jun 2019 14:49:42 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 4836C1E25; Wed, 26 Jun 2019 14:49:38 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jun 2019 05:49:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,419,1557212400"; d="scan'208";a="155856934" Received: from aburakov-mobl1.ger.corp.intel.com (HELO [10.237.220.101]) ([10.237.220.101]) by orsmga008.jf.intel.com with ESMTP; 26 Jun 2019 05:49:36 -0700 To: David Marchand Cc: dev , Bruce Richardson , dpdk stable References: <0fdd08d79feb1b60c304a1194d14282238cb679e.1561477829.git.anatoly.burakov@intel.com> From: "Burakov, Anatoly" Message-ID: Date: Wed, 26 Jun 2019 13:49:35 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-stable] [PATCH 2/2] eal/freebsd: add config reattach X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On 26-Jun-19 1:03 PM, David Marchand wrote: > On Tue, Jun 25, 2019 at 5:51 PM Anatoly Burakov > wrote: > >> Linux EAL will attach the shared config at an arbitrary address, >> find out where the shared config is mapped in the primary, and >> then will reattach it at that exact address. >> >> FreeBSD version doesn't seem to go for that extra reattach step, >> which makes one wonder how did it ever work in the first place. >> >> Fix the FreeBSD init to also reattach shared config to the exact >> same place the primary process has it. >> >> Fixes: 764bf26873b9 ("add FreeBSD support") >> Cc: bruce.richardson@intel.com >> Cc: stable@dpdk.org >> >> Signed-off-by: Anatoly Burakov >> --- >> lib/librte_eal/freebsd/eal/eal.c | 36 ++++++++++++++++++++++++++++++++ >> 1 file changed, 36 insertions(+) >> >> diff --git a/lib/librte_eal/freebsd/eal/eal.c >> b/lib/librte_eal/freebsd/eal/eal.c >> index 8c399c799..ce7a5f91d 100644 >> --- a/lib/librte_eal/freebsd/eal/eal.c >> +++ b/lib/librte_eal/freebsd/eal/eal.c >> @@ -280,6 +280,41 @@ rte_eal_config_attach(void) >> rte_config.mem_config = rte_mem_cfg_addr; >> } >> >> +/* reattach the shared config at exact memory location primary process >> has it */ >> +static void >> +rte_eal_config_reattach(void) >> +{ >> + struct rte_mem_config *mem_config; >> + void *rte_mem_cfg_addr; >> + >> + if (internal_config.no_shconf) >> + return; >> + >> + /* save the address primary process has mapped shared config to */ >> + rte_mem_cfg_addr = >> + (void >> *)(uintptr_t)rte_config.mem_config->mem_cfg_addr; >> > > It should be within the 80 columns limit on a single line. Nope, tried it - doesn't fit. > > + >> + /* unmap original config */ >> + munmap(rte_config.mem_config, sizeof(struct rte_mem_config)); >> > > Hum, the previous mapping is PROT_WRITE while unneeded, right? Yes, good catch. > > > + >> + /* remap the config at proper address */ >> + mem_config = (struct rte_mem_config *) mmap(rte_mem_cfg_addr, >> + sizeof(*mem_config), PROT_READ | PROT_WRITE, >> MAP_SHARED, >> + mem_cfg_fd, 0); >> > > mem_cfg_fd should have been closed in rte_eal_config_attach(). > So it should fail here. Hmm, wonder why it didn't. I'll investigate and fix if necessary. > > > + if (mem_config == MAP_FAILED || mem_config != rte_mem_cfg_addr) { >> + if (mem_config != MAP_FAILED) >> + /* errno is stale, don't use */ >> + rte_panic("Cannot mmap memory for rte_config at >> [%p], got [%p]\n", >> + rte_mem_cfg_addr, mem_config); >> + else >> + rte_panic("Cannot mmap memory for rte_config! >> error %i (%s)\n", >> + errno, strerror(errno)); >> + } >> + close(mem_cfg_fd); >> + >> + rte_config.mem_config = mem_config; >> +} >> + >> /* Detect if we are a primary or a secondary process */ >> enum rte_proc_type_t >> eal_proc_type_detect(void) >> @@ -318,6 +353,7 @@ rte_config_init(void) >> case RTE_PROC_SECONDARY: >> rte_eal_config_attach(); >> rte_eal_mcfg_wait_complete(rte_config.mem_config); >> + rte_eal_config_reattach(); >> break; >> case RTE_PROC_AUTO: >> case RTE_PROC_INVALID: >> -- >> 2.17.1 >> > > > Is there a reason why FreeBSD EAL does not support the virtaddr hint like > for Linux EAL? > No real reason. Implementing that is probably out of scope for this patchset though. -- Thanks, Anatoly