From: Kevin Traynor <ktraynor@redhat.com>
To: Arnon Warshavsky <arnon@qwilt.com>,
thomas@monjalon.net, anatoly.burakov@intel.com,
wenzhuo.lu@intel.com, declan.doherty@intel.com,
jerin.jacob@caviumnetworks.com, bruce.richardson@intel.com,
ferruh.yigit@intel.com
Cc: dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v4 07/11] eal: replace rte_panic instances in hugepage_info
Date: Thu, 19 Apr 2018 15:36:03 +0100 [thread overview]
Message-ID: <f7445179-b556-b236-7b32-ff2660d9823d@redhat.com> (raw)
In-Reply-To: <1524117669-25729-8-git-send-email-arnon@qwilt.com>
On 04/19/2018 07:01 AM, Arnon Warshavsky wrote:
> replace panic calls with log and retrun value.
>
> v4
> static size calculation function changed to return success/fail code
> in addition to filling the size result.
>
fyi - this patch doesn't apply on master branch without fuzz
> Signed-off-by: Arnon Warshavsky <arnon@qwilt.com>
> ---
> lib/librte_eal/linuxapp/eal/eal_hugepage_info.c | 32 ++++++++++++++++---------
> 1 file changed, 21 insertions(+), 11 deletions(-)
>
> diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
> index fb4b667..debae32 100644
> --- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
> +++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
> @@ -145,8 +145,8 @@
> return num_pages;
> }
>
> -static uint64_t
> -get_default_hp_size(void)
> +static int
> +get_default_hp_size(uint64_t *result)
> {
> const char proc_meminfo[] = "/proc/meminfo";
> const char str_hugepagesz[] = "Hugepagesize:";
> @@ -155,8 +155,11 @@
> unsigned long long size = 0;
>
> FILE *fd = fopen(proc_meminfo, "r");
> - if (fd == NULL)
> - rte_panic("Cannot open %s\n", proc_meminfo);
> + if (fd == NULL) {
> + RTE_LOG(CRIT, EAL, "%s(): Cannot open %s\n",
> + __func__, proc_meminfo);
> + return -1;
> + }
> while(fgets(buffer, sizeof(buffer), fd)){
> if (strncmp(buffer, str_hugepagesz, hugepagesz_len) == 0){
> size = rte_str_to_size(&buffer[hugepagesz_len]);
> @@ -164,9 +167,13 @@
> }
> }
> fclose(fd);
> - if (size == 0)
> - rte_panic("Cannot get default hugepage size from %s\n", proc_meminfo);
> - return size;
> + if (size == 0) {
> + RTE_LOG(CRIT, EAL, "%s(): Cannot get default hugepage size from %s\n",
> + __func__, proc_meminfo);
> + return -1;
> + }
> + *result = size;
> + return 0;
> }
>
> static const char *
> @@ -191,11 +198,14 @@
> char *retval = NULL;
>
> FILE *fd = fopen(proc_mounts, "r");
> - if (fd == NULL)
> - rte_panic("Cannot open %s\n", proc_mounts);
> + if (fd == NULL) {
> + RTE_LOG(CRIT, EAL, "%s(): Cannot open %s\n",
> + __func__, proc_mounts);
> + return NULL;
> + }
>
> - if (default_size == 0)
> - default_size = get_default_hp_size();
> + if ((default_size == 0) && (get_default_hp_size(&default_size) != 0))
> + return NULL;
>
> while (fgets(buf, sizeof(buf), fd)){
> if (rte_strsplit(buf, sizeof(buf), splitstr, _FIELDNAME_MAX,
>
next prev parent reply other threads:[~2018-04-19 14:36 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-19 6:00 [dpdk-dev] [PATCH v4 00/11] eal: replace calls to rte_panic and refrain from new instances Arnon Warshavsky
2018-04-19 6:00 ` [dpdk-dev] [PATCH v4 01/11] crypto: replace rte_panic instances in crypto driver Arnon Warshavsky
2018-04-19 10:53 ` Trahe, Fiona
2018-04-19 13:49 ` Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 02/11] bond: replace rte_panic instances in bonding driver Arnon Warshavsky
2018-04-19 17:25 ` Kevin Traynor
2018-04-20 13:13 ` Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 03/11] e1000: replace rte_panic instances in e1000 driver Arnon Warshavsky
2018-04-19 17:25 ` Kevin Traynor
2018-04-20 13:14 ` Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 04/11] ixgbe: replace rte_panic instances in ixgbe driver Arnon Warshavsky
2018-04-19 17:26 ` Kevin Traynor
2018-04-20 13:16 ` Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 05/11] eal: replace rte_panic instances in eventdev Arnon Warshavsky
2018-04-19 17:26 ` Kevin Traynor
2018-04-20 13:17 ` Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 06/11] kni: replace rte_panic instances in kni Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 07/11] eal: replace rte_panic instances in hugepage_info Arnon Warshavsky
2018-04-19 14:03 ` Burakov, Anatoly
2018-04-19 14:09 ` Arnon Warshavsky
2018-04-19 14:45 ` Burakov, Anatoly
2018-04-19 14:50 ` Burakov, Anatoly
2018-04-20 13:11 ` Arnon Warshavsky
2018-04-19 14:36 ` Kevin Traynor [this message]
2018-04-20 13:12 ` Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 08/11] eal: replace rte_panic instances in interrupts thread Arnon Warshavsky
2018-04-19 17:27 ` Kevin Traynor
2018-04-20 13:18 ` Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 09/11] eal: replace rte_panic instances in ethdev Arnon Warshavsky
2018-04-19 17:27 ` Kevin Traynor
2018-04-20 13:23 ` Arnon Warshavsky
2018-04-20 13:56 ` Thomas Monjalon
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 10/11] eal: replace rte_panic instances in init sequence Arnon Warshavsky
2018-04-19 14:39 ` Burakov, Anatoly
2018-04-19 14:48 ` Arnon Warshavsky
2018-04-19 14:57 ` Burakov, Anatoly
2018-04-19 17:31 ` Kevin Traynor
2018-04-20 13:32 ` Arnon Warshavsky
2018-04-20 13:31 ` Arnon Warshavsky
2018-04-19 17:48 ` Aaron Conole
2018-04-20 13:55 ` Arnon Warshavsky
2018-04-20 14:53 ` Aaron Conole
2018-04-23 8:07 ` Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 11/11] devtools: prevent new instances of rte_panic and rte_exit Arnon Warshavsky
2018-04-19 17:52 ` Aaron Conole
2018-04-20 14:01 ` Arnon Warshavsky
2018-04-20 15:41 ` Burakov, Anatoly
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=f7445179-b556-b236-7b32-ff2660d9823d@redhat.com \
--to=ktraynor@redhat.com \
--cc=anatoly.burakov@intel.com \
--cc=arnon@qwilt.com \
--cc=bruce.richardson@intel.com \
--cc=declan.doherty@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=jerin.jacob@caviumnetworks.com \
--cc=thomas@monjalon.net \
--cc=wenzhuo.lu@intel.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).