Resolves a deadlock that can occur when multiple secondary
processes are starting and stopping. A deadlock can occur because
eal_memalloc_init() is taking a second unnecessary read lock.
If another DPDK process that is terminating enters rte_eal_memory_detach()
and acquires a write lock wait state before the starting process can
acquire it's second read lock then no process will be able to proceed.
Cc: sta...@dpdk.org
Signed-off-by: Jonathan Erb <jonathan....@threatblockr.com>
---
.mailmap | 2 +-
lib/eal/linux/eal_memalloc.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.mailmap b/.mailmap
index 6eccf0c555..a64bfcf1d2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -663,7 +663,7 @@ John OLoughlin <john.olough...@intel.com>
John Ousterhout <ous...@cs.stanford.edu>
John W. Linville <linvi...@tuxdriver.com>
Jonas Pfefferle <j...@zurich.ibm.com> <peppe...@japf.ch>
-Jonathan Erb <jonathan....@banduracyber.com>
+Jonathan Erb <jonathan....@threatblockr.com>
Jon DeVree <n...@vault24.org>
Jon Loeliger <j...@netgate.com>
Joongi Kim <joo...@an.kaist.ac.kr>
diff --git a/lib/eal/linux/eal_memalloc.c b/lib/eal/linux/eal_memalloc.c
index f8b1588cae..a34f1cf2f9 100644
--- a/lib/eal/linux/eal_memalloc.c
+++ b/lib/eal/linux/eal_memalloc.c
@@ -1740,7 +1740,7 @@ eal_memalloc_init(void)
eal_get_internal_configuration();
if (rte_eal_process_type() == RTE_PROC_SECONDARY)
- if (rte_memseg_list_walk(secondary_msl_create_walk, NULL) < 0)
+ if
(rte_memseg_list_walk_thread_unsafe(secondary_msl_create_walk, NULL) < 0)
return -1;
if (rte_eal_process_type() == RTE_PROC_PRIMARY &&
internal_conf->in_memory) {
@@ -1778,7 +1778,7 @@ eal_memalloc_init(void)
}
/* initialize all of the fd lists */
- if (rte_memseg_list_walk(fd_list_create_walk, NULL))
+ if (rte_memseg_list_walk_thread_unsafe(fd_list_create_walk, NULL))
return -1;
return 0;
}
--
2.34.1
