From: Anatoly Burakov <anatoly.burakov@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH] mem: unmap unneeded space
Date: Thu, 19 Apr 2018 17:35:25 +0100 [thread overview]
Message-ID: <be863f870fc02ea6464d15c87fa43e9d274f3240.1524155435.git.anatoly.burakov@intel.com> (raw)
When we ask to reserve virtual areas, we usually include
alignment in the mapping size, and that memory ends up
being wasted. Wasting a gigabyte of VA space while trying to
reserve one gigabyte is pretty expensive on 32-bit, so after
we're done mapping, unmap unneeded space.
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
lib/librte_eal/common/eal_common_memory.c | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/librte_eal/common/eal_common_memory.c
index 24a9ed5..8dd026a 100644
--- a/lib/librte_eal/common/eal_common_memory.c
+++ b/lib/librte_eal/common/eal_common_memory.c
@@ -75,8 +75,13 @@ eal_get_virtual_area(void *requested_addr, size_t *size,
do {
map_sz = no_align ? *size : *size + page_sz;
+ if (map_sz > SIZE_MAX) {
+ RTE_LOG(ERR, EAL, "Map size too big\n");
+ rte_errno = E2BIG;
+ return NULL;
+ }
- mapped_addr = mmap(requested_addr, map_sz, PROT_READ,
+ mapped_addr = mmap(requested_addr, (size_t)map_sz, PROT_READ,
mmap_flags, -1, 0);
if (mapped_addr == MAP_FAILED && allow_shrink)
*size -= page_sz;
@@ -113,8 +118,22 @@ eal_get_virtual_area(void *requested_addr, size_t *size,
RTE_LOG(WARNING, EAL, " This may cause issues with mapping memory into secondary processes\n");
}
- if (unmap)
+ if (unmap) {
munmap(mapped_addr, map_sz);
+ } else if (!no_align) {
+ void *unmap_pre, *unmap_post, *map_end;
+ size_t pre_len, post_len;
+
+ /* unmap all of the extra space */
+ unmap_pre = mapped_addr;
+ pre_len = RTE_PTR_DIFF(aligned_addr, mapped_addr);
+ map_end = RTE_PTR_ADD(mapped_addr, (size_t)map_sz);
+ unmap_post = RTE_PTR_ADD(aligned_addr, *size);
+ post_len = RTE_PTR_DIFF(map_end, unmap_post);
+
+ munmap(unmap_pre, pre_len);
+ munmap(unmap_post, post_len);
+ }
RTE_LOG(DEBUG, EAL, "Virtual area found at %p (size = 0x%zx)\n",
aligned_addr, *size);
--
2.7.4
next reply other threads:[~2018-04-19 16:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-19 16:35 Anatoly Burakov [this message]
2018-04-27 16:32 ` Bruce Richardson
2018-04-27 16:38 ` Bruce Richardson
2018-04-30 11:21 ` [dpdk-dev] [PATCH v2 1/2] mem: check if allocation size is too big Anatoly Burakov
2018-04-30 12:49 ` Bruce Richardson
2018-04-30 11:21 ` [dpdk-dev] [PATCH v2 2/2] mem: unmap unneeded space Anatoly Burakov
2018-04-30 12:50 ` Bruce Richardson
2018-05-02 21:00 ` Thomas Monjalon
2018-05-08 20:20 ` Thomas Monjalon
2018-05-13 23:33 ` 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=be863f870fc02ea6464d15c87fa43e9d274f3240.1524155435.git.anatoly.burakov@intel.com \
--to=anatoly.burakov@intel.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).