From: Harry van Haaren <harry.van.haaren@intel.com>
To: david.marchand@6wind.com
Cc: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v7 1/2] eal: fix race-condition in pri/sec proc startup
Date: Tue, 8 Mar 2016 17:07:04 +0000 [thread overview]
Message-ID: <1457456825-28667-2-git-send-email-harry.van.haaren@intel.com> (raw)
In-Reply-To: <1457456825-28667-1-git-send-email-harry.van.haaren@intel.com>
This patch fixes a race-condition when a primary and
secondary process simultaneously probe PCI devices.
This is implemented by moving the rte_eal_mcfg_complete()
function call in rte_eal_init() until after rte_eal_pci_probe().
The end result is that the secondary process waits longer,
until the primary has completed its PCI probing, and then
notifies the secondary process.
This race-condition became visible during the development of
a function that allows a secondary process to be polling until
a primary process exists. The secondary would then probe PCI
devices at the same time, causing an error during rte_eal_init()
Linux EAL:
Fixes: 916e4f4f4e45 ("memory: fix for multi process support")
BSD EAL:
Fixes: 764bf26873b9 ("add FreeBSD support")
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
---
lib/librte_eal/bsdapp/eal/eal.c | 6 +++---
lib/librte_eal/linuxapp/eal/eal.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index a34e61d..06bfd4e 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* Copyright(c) 2014 6WIND S.A.
* All rights reserved.
*
@@ -569,8 +569,6 @@ rte_eal_init(int argc, char **argv)
eal_check_mem_on_local_socket();
- rte_eal_mcfg_complete();
-
if (eal_plugins_init() < 0)
rte_panic("Cannot init plugins\n");
@@ -621,6 +619,8 @@ rte_eal_init(int argc, char **argv)
if (rte_eal_pci_probe())
rte_panic("Cannot probe PCI\n");
+ rte_eal_mcfg_complete();
+
return fctret;
}
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index ceac435..364f303 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* Copyright(c) 2012-2014 6WIND S.A.
* All rights reserved.
*
@@ -821,8 +821,6 @@ rte_eal_init(int argc, char **argv)
eal_check_mem_on_local_socket();
- rte_eal_mcfg_complete();
-
if (eal_plugins_init() < 0)
rte_panic("Cannot init plugins\n");
@@ -880,6 +878,8 @@ rte_eal_init(int argc, char **argv)
if (rte_eal_pci_probe())
rte_panic("Cannot probe PCI\n");
+ rte_eal_mcfg_complete();
+
return fctret;
}
--
2.5.0
next prev parent reply other threads:[~2016-03-08 17:09 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-20 13:25 [dpdk-dev] [PATCH] eal: add function to check if primary proc alive Harry van Haaren
2016-01-21 6:14 ` Qiu, Michael
2016-01-21 6:19 ` Matthew Hall
2016-01-21 9:02 ` Van Haaren, Harry
2016-01-22 17:37 ` Bruce Richardson
2016-01-25 8:06 ` Qiu, Michael
2016-01-25 11:44 ` Van Haaren, Harry
2016-01-26 19:13 ` Bruce Richardson
2016-01-27 10:35 ` Van Haaren, Harry
2016-01-25 8:11 ` Qiu, Michael
2016-01-25 11:51 ` Van Haaren, Harry
2016-01-26 2:25 ` Qiu, Michael
2016-01-26 9:04 ` Van Haaren, Harry
2016-01-26 11:07 ` Qiu, Michael
2016-01-26 11:19 ` Van Haaren, Harry
2016-01-27 10:31 ` [dpdk-dev] [PATCH v2] " Harry van Haaren
2016-02-02 14:11 ` [dpdk-dev] [PATCH v3] " Harry van Haaren
2016-02-23 14:10 ` [dpdk-dev] [PATCH v4] " Harry van Haaren
2016-02-24 13:50 ` Tahhan, Maryam
2016-03-04 18:07 ` Thomas Monjalon
2016-03-07 11:37 ` [dpdk-dev] [PATCH v5] " Harry van Haaren
2016-03-07 12:02 ` [dpdk-dev] [PATCH v6] " Harry van Haaren
2016-03-08 8:42 ` David Marchand
2016-03-08 9:58 ` Van Haaren, Harry
2016-03-08 11:13 ` Thomas Monjalon
2016-03-08 11:19 ` David Marchand
2016-03-08 13:57 ` Van Haaren, Harry
2016-03-08 14:40 ` David Marchand
2016-03-08 17:07 ` [dpdk-dev] [PATCH v7 0/2] eal: add function to check primary alive Harry van Haaren
2016-03-08 17:07 ` Harry van Haaren [this message]
2016-03-08 17:07 ` [dpdk-dev] [PATCH v7 2/2] eal: add function to check if primary proc alive Harry van Haaren
2016-03-09 10:12 ` [dpdk-dev] [PATCH v8 0/2] eal: add function to check primary alive Harry van Haaren
2016-03-09 10:12 ` [dpdk-dev] [PATCH v8 1/2] eal: fix race-condition in pri/sec proc startup Harry van Haaren
2016-03-09 13:23 ` Sergio Gonzalez Monroy
2016-03-09 10:12 ` [dpdk-dev] [PATCH v8 2/2] eal: add function to check if primary proc alive Harry van Haaren
2016-03-09 11:07 ` [dpdk-dev] [PATCH v8 0/2] eal: add function to check primary alive David Marchand
2016-03-09 12:59 ` Sergio Gonzalez Monroy
2016-03-09 13:37 ` [dpdk-dev] [PATCH v9 " Harry van Haaren
2016-03-09 13:37 ` [dpdk-dev] [PATCH v9 1/2] eal: fix race-condition in pri/sec proc startup Harry van Haaren
2016-03-09 14:27 ` Sergio Gonzalez Monroy
2016-03-09 13:37 ` [dpdk-dev] [PATCH v9 2/2] eal: add function to check if primary proc alive Harry van Haaren
2016-03-09 15:02 ` Thomas Monjalon
2016-03-09 15:17 ` [dpdk-dev] [PATCH v9 0/2] eal: add function to check primary alive Thomas Monjalon
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=1457456825-28667-2-git-send-email-harry.van.haaren@intel.com \
--to=harry.van.haaren@intel.com \
--cc=david.marchand@6wind.com \
--cc=dev@dpdk.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).