From: David Marchand <david.marchand@6wind.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 1/6] eal/linux: remove useless check on process type
Date: Tue, 7 Jul 2015 11:00:29 +0200 [thread overview]
Message-ID: <1436259634-7077-2-git-send-email-david.marchand@6wind.com> (raw)
In-Reply-To: <1436259634-7077-1-git-send-email-david.marchand@6wind.com>
The code in eal_hugepage_info.c is not reachable by secondary processes.
Signed-off-by: David Marchand <david.marchand@6wind.com>
---
lib/librte_eal/linuxapp/eal/eal_hugepage_info.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
index 028e309..6dd8a0b 100644
--- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
@@ -61,31 +61,24 @@
static const char sys_dir_path[] = "/sys/kernel/mm/hugepages";
+/* this function is only called from eal_hugepage_info_init which itself
+ * is only called from a primary process */
static int32_t
get_num_hugepages(const char *subdir)
{
char path[PATH_MAX];
long unsigned resv_pages, num_pages = 0;
- const char *nr_hp_file;
+ const char *nr_hp_file = "free_hugepages";
const char *nr_rsvd_file = "resv_hugepages";
/* first, check how many reserved pages kernel reports */
snprintf(path, sizeof(path), "%s/%s/%s",
sys_dir_path, subdir, nr_rsvd_file);
-
if (eal_parse_sysfs_value(path, &resv_pages) < 0)
return 0;
- /* if secondary process, just look at the number of hugepages,
- * otherwise look at number of free hugepages */
- if (internal_config.process_type == RTE_PROC_SECONDARY)
- nr_hp_file = "nr_hugepages";
- else
- nr_hp_file = "free_hugepages";
-
snprintf(path, sizeof(path), "%s/%s/%s",
sys_dir_path, subdir, nr_hp_file);
-
if (eal_parse_sysfs_value(path, &num_pages) < 0)
return 0;
@@ -93,8 +86,8 @@ get_num_hugepages(const char *subdir)
RTE_LOG(WARNING, EAL, "No free hugepages reported in %s\n",
subdir);
- /* adjust num_pages in case of primary process */
- if (num_pages > 0 && internal_config.process_type == RTE_PROC_PRIMARY)
+ /* adjust num_pages */
+ if (num_pages > 0)
num_pages -= resv_pages;
return (int32_t)num_pages;
--
1.7.10.4
next prev parent reply other threads:[~2015-07-07 9:00 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-07 9:00 [dpdk-dev] [PATCH 0/6] eal/linux: cleanup hugepage code David Marchand
2015-07-07 9:00 ` David Marchand [this message]
2015-07-07 9:00 ` [dpdk-dev] [PATCH 2/6] eal/linux: remove useless casts David Marchand
2015-07-09 2:04 ` Thomas Monjalon
2015-07-07 9:00 ` [dpdk-dev] [PATCH 3/6] eal/linux: cosmetic change David Marchand
2015-07-07 9:00 ` [dpdk-dev] [PATCH 4/6] eal/linux: rework while loop David Marchand
2015-07-07 9:00 ` [dpdk-dev] [PATCH 5/6] eal/linux: indent file David Marchand
2015-07-07 9:00 ` [dpdk-dev] [PATCH 6/6] eal/linux: avoid out of bound access David Marchand
2015-07-08 11:03 ` [dpdk-dev] [PATCH 0/6] eal/linux: cleanup hugepage code Gonzalez Monroy, Sergio
2015-07-09 9:19 ` [dpdk-dev] [PATCH v2 " David Marchand
2015-07-09 9:19 ` [dpdk-dev] [PATCH v2 1/6] eal/linux: remove useless check on process type David Marchand
2015-07-09 9:19 ` [dpdk-dev] [PATCH v2 2/6] eal/linux: remove useless casts David Marchand
2015-07-09 9:19 ` [dpdk-dev] [PATCH v2 3/6] eal/linux: cosmetic change David Marchand
2015-07-09 9:19 ` [dpdk-dev] [PATCH v2 4/6] eal/linux: rework while loop David Marchand
2015-07-09 9:19 ` [dpdk-dev] [PATCH v2 5/6] eal/linux: indent file David Marchand
2015-07-09 9:19 ` [dpdk-dev] [PATCH v2 6/6] eal/linux: avoid out of bound access David Marchand
2015-07-09 12:21 ` [dpdk-dev] [PATCH v2 0/6] eal/linux: cleanup hugepage code 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=1436259634-7077-2-git-send-email-david.marchand@6wind.com \
--to=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).