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 27F07A0471 for ; Mon, 12 Aug 2019 15:32:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1B79D326D; Mon, 12 Aug 2019 15:32:04 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 81D70326D; Mon, 12 Aug 2019 15:32:02 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Aug 2019 06:32:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,377,1559545200"; d="scan'208";a="259792236" Received: from aburakov-mobl1.ger.corp.intel.com (HELO [10.237.220.78]) ([10.237.220.78]) by orsmga001.jf.intel.com with ESMTP; 12 Aug 2019 06:32:00 -0700 To: David Marchand Cc: dev , Bruce Richardson , Stephen Hemminger , dpdk stable References: <67a795e77bc9f5ac79ab78a878ae19abbead9f50.1563984454.git.anatoly.burakov@intel.com> From: "Burakov, Anatoly" Message-ID: Date: Mon, 12 Aug 2019 14:31:59 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 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] [dpdk-dev] [PATCH v4] eal: fix proc type auto detection 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 12-Aug-19 11:03 AM, David Marchand wrote: > On Wed, Jul 24, 2019 at 6:08 PM Anatoly Burakov > wrote: >> >> Currently, primary process holds an exclusive lock on the config >> file, thereby preventing other primaries from spinning up. However, >> when the primary dies, the lock is no longer being held, even though >> there might be other secondary processes still running. >> >> The fix is two-fold. First of all, downgrade the primary process's >> exclusive lock to a shared lock once we have it. Second of all, >> also take out shared locks on the config from the secondaries. We >> are using fcntl() locks, which get dropped when the file handle is >> closed, so also remove the closure of config file handle. >> >> Fixes: af75078fece3 ("first public release") >> Cc: stable@dpdk.org >> >> Signed-off-by: Anatoly Burakov >> --- >> rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config), >> PROT_READ, MAP_SHARED, mem_cfg_fd, 0); >> @@ -330,8 +360,6 @@ rte_eal_config_reattach(void) >> mem_config = (struct rte_mem_config *) mmap(rte_mem_cfg_addr, >> sizeof(*mem_config), PROT_READ | PROT_WRITE, MAP_SHARED, >> mem_cfg_fd, 0); >> - close(mem_cfg_fd); >> - mem_cfg_fd = -1; >> >> if (mem_config == MAP_FAILED) { >> RTE_LOG(ERR, EAL, "Cannot mmap memory for rte_config! error %i (%s)\n", > > We are missing a mem_cfg_fd cleanup if mmap failed. > Good catch! Will fix. > >> diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c >> index 34db78753..0f0726703 100644 >> --- a/lib/librte_eal/linux/eal/eal.c >> +++ b/lib/librte_eal/linux/eal/eal.c >> @@ -83,6 +83,13 @@ static struct flock wr_lock = { >> .l_len = sizeof(early_mem_config.memsegs), >> }; >> >> +static struct flock rd_lock = { >> + .l_type = F_RDLCK, >> - >> if (mem_config == MAP_FAILED || mem_config != rte_mem_cfg_addr) { >> if (mem_config != MAP_FAILED) { >> /* errno is stale, don't use */ > > Idem. > > Reviewed-by: David Marchand > > With https://patchwork.dpdk.org/patch/56501/, the code is now really > close between Linux and FreeBSD, could it go to common entirely? I would prefer to keep them separate due to upcoming Windows port. -- Thanks, Anatoly