[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 04/15] exec: Factor out setting ram settings (madvise ...) int
From: |
David Hildenbrand |
Subject: |
[PATCH v4 04/15] exec: Factor out setting ram settings (madvise ...) into qemu_ram_apply_settings() |
Date: |
Thu, 5 Mar 2020 15:29:34 +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.
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Cc: Richard Henderson <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Cc: Igor Mammedov <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
exec.c | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/exec.c b/exec.c
index 3e980e14e0..13a0ca91fb 100644
--- a/exec.c
+++ b/exec.c
@@ -2069,6 +2069,21 @@ 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
+ * Configure it unless the machine is a qtest server, in which case KVM is
+ * not used and it may be forked (eg for fuzzing purposes).
+ */
+ if (!qtest_enabled()) {
+ qemu_madvise(host, length, QEMU_MADV_DONTFORK);
+ }
+}
+
/*
* Resizing RAM while migrating can result in the migration being canceled.
* Care has to be taken if the guest might have already detected the memory.
@@ -2227,7 +2242,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);
}
}
@@ -2265,17 +2279,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
- * Configure it unless the machine is a qtest server, in which case
- * KVM is not used and it may be forked (eg for fuzzing purposes).
- */
- if (!qtest_enabled()) {
- 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->used_length,
new_block->max_length);
}
--
2.24.1
- [PATCH v4 00/15] Ram blocks with resizeable anonymous allocations under POSIX, David Hildenbrand, 2020/03/05
- [PATCH v4 01/15] util: vfio-helpers: Fix qemu_vfio_close(), David Hildenbrand, 2020/03/05
- [PATCH v4 02/15] util: vfio-helpers: Remove Error parameter from qemu_vfio_undo_mapping(), David Hildenbrand, 2020/03/05
- [PATCH v4 03/15] util: vfio-helpers: Factor out removal from qemu_vfio_undo_mapping(), David Hildenbrand, 2020/03/05
- [PATCH v4 05/15] exec: Reuse qemu_ram_apply_settings() in qemu_ram_remap(), David Hildenbrand, 2020/03/05
- [PATCH v4 04/15] exec: Factor out setting ram settings (madvise ...) into qemu_ram_apply_settings(),
David Hildenbrand <=
- [PATCH v4 08/15] util/mmap-alloc: Factor out reserving of a memory region to mmap_reserve(), David Hildenbrand, 2020/03/05
- [PATCH v4 06/15] exec: Drop "shared" parameter from ram_block_add(), David Hildenbrand, 2020/03/05
- [PATCH v4 09/15] util/mmap-alloc: Factor out activating of memory to mmap_activate(), David Hildenbrand, 2020/03/05
- [PATCH v4 10/15] util/mmap-alloc: Prepare for resizeable mmaps, David Hildenbrand, 2020/03/05
- [PATCH v4 11/15] util/mmap-alloc: Implement resizeable mmaps, David Hildenbrand, 2020/03/05
- [PATCH v4 07/15] util/mmap-alloc: Factor out calculation of the pagesize for the guard page, David Hildenbrand, 2020/03/05
- [PATCH v4 13/15] util: oslib: Resizeable anonymous allocations under POSIX, David Hildenbrand, 2020/03/05