aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@web.de>2009-04-26 18:03:40 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-05-01 09:44:11 -0500
commit6f0437e8de95aebbd9e66af4d074c0d5119d86b7 (patch)
treed761a5e3bf4b2c4075415c3f880e65baf33856d8
parent8563d5b31d1b1b43f3304ba59535b6b878c15a2d (diff)
kvm: Avoid COW if KVM MMU is asynchronous
Avi Kivity wrote: > Suggest wrapping in a function and hiding it deep inside kvm-all.c. > Done in v2: ----------> If the KVM MMU is asynchronous (kernel does not support MMU_NOTIFIER), we have to avoid COW for the guest memory. Otherwise we risk serious breakage when guest pages change there physical locations due to COW after fork. Seen when forking smbd during runtime via -smb. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--exec.c3
-rw-r--r--kvm-all.c18
-rw-r--r--kvm.h2
3 files changed, 23 insertions, 0 deletions
diff --git a/exec.c b/exec.c
index 2effd04f62..c64938124b 100644
--- a/exec.c
+++ b/exec.c
@@ -2484,6 +2484,9 @@ ram_addr_t qemu_ram_alloc(ram_addr_t size)
last_ram_offset += size;
+ if (kvm_enabled())
+ kvm_setup_guest_memory(new_block->host, size);
+
return new_block->offset;
}
diff --git a/kvm-all.c b/kvm-all.c
index 0da5c7aa8d..36659a95e8 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -773,6 +773,24 @@ int kvm_has_sync_mmu(void)
return 0;
}
+void kvm_setup_guest_memory(void *start, size_t size)
+{
+ if (!kvm_has_sync_mmu()) {
+#ifdef MADV_DONTFORK
+ int ret = madvise(start, size, MADV_DONTFORK);
+
+ if (ret) {
+ perror("madvice");
+ exit(1);
+ }
+#else
+ fprintf(stderr,
+ "Need MADV_DONTFORK in absence of synchronous KVM MMU\n");
+ exit(1);
+#endif
+ }
+}
+
#ifdef KVM_CAP_SET_GUEST_DEBUG
struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *env,
target_ulong pc)
diff --git a/kvm.h b/kvm.h
index 803a874113..0ea24266be 100644
--- a/kvm.h
+++ b/kvm.h
@@ -48,6 +48,8 @@ int kvm_log_stop(target_phys_addr_t phys_addr, ram_addr_t size);
int kvm_has_sync_mmu(void);
+void kvm_setup_guest_memory(void *start, size_t size);
+
int kvm_coalesce_mmio_region(target_phys_addr_t start, ram_addr_t size);
int kvm_uncoalesce_mmio_region(target_phys_addr_t start, ram_addr_t size);