From: "Burakov, Anatoly" <anatoly.burakov@intel.com>
To: David Marchand <david.marchand@redhat.com>
Cc: dev <dev@dpdk.org>, Bruce Richardson <bruce.richardson@intel.com>,
Stephen Hemminger <stephen@networkplumber.org>,
dpdk stable <stable@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH v4] eal: fix proc type auto detection
Date: Mon, 12 Aug 2019 14:31:59 +0100 [thread overview]
Message-ID: <c3671903-93c6-2976-afc4-b37d5d0017d9@intel.com> (raw)
In-Reply-To: <CAJFAV8w1i_6v7oA01ETJgWcwSWh2m=+8jj+M7cn_BE36GXKbOg@mail.gmail.com>
On 12-Aug-19 11:03 AM, David Marchand wrote:
> On Wed, Jul 24, 2019 at 6:08 PM Anatoly Burakov
> <anatoly.burakov@intel.com> 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 <anatoly.burakov@intel.com>
>> ---
<snip>
>> 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,
<snip>
>> -
>> 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 <david.marchand@redhat.com>
>
> 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
next prev parent reply other threads:[~2019-08-12 13:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-23 13:19 [dpdk-dev] [PATCH] " Anatoly Burakov
2019-07-23 18:38 ` Stephen Hemminger
2019-07-24 10:04 ` [dpdk-dev] [PATCH v2] " Anatoly Burakov
2019-07-24 16:04 ` [dpdk-dev] [PATCH v3] " Anatoly Burakov
2019-07-24 16:07 ` [dpdk-dev] [PATCH v4] " Anatoly Burakov
2019-07-30 8:13 ` Thomas Monjalon
2019-07-30 9:19 ` Burakov, Anatoly
2019-08-12 10:03 ` David Marchand
2019-08-12 10:21 ` Van Haaren, Harry
2019-08-12 13:30 ` Burakov, Anatoly
2019-08-12 13:31 ` Burakov, Anatoly [this message]
2019-10-24 16:07 ` Burakov, Anatoly
2019-10-27 19:41 ` David Marchand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c3671903-93c6-2976-afc4-b37d5d0017d9@intel.com \
--to=anatoly.burakov@intel.com \
--cc=bruce.richardson@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).