From: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 01/13] EAL: count nr_overcommit_hugepages as available
Date: Tue, 13 Dec 2016 02:08:15 +0100 (CET) [thread overview]
Message-ID: <fbde0ab92ed4fad33b617e9e8e617ff9feeba2db.1481590851.git.mirq-linux@rere.qmqm.pl> (raw)
In-Reply-To: <cover.1481590851.git.mirq-linux@rere.qmqm.pl>
Signed-off-by: Michał Mirosław <michal.miroslaw@atendesoftware.pl>
---
lib/librte_eal/linuxapp/eal/eal_hugepage_info.c | 43 ++++++++++++++++++-------
1 file changed, 32 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 18858e2..f391e07 100644
--- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
@@ -61,30 +61,38 @@
static const char sys_dir_path[] = "/sys/kernel/mm/hugepages";
+static int get_hp_sysfs_value(const char *subdir, const char *file, long unsigned *val)
+{
+ char path[PATH_MAX];
+
+ snprintf(path, sizeof(path), "%s/%s/%s",
+ sys_dir_path, subdir, file);
+ return eal_parse_sysfs_value(path, val);
+}
+
/* this function is only called from eal_hugepage_info_init which itself
* is only called from a primary process */
static uint32_t
get_num_hugepages(const char *subdir)
{
- char path[PATH_MAX];
- long unsigned resv_pages, num_pages = 0;
+ long unsigned resv_pages, num_pages, over_pages, surplus_pages;
const char *nr_hp_file = "free_hugepages";
const char *nr_rsvd_file = "resv_hugepages";
+ const char *nr_over_file = "nr_overcommit_hugepages";
+ const char *nr_splus_file = "surplus_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)
+ if (get_hp_sysfs_value(subdir, nr_rsvd_file, &resv_pages) < 0)
return 0;
- snprintf(path, sizeof(path), "%s/%s/%s",
- sys_dir_path, subdir, nr_hp_file);
- if (eal_parse_sysfs_value(path, &num_pages) < 0)
+ if (get_hp_sysfs_value(subdir, nr_hp_file, &num_pages) < 0)
return 0;
- if (num_pages == 0)
- RTE_LOG(WARNING, EAL, "No free hugepages reported in %s\n",
- subdir);
+ if (get_hp_sysfs_value(subdir, nr_over_file, &over_pages) < 0)
+ over_pages = 0;
+
+ if (get_hp_sysfs_value(subdir, nr_splus_file, &surplus_pages) < 0)
+ surplus_pages = 0;
/* adjust num_pages */
if (num_pages >= resv_pages)
@@ -92,6 +100,19 @@ get_num_hugepages(const char *subdir)
else if (resv_pages)
num_pages = 0;
+ if (over_pages >= surplus_pages)
+ over_pages -= surplus_pages;
+ else
+ over_pages = 0;
+
+ if (num_pages == 0 && over_pages == 0)
+ RTE_LOG(WARNING, EAL, "No available hugepages reported in %s\n",
+ subdir);
+
+ num_pages += over_pages;
+ if (num_pages < over_pages) /* overflow */
+ num_pages = UINT32_MAX;
+
/* we want to return a uint32_t and more than this looks suspicious
* anyway ... */
if (num_pages > UINT32_MAX)
--
2.10.2
next prev parent reply other threads:[~2016-12-13 1:08 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-13 1:08 [dpdk-dev] [PATCH 00/13] Fixes and tweaks Michał Mirosław
2016-12-13 1:08 ` [dpdk-dev] [PATCH 02/13] mbuf: rte_pktmbuf_free_bulk() Michał Mirosław
2016-12-13 21:41 ` Stephen Hemminger
2016-12-14 2:09 ` Michał Mirosław
2016-12-13 1:08 ` Michał Mirosław [this message]
[not found] ` <20161213010852.862C4376C@dpdk.org>
2016-12-13 1:28 ` [dpdk-dev] [PATCH v2 01/13] EAL: count nr_overcommit_hugepages as available Michał Mirosław
2017-04-30 15:53 ` Thomas Monjalon
2017-05-04 18:43 ` Michał Mirosław
2019-01-17 17:18 ` Ferruh Yigit
2016-12-13 1:08 ` [dpdk-dev] [PATCH 05/13] acl: fix acl_flow_data comments Michał Mirosław
2016-12-13 10:43 ` Ananyev, Konstantin
2017-01-30 10:15 ` Thomas Monjalon
2016-12-13 1:08 ` [dpdk-dev] [PATCH 04/13] acl: allow zero verdict Michał Mirosław
2016-12-13 10:36 ` Ananyev, Konstantin
2016-12-13 13:54 ` Michal Miroslaw
2016-12-13 14:14 ` Ananyev, Konstantin
2016-12-13 14:53 ` Michal Miroslaw
2016-12-13 15:13 ` Ananyev, Konstantin
2016-12-13 16:14 ` Michal Miroslaw
2016-12-13 16:43 ` Michal Miroslaw
2016-12-13 17:27 ` Ananyev, Konstantin
2016-12-13 18:02 ` Michal Miroslaw
2016-12-13 21:55 ` Ananyev, Konstantin
2016-12-14 2:11 ` Michal Miroslaw
2016-12-14 12:16 ` Ananyev, Konstantin
2016-12-13 1:08 ` [dpdk-dev] [PATCH 06/13] null: fake PMD capabilities Michał Mirosław
[not found] ` <20161213010913.34C8B5597@dpdk.org>
2016-12-13 1:28 ` [dpdk-dev] [PATCH v2 " Michał Mirosław
2016-12-13 1:35 ` [dpdk-dev] [-- " Michał Mirosław
2016-12-13 10:48 ` [dpdk-dev] [PATCH " Ananyev, Konstantin
2016-12-13 14:26 ` Michal Miroslaw
2016-12-13 14:37 ` Ananyev, Konstantin
2016-12-13 14:57 ` Michal Miroslaw
2016-12-13 17:12 ` Ananyev, Konstantin
2016-12-13 17:31 ` Ferruh Yigit
2016-12-14 19:16 ` [dpdk-dev] [PATCH v4] " Michał Mirosław
2017-01-09 12:07 ` Ferruh Yigit
2017-01-11 10:14 ` Michał Mirosław
2017-01-11 12:23 ` Ferruh Yigit
2016-12-13 1:08 ` [dpdk-dev] [PATCH 03/13] rte_ether: set PKT_RX_VLAN_STRIPPED in rte_vlan_strip() Michał Mirosław
2017-01-30 9:54 ` Thomas Monjalon
2017-02-09 15:56 ` Olivier MATZ
2017-04-30 15:58 ` Thomas Monjalon
2017-05-04 7:30 ` Olivier MATZ
2017-05-04 22:36 ` [dpdk-dev] [PATCH v2] net: fix stripped VLAN flag for offload emulation Thomas Monjalon
2017-05-05 10:02 ` Olivier Matz
2017-05-05 14:00 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
2016-12-13 1:08 ` [dpdk-dev] [PATCH 07/13] pcap: fix timestamps in output pcap file Michał Mirosław
2016-12-14 17:45 ` Ferruh Yigit
2016-12-16 10:06 ` Ferruh Yigit
2016-12-13 1:08 ` [dpdk-dev] [PATCH 08/13] PMD/af_packet: guard against buffer overruns in RX path Michał Mirosław
[not found] ` <20161213010918.F1B095684@dpdk.org>
2016-12-13 1:28 ` [dpdk-dev] [PATCH v2 " Michał Mirosław
2016-12-13 16:05 ` John W. Linville
2016-12-16 10:32 ` Ferruh Yigit
2017-01-18 11:48 ` [dpdk-dev] [PATCH " Ferruh Yigit
2017-01-18 19:22 ` Michał Mirosław
2016-12-13 1:08 ` [dpdk-dev] [PATCH 10/13] KNI: provided netif name's source is user-space Michał Mirosław
2016-12-14 17:06 ` Ferruh Yigit
2016-12-14 17:19 ` Michał Mirosław
2016-12-14 17:35 ` Ferruh Yigit
2016-12-14 17:35 ` Ferruh Yigit
2017-01-29 21:50 ` Thomas Monjalon
2016-12-13 1:08 ` [dpdk-dev] [PATCH 09/13] PMD/af_packet: guard against buffer overruns in TX path Michał Mirosław
[not found] ` <20161213010927.9B12CFA30@dpdk.org>
2016-12-13 1:28 ` [dpdk-dev] [PATCH v2 " Michał Mirosław
2016-12-13 16:06 ` John W. Linville
2016-12-16 10:32 ` Ferruh Yigit
2016-12-13 1:08 ` [dpdk-dev] [PATCH 12/13] i40e: return -errno when intr setup fails Michał Mirosław
2016-12-22 15:45 ` Ferruh Yigit
2016-12-23 1:55 ` Michał Mirosław
2016-12-28 3:47 ` Wu, Jingjing
2017-01-11 16:09 ` Ferruh Yigit
2016-12-13 1:08 ` [dpdk-dev] [PATCH 13/13] i40e: improve message grepability Michał Mirosław
2016-12-28 3:51 ` Wu, Jingjing
2017-01-09 12:02 ` Bruce Richardson
2017-01-09 13:18 ` Thomas Monjalon
2017-01-09 17:25 ` Stephen Hemminger
2017-01-09 14:11 ` Ferruh Yigit
2017-01-11 9:49 ` [dpdk-dev] [PATCH] " Michał Mirosław
2017-01-11 16:05 ` Ferruh Yigit
2017-01-11 17:13 ` [dpdk-dev] [PATCH v3 1/1] " Michał Mirosław
2017-01-11 17:50 ` Ferruh Yigit
2017-01-11 17:52 ` Ferruh Yigit
2016-12-13 1:08 ` [dpdk-dev] [PATCH 11/13] KNI: guard against unterminated dev_info.name leading to BUG in alloc_netdev() Michał Mirosław
2016-12-14 17:33 ` Ferruh Yigit
2016-12-14 17:37 ` Michał Mirosław
2016-12-14 17:48 ` Ferruh Yigit
2017-01-29 21:53 ` Thomas Monjalon
2016-12-14 17:23 ` [dpdk-dev] [PATCH] acl: remove invalid test Michał Mirosław
2016-12-19 18:48 ` Ananyev, Konstantin
2016-12-23 1:47 ` Michal Miroslaw
2016-12-23 9:36 ` Ananyev, Konstantin
2017-01-17 15:24 ` Thomas Monjalon
2017-01-18 9:51 ` Ananyev, Konstantin
2017-01-18 19:21 ` Michal Miroslaw
2016-12-14 17:23 ` [dpdk-dev] [PATCH v2] acl: allow zero verdict Michał Mirosław
2016-12-19 18:54 ` Ananyev, Konstantin
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=fbde0ab92ed4fad33b617e9e8e617ff9feeba2db.1481590851.git.mirq-linux@rere.qmqm.pl \
--to=mirq-linux@rere.qmqm.pl \
--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).