From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: Eduardo Habkost <ehabkost@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
Igor Kotrasinski <i.kotrasinsk@partner.samsung.com>,
David Hildenbrand <david@redhat.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
Peter Xu <peterx@redhat.com>, Greg Kurz <groug@kaod.org>,
Murilo Opsfelder Araujo <muriloo@linux.ibm.com>,
Igor Mammedov <imammedo@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: [PATCH v4 11/15] util/mmap-alloc: Implement resizeable mmaps
Date: Thu, 5 Mar 2020 15:29:41 +0100 [thread overview]
Message-ID: <20200305142945.216465-12-david@redhat.com> (raw)
In-Reply-To: <20200305142945.216465-1-david@redhat.com>
Implement resizeable mmaps. For now, the actual resizing is not wired up.
Introduce qemu_ram_mmap_resizeable() and qemu_ram_mmap_resize(). Make
qemu_ram_mmap() a wrapper of qemu_ram_mmap_resizeable().
Reviewed-by: Peter Xu <peterx@redhat.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Igor Kotrasinski <i.kotrasinsk@partner.samsung.com>
Cc: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Greg Kurz <groug@kaod.org>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
include/qemu/mmap-alloc.h | 21 +++++++++++--------
util/mmap-alloc.c | 43 ++++++++++++++++++++++++++++-----------
2 files changed, 44 insertions(+), 20 deletions(-)
diff --git a/include/qemu/mmap-alloc.h b/include/qemu/mmap-alloc.h
index e786266b92..ca8f7edf70 100644
--- a/include/qemu/mmap-alloc.h
+++ b/include/qemu/mmap-alloc.h
@@ -7,11 +7,13 @@ size_t qemu_fd_getpagesize(int fd);
size_t qemu_mempath_getpagesize(const char *mem_path);
/**
- * qemu_ram_mmap: mmap the specified file or device.
+ * qemu_ram_mmap_resizeable: reserve a memory region of @max_size to mmap the
+ * specified file or device and mmap @size of it.
*
* Parameters:
* @fd: the file or the device to mmap
* @size: the number of bytes to be mmaped
+ * @max_size: the number of bytes to be reserved
* @align: if not zero, specify the alignment of the starting mapping address;
* otherwise, the alignment in use will be determined by QEMU.
* @shared: map has RAM_SHARED flag.
@@ -21,12 +23,15 @@ size_t qemu_mempath_getpagesize(const char *mem_path);
* On success, return a pointer to the mapped area.
* On failure, return MAP_FAILED.
*/
-void *qemu_ram_mmap(int fd,
- size_t size,
- size_t align,
- bool shared,
- bool is_pmem);
-
-void qemu_ram_munmap(int fd, void *ptr, size_t size);
+void *qemu_ram_mmap_resizeable(int fd, size_t size, size_t max_size,
+ size_t align, bool shared, bool is_pmem);
+bool qemu_ram_mmap_resize(void *ptr, int fd, size_t old_size, size_t new_size,
+ bool shared, bool is_pmem);
+static inline void *qemu_ram_mmap(int fd, size_t size, size_t align,
+ bool shared, bool is_pmem)
+{
+ return qemu_ram_mmap_resizeable(fd, size, size, align, shared, is_pmem);
+}
+void qemu_ram_munmap(int fd, void *ptr, size_t max_size);
#endif
diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
index 2767caa33b..7ed85f16d3 100644
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@@ -174,11 +174,8 @@ static inline size_t mmap_guard_pagesize(int fd)
#endif
}
-void *qemu_ram_mmap(int fd,
- size_t size,
- size_t align,
- bool shared,
- bool is_pmem)
+void *qemu_ram_mmap_resizeable(int fd, size_t size, size_t max_size,
+ size_t align, bool shared, bool is_pmem)
{
const size_t guard_pagesize = mmap_guard_pagesize(fd);
const size_t pagesize = qemu_fd_getpagesize(fd);
@@ -186,12 +183,14 @@ void *qemu_ram_mmap(int fd,
void *ptr, *guardptr;
g_assert(QEMU_IS_ALIGNED(size, pagesize));
+ g_assert(QEMU_IS_ALIGNED(max_size, pagesize));
/*
* Note: this always allocates at least one extra page of virtual address
- * space, even if size is already aligned.
+ * space, even if the size is already aligned. We will reserve an area of
+ * at least max_size, but only activate the requested part of it.
*/
- total = size + align;
+ total = max_size + align;
guardptr = mmap_reserve(NULL, total, fd);
if (guardptr == MAP_FAILED) {
@@ -219,21 +218,41 @@ void *qemu_ram_mmap(int fd,
* a guard page guarding against potential buffer overflows.
*/
total -= offset;
- if (total > size + guard_pagesize) {
- munmap(ptr + size + guard_pagesize, total - size - guard_pagesize);
+ if (total > max_size + guard_pagesize) {
+ munmap(ptr + max_size + guard_pagesize,
+ total - max_size - guard_pagesize);
}
return ptr;
}
-void qemu_ram_munmap(int fd, void *ptr, size_t size)
+bool qemu_ram_mmap_resize(void *ptr, int fd, size_t old_size, size_t new_size,
+ bool shared, bool is_pmem)
{
const size_t pagesize = qemu_fd_getpagesize(fd);
- g_assert(QEMU_IS_ALIGNED(size, pagesize));
+ g_assert(QEMU_IS_ALIGNED(old_size, pagesize));
+ g_assert(QEMU_IS_ALIGNED(new_size, pagesize));
+
+ if (old_size < new_size) {
+ /* activate the missing piece in the reserved area */
+ ptr = mmap_activate(ptr + old_size, new_size - old_size, fd, old_size,
+ shared, is_pmem);
+ } else if (old_size > new_size) {
+ /* discard this piece, marking it reserved */
+ ptr = mmap_reserve(ptr + new_size, old_size - new_size, fd);
+ }
+ return ptr != MAP_FAILED;
+}
+
+void qemu_ram_munmap(int fd, void *ptr, size_t max_size)
+{
+ const size_t pagesize = qemu_fd_getpagesize(fd);
+
+ g_assert(QEMU_IS_ALIGNED(max_size, pagesize));
if (ptr) {
/* Unmap both the RAM block and the guard page */
- munmap(ptr, size + mmap_guard_pagesize(fd));
+ munmap(ptr, max_size + mmap_guard_pagesize(fd));
}
}
--
2.24.1
next prev parent reply other threads:[~2020-03-05 14:35 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 14:29 [PATCH v4 00/15] Ram blocks with resizeable anonymous allocations under POSIX David Hildenbrand
2020-03-05 14:29 ` [PATCH v4 01/15] util: vfio-helpers: Fix qemu_vfio_close() David Hildenbrand
2020-04-17 10:22 ` Philippe Mathieu-Daudé
2020-03-05 14:29 ` [PATCH v4 02/15] util: vfio-helpers: Remove Error parameter from qemu_vfio_undo_mapping() David Hildenbrand
2020-03-25 14:32 ` Murilo Opsfelder Araújo
2020-03-05 14:29 ` [PATCH v4 03/15] util: vfio-helpers: Factor out removal " David Hildenbrand
2020-03-25 14:45 ` Murilo Opsfelder Araújo
2020-03-05 14:29 ` [PATCH v4 04/15] exec: Factor out setting ram settings (madvise ...) into qemu_ram_apply_settings() David Hildenbrand
2020-03-05 14:29 ` [PATCH v4 05/15] exec: Reuse qemu_ram_apply_settings() in qemu_ram_remap() David Hildenbrand
2020-03-05 14:29 ` [PATCH v4 06/15] exec: Drop "shared" parameter from ram_block_add() David Hildenbrand
2020-03-05 14:29 ` [PATCH v4 07/15] util/mmap-alloc: Factor out calculation of the pagesize for the guard page David Hildenbrand
2020-03-25 15:03 ` Murilo Opsfelder Araújo
2020-03-05 14:29 ` [PATCH v4 08/15] util/mmap-alloc: Factor out reserving of a memory region to mmap_reserve() David Hildenbrand
2020-03-05 14:29 ` [PATCH v4 09/15] util/mmap-alloc: Factor out activating of memory to mmap_activate() David Hildenbrand
2020-03-05 14:29 ` [PATCH v4 10/15] util/mmap-alloc: Prepare for resizeable mmaps David Hildenbrand
2020-03-25 15:09 ` Murilo Opsfelder Araújo
2020-03-05 14:29 ` David Hildenbrand [this message]
2020-03-25 15:14 ` [PATCH v4 11/15] util/mmap-alloc: Implement " Murilo Opsfelder Araújo
2020-03-05 14:29 ` [PATCH v4 12/15] util: vfio-helpers: Implement ram_block_resized() David Hildenbrand
2020-03-25 15:17 ` Murilo Opsfelder Araújo
2020-03-05 14:29 ` [PATCH v4 13/15] util: oslib: Resizeable anonymous allocations under POSIX David Hildenbrand
2020-03-25 15:20 ` Murilo Opsfelder Araújo
2020-03-05 14:29 ` [PATCH v4 14/15] numa: Introduce ram_block_notifiers_support_resize() David Hildenbrand
2020-03-25 15:24 ` Murilo Opsfelder Araújo
2020-03-05 14:29 ` [PATCH v4 15/15] exec: Ram blocks with resizeable anonymous allocations under POSIX David Hildenbrand
2020-03-25 15:34 ` Murilo Opsfelder Araújo
2020-03-27 11:24 ` David Hildenbrand
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=20200305142945.216465-12-david@redhat.com \
--to=david@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=groug@kaod.org \
--cc=i.kotrasinsk@partner.samsung.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=muriloo@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=rth@twiddle.net \
/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).