[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 02/13] exec: Factor out setting ram settings (madvise ...) int
From: |
David Hildenbrand |
Subject: |
[PATCH v1 02/13] exec: Factor out setting ram settings (madvise ...) into qemu_ram_apply_settings() |
Date: |
Mon, 3 Feb 2020 19:31:14 +0100 |
Factor all settings out into qemu_ram_apply_settings().
For memory_try_enable_merging(), the important bit is that it won't be
called with XEN - which is now still the case as new_block->host will
remain NULL.
Cc: Richard Henderson <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
exec.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/exec.c b/exec.c
index 05cfe868ab..31a462a7d3 100644
--- a/exec.c
+++ b/exec.c
@@ -2121,6 +2121,15 @@ static int memory_try_enable_merging(void *addr, size_t
len)
return qemu_madvise(addr, len, QEMU_MADV_MERGEABLE);
}
+static void qemu_ram_apply_settings(void *host, size_t length)
+{
+ memory_try_enable_merging(host, length);
+ qemu_ram_setup_dump(host, length);
+ qemu_madvise(host, length, QEMU_MADV_HUGEPAGE);
+ /* MADV_DONTFORK is also needed by KVM in absence of synchronous MMU */
+ qemu_madvise(host, length, QEMU_MADV_DONTFORK);
+}
+
/* Only legal before guest might have detected the memory size: e.g. on
* incoming migration, or right after reset.
*
@@ -2271,7 +2280,6 @@ static void ram_block_add(RAMBlock *new_block, Error
**errp, bool shared)
qemu_mutex_unlock_ramlist();
return;
}
- memory_try_enable_merging(new_block->host, new_block->max_length);
}
}
@@ -2309,10 +2317,7 @@ static void ram_block_add(RAMBlock *new_block, Error
**errp, bool shared)
DIRTY_CLIENTS_ALL);
if (new_block->host) {
- qemu_ram_setup_dump(new_block->host, new_block->max_length);
- qemu_madvise(new_block->host, new_block->max_length,
QEMU_MADV_HUGEPAGE);
- /* MADV_DONTFORK is also needed by KVM in absence of synchronous MMU */
- qemu_madvise(new_block->host, new_block->max_length,
QEMU_MADV_DONTFORK);
+ qemu_ram_apply_settings(new_block->host, new_block->max_length);
ram_block_notify_add(new_block->host, new_block->max_length);
}
}
--
2.24.1
- [PATCH v1 00/13] Ram blocks with resizable anonymous allocations under POSIX, David Hildenbrand, 2020/02/03
- [PATCH v1 02/13] exec: Factor out setting ram settings (madvise ...) into qemu_ram_apply_settings(),
David Hildenbrand <=
- [PATCH v1 01/13] util: vfio-helpers: Factor out and fix processing of existings ram blocks, David Hildenbrand, 2020/02/03
- [PATCH v1 03/13] exec: Reuse qemu_ram_apply_settings() in qemu_ram_remap(), David Hildenbrand, 2020/02/03
- [PATCH v1 04/13] exec: Drop "shared" parameter from ram_block_add(), David Hildenbrand, 2020/02/03
- [PATCH v1 05/13] util/mmap-alloc: Factor out calculation of pagesize to mmap_pagesize(), David Hildenbrand, 2020/02/03
- [PATCH v1 07/13] util/mmap-alloc: Factor out populating of memory to mmap_populate(), David Hildenbrand, 2020/02/03