@@ -311,8 +311,12 @@ int qemu_daemon(int nochdir, int noclose);
void *qemu_try_memalign(size_t alignment, size_t size);
void *qemu_memalign(size_t alignment, size_t size);
void *qemu_anon_ram_alloc(size_t size, uint64_t *align, bool shared);
+void *qemu_anon_ram_alloc_resizable(size_t size, size_t max_size,
+ uint64_t *align, bool shared);
+bool qemu_anon_ram_resize(void *ptr, size_t old_size, size_t new_size,
+ bool shared);
void qemu_vfree(void *ptr);
-void qemu_anon_ram_free(void *ptr, size_t size);
+void qemu_anon_ram_free(void *ptr, size_t max_size);
#define QEMU_MADV_INVALID -1
@@ -219,16 +219,47 @@ void *qemu_anon_ram_alloc(size_t size, uint64_t *alignment, bool shared)
return ptr;
}
+void *qemu_anon_ram_alloc_resizable(size_t size, size_t max_size,
+ uint64_t *alignment, bool shared)
+{
+ size_t align = QEMU_VMALLOC_ALIGN;
+ void *ptr = qemu_ram_mmap_resizable(-1, size, max_size, align, shared,
+ false);
+
+ if (ptr == MAP_FAILED) {
+ return NULL;
+ }
+
+ if (alignment) {
+ *alignment = align;
+ }
+
+ trace_qemu_anon_ram_alloc_resizable(size, max_size, ptr);
+ return ptr;
+}
+
+bool qemu_anon_ram_resize(void *ptr, size_t old_size, size_t new_size,
+ bool shared)
+{
+ bool resized = qemu_ram_mmap_resize(ptr, -1, old_size, new_size, shared,
+ false);
+
+ if (resized) {
+ trace_qemu_anon_ram_resize(old_size, new_size, ptr);
+ }
+ return resized;
+}
+
void qemu_vfree(void *ptr)
{
trace_qemu_vfree(ptr);
free(ptr);
}
-void qemu_anon_ram_free(void *ptr, size_t size)
+void qemu_anon_ram_free(void *ptr, size_t max_size)
{
- trace_qemu_anon_ram_free(ptr, size);
- qemu_ram_munmap(-1, ptr, size);
+ trace_qemu_anon_ram_free(ptr, max_size);
+ qemu_ram_munmap(-1, ptr, max_size);
}
void qemu_set_block(int fd)
@@ -90,6 +90,20 @@ void *qemu_anon_ram_alloc(size_t size, uint64_t *align, bool shared)
return ptr;
}
+void *qemu_anon_ram_alloc_resizable(size_t size, size_t max_size,
+ uint64_t *align, bool shared)
+{
+ /* resizable ram not implemented yet */
+ return NULL;
+}
+
+bool qemu_anon_ram_resize(void *ptr, size_t old_size, size_t new_size,
+ bool shared)
+{
+ /* resizable ram not implemented yet */
+ return false;
+}
+
void qemu_vfree(void *ptr)
{
trace_qemu_vfree(ptr);
@@ -46,8 +46,10 @@ qemu_co_mutex_unlock_return(void *mutex, void *self) "mutex %p self %p"
# oslib-posix.c
qemu_memalign(size_t alignment, size_t size, void *ptr) "alignment %zu size %zu ptr %p"
qemu_anon_ram_alloc(size_t size, void *ptr) "size %zu ptr %p"
+qemu_anon_ram_alloc_resizable(size_t size, size_t max_size, void *ptr) "size %zu max_size %zu ptr %p"
+qemu_anon_ram_resize(size_t old_size, size_t new_size, void *ptr) "old_size %zu new_size %zu ptr %p"
qemu_vfree(void *ptr) "ptr %p"
-qemu_anon_ram_free(void *ptr, size_t size) "ptr %p size %zu"
+qemu_anon_ram_free(void *ptr, size_t max_size) "ptr %p max_size %zu"
# hbitmap.c
hbitmap_iter_skip_words(const void *hb, void *hbi, uint64_t pos, unsigned long cur) "hb %p hbi %p pos %"PRId64" cur 0x%lx"
Introduce qemu_anon_ram_alloc_resizable() and qemu_anon_ram_resize(). Implement them under POSIX and make them return NULL under WIN32. Under POSIX, we make use of resizable mmaps. An implementation under WIN32 is theoretically possible AFAIK and can be added later. In qemu_anon_ram_free(), rename the size parameter to max_size, to make it clearer that we have to use the maximum size when freeing resizable anonymous allocations. Cc: Richard Henderson <rth@twiddle.net> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com> Cc: Eduardo Habkost <ehabkost@redhat.com> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> Cc: Stefan Weil <sw@weilnetz.de> Cc: Igor Mammedov <imammedo@redhat.com> Signed-off-by: David Hildenbrand <david@redhat.com> --- include/qemu/osdep.h | 6 +++++- util/oslib-posix.c | 37 ++++++++++++++++++++++++++++++++++--- util/oslib-win32.c | 14 ++++++++++++++ util/trace-events | 4 +++- 4 files changed, 56 insertions(+), 5 deletions(-)