[RFC 14/23] eal: do not panic on tailq init
From: Aaron Conole <aconole@redhat.com>
Date: 2016-12-30 15:26:29
Subsystem:
library code, the rest · Maintainers:
Andrew Morton, Linus Torvalds
There are some theoretical racy conditions in the system that _could_ cause early tailq init to fail; however, no need to panic the application. While it can't continue using DPDK, it could make better alerts to the user. Signed-off-by: Aaron Conole <aconole@redhat.com> --- lib/librte_eal/common/eal_common_tailqs.c | 4 ++-- lib/librte_eal/linuxapp/eal/eal.c | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_tailqs.c b/lib/librte_eal/common/eal_common_tailqs.c
index bb08ec8..b856ec9 100644
--- a/lib/librte_eal/common/eal_common_tailqs.c
+++ b/lib/librte_eal/common/eal_common_tailqs.c@@ -188,8 +188,8 @@ rte_eal_tailqs_init(void) if (t->head == NULL) { RTE_LOG(ERR, EAL, "Cannot initialize tailq: %s\n", t->name); - /* no need to TAILQ_REMOVE, we are going to panic in - * rte_eal_init() */ + /* no need to TAILQ_REMOVE, we are going to disallow re-attemtps + * for rte_eal_init(). */ goto fail; } }
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 050543c..3616515 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c@@ -848,8 +848,11 @@ rte_eal_init(int argc, char **argv) return -1; } - if (rte_eal_tailqs_init() < 0) - rte_panic("Cannot init tail queues for objects\n"); + if (rte_eal_tailqs_init() < 0) { + RTE_LOG (ERR, EAL, "Cannot init tail queues for objects\n"); + errno = ENOTSUP; + return -1; + } if (rte_eal_alarm_init() < 0) rte_panic("Cannot init interrupt-handling thread\n");
--
2.7.4