From: Aaron Conole <aconole@redhat.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>,
Thomas Monjalon <thomas.monjalon@6wind.com>,
Stephen Hemminger <stephen@networkplumber.org>
Subject: [dpdk-dev] [PATCH v7 08/14] eal: do not panic on timer init failure
Date: Wed, 22 Mar 2017 16:19:34 -0400 [thread overview]
Message-ID: <20170322201940.24028-9-aconole@redhat.com> (raw)
In-Reply-To: <20170322201940.24028-1-aconole@redhat.com>
After code inspection, there is no way for eal_timer_init() to fail. It
simply returns 0 in all cases. As such, this test could either go-away
or stay here as 'future-proofing'.
Signed-off-by: Aaron Conole <aconole@redhat.com>
---
lib/librte_eal/bsdapp/eal/eal.c | 7 +++++--
lib/librte_eal/linuxapp/eal/eal.c | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index b893dc1..00d607b 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -596,8 +596,11 @@ rte_eal_init(int argc, char **argv)
if (rte_eal_intr_init() < 0)
rte_panic("Cannot init interrupt-handling thread\n");
- if (rte_eal_timer_init() < 0)
- rte_panic("Cannot init HPET or TSC timers\n");
+ if (rte_eal_timer_init() < 0) {
+ rte_eal_init_alert("Cannot init HPET or TSC timers\n");
+ rte_errno = ENOTSUP;
+ return -1;
+ }
if (rte_eal_pci_init() < 0)
rte_panic("Cannot init PCI\n");
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index bfb8260..9fb5421 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -871,8 +871,11 @@ rte_eal_init(int argc, char **argv)
return -1;
}
- if (rte_eal_timer_init() < 0)
- rte_panic("Cannot init HPET or TSC timers\n");
+ if (rte_eal_timer_init() < 0) {
+ rte_eal_init_alert("Cannot init HPET or TSC timers\n");
+ rte_errno = ENOTSUP;
+ return -1;
+ }
eal_check_mem_on_local_socket();
--
2.9.3
next prev parent reply other threads:[~2017-03-22 20:19 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-22 20:19 [dpdk-dev] [PATCH v7 00/14] eal: Remove most causes of panic on init Aaron Conole
2017-03-22 20:19 ` [dpdk-dev] [PATCH v7 01/14] eal: do not panic on cpu detection Aaron Conole
2017-03-22 20:19 ` [dpdk-dev] [PATCH v7 02/14] eal: do not panic when CPU isn't supported Aaron Conole
2017-03-23 13:47 ` Bruce Richardson
2017-03-23 14:27 ` Aaron Conole
2017-03-22 20:19 ` [dpdk-dev] [PATCH v7 03/14] eal: do not panic on hugepage info init Aaron Conole
2017-03-22 20:19 ` [dpdk-dev] [PATCH v7 04/14] eal: do not panic if parsing args returns error Aaron Conole
2017-03-22 20:19 ` [dpdk-dev] [PATCH v7 05/14] eal: do not panic on memzone initialization fails Aaron Conole
2017-03-22 20:19 ` [dpdk-dev] [PATCH v7 06/14] eal: set errno when exiting for already called Aaron Conole
2017-03-22 20:19 ` [dpdk-dev] [PATCH v7 07/14] eal: do not panic on a number of conditions Aaron Conole
2017-03-22 20:19 ` Aaron Conole [this message]
2017-03-22 20:19 ` [dpdk-dev] [PATCH v7 09/14] eal: do not panic on interrupt thread init Aaron Conole
2017-03-22 20:19 ` [dpdk-dev] [PATCH v7 10/14] eal: do not error if plugins fail to init Aaron Conole
2017-03-22 20:19 ` [dpdk-dev] [PATCH v7 11/14] eal: do not panic on PCI failures Aaron Conole
2017-03-22 20:19 ` [dpdk-dev] [PATCH v7 12/14] eal: do not panic if vdev init fails Aaron Conole
2017-03-22 20:19 ` [dpdk-dev] [PATCH v7 13/14] eal: do not panic when bus probe/scan fails Aaron Conole
2017-03-22 20:19 ` [dpdk-dev] [PATCH v7 14/14] rte_eal_init: add info about various error codes Aaron Conole
2017-03-23 14:04 ` [dpdk-dev] [PATCH v7 00/14] eal: Remove most causes of panic on init Bruce Richardson
2017-03-27 14:06 ` Thomas Monjalon
2017-03-31 17:54 ` Aaron Conole
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=20170322201940.24028-9-aconole@redhat.com \
--to=aconole@redhat.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=stephen@networkplumber.org \
--cc=thomas.monjalon@6wind.com \
/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).