[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 fixed 09/16] util/mmap-alloc: Factor out reserving of a memory
From: |
David Hildenbrand |
Subject: |
[PATCH v2 fixed 09/16] util/mmap-alloc: Factor out reserving of a memory region to mmap_reserve() |
Date: |
Wed, 12 Feb 2020 14:42:47 +0100 |
We want to reserve a memory region without actually populating memory.
Let's factor that out.
Reviewed-by: Igor Kotrasinski <address@hidden>
Acked-by: Murilo Opsfelder Araujo <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Greg Kurz <address@hidden>
Cc: Murilo Opsfelder Araujo <address@hidden>
Cc: Eduardo Habkost <address@hidden>
Cc: "Dr. David Alan Gilbert" <address@hidden>
Cc: Igor Mammedov <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
util/mmap-alloc.c | 58 +++++++++++++++++++++++++++--------------------
1 file changed, 33 insertions(+), 25 deletions(-)
diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
index 82f02a2cec..43a26f38a8 100644
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@@ -82,6 +82,38 @@ size_t qemu_mempath_getpagesize(const char *mem_path)
return qemu_real_host_page_size;
}
+/*
+ * Reserve a new memory region of the requested size to be used for mapping
+ * from the given fd (if any).
+ */
+static void *mmap_reserve(size_t size, int fd)
+{
+ int flags = MAP_PRIVATE;
+
+#if defined(__powerpc64__) && defined(__linux__)
+ /*
+ * On ppc64 mappings in the same segment (aka slice) must share the same
+ * page size. Since we will be re-allocating part of this segment
+ * from the supplied fd, we should make sure to use the same page size, to
+ * this end we mmap the supplied fd. In this case, set MAP_NORESERVE to
+ * avoid allocating backing store memory.
+ * We do this unless we are using the system page size, in which case
+ * anonymous memory is OK.
+ */
+ if (fd == -1 || qemu_fd_getpagesize(fd) == qemu_real_host_page_size) {
+ fd = -1;
+ flags |= MAP_ANONYMOUS;
+ } else {
+ flags |= MAP_NORESERVE;
+ }
+#else
+ fd = -1;
+ flags |= MAP_ANONYMOUS;
+#endif
+
+ return mmap(0, size, PROT_NONE, flags, fd, 0);
+}
+
static inline size_t mmap_pagesize(int fd)
{
#if defined(__powerpc64__) && defined(__linux__)
@@ -101,7 +133,6 @@ void *qemu_ram_mmap(int fd,
const size_t pagesize = mmap_pagesize(fd);
int flags;
int map_sync_flags = 0;
- int guardfd;
size_t offset;
size_t total;
void *guardptr;
@@ -113,30 +144,7 @@ void *qemu_ram_mmap(int fd,
*/
total = size + align;
-#if defined(__powerpc64__) && defined(__linux__)
- /* On ppc64 mappings in the same segment (aka slice) must share the same
- * page size. Since we will be re-allocating part of this segment
- * from the supplied fd, we should make sure to use the same page size, to
- * this end we mmap the supplied fd. In this case, set MAP_NORESERVE to
- * avoid allocating backing store memory.
- * We do this unless we are using the system page size, in which case
- * anonymous memory is OK.
- */
- flags = MAP_PRIVATE;
- if (fd == -1 || pagesize == qemu_real_host_page_size) {
- guardfd = -1;
- flags |= MAP_ANONYMOUS;
- } else {
- guardfd = fd;
- flags |= MAP_NORESERVE;
- }
-#else
- guardfd = -1;
- flags = MAP_PRIVATE | MAP_ANONYMOUS;
-#endif
-
- guardptr = mmap(0, total, PROT_NONE, flags, guardfd, 0);
-
+ guardptr = mmap_reserve(total, fd);
if (guardptr == MAP_FAILED) {
return MAP_FAILED;
}
--
2.24.1
- Re: [PATCH v2 fixed 07/16] exec: Drop "shared" parameter from ram_block_add(), (continued)
- [PATCH v2 fixed 08/16] util/mmap-alloc: Factor out calculation of pagesize to mmap_pagesize(), David Hildenbrand, 2020/02/12
- Re: [PATCH v2 fixed 08/16] util/mmap-alloc: Factor out calculation of pagesize to mmap_pagesize(), Peter Xu, 2020/02/19
- Re: [PATCH v2 fixed 08/16] util/mmap-alloc: Factor out calculation of pagesize to mmap_pagesize(), David Hildenbrand, 2020/02/24
- Re: [PATCH v2 fixed 08/16] util/mmap-alloc: Factor out calculation of pagesize to mmap_pagesize(), David Hildenbrand, 2020/02/24
- Re: [PATCH v2 fixed 08/16] util/mmap-alloc: Factor out calculation of pagesize to mmap_pagesize(), Murilo Opsfelder Araújo, 2020/02/24
- Re: [PATCH v2 fixed 08/16] util/mmap-alloc: Factor out calculation of pagesize to mmap_pagesize(), Murilo Opsfelder Araújo, 2020/02/24
- Re: [PATCH v2 fixed 08/16] util/mmap-alloc: Factor out calculation of pagesize to mmap_pagesize(), David Hildenbrand, 2020/02/24
- Re: [PATCH v2 fixed 08/16] util/mmap-alloc: Factor out calculation of pagesize to mmap_pagesize(), Peter Xu, 2020/02/24
- Re: [PATCH v2 fixed 08/16] util/mmap-alloc: Factor out calculation of pagesize to mmap_pagesize(), David Hildenbrand, 2020/02/24
[PATCH v2 fixed 09/16] util/mmap-alloc: Factor out reserving of a memory region to mmap_reserve(),
David Hildenbrand <=
[PATCH v2 fixed 10/16] util/mmap-alloc: Factor out populating of memory to mmap_populate(), David Hildenbrand, 2020/02/12
[PATCH v2 fixed 11/16] util/mmap-alloc: Prepare for resizable mmaps, David Hildenbrand, 2020/02/12
[PATCH v2 fixed 12/16] util/mmap-alloc: Implement resizable mmaps, David Hildenbrand, 2020/02/12
[PATCH v2 fixed 13/16] numa: Teach ram block notifiers about resizable ram blocks, David Hildenbrand, 2020/02/12