openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

migration: initialize RAM to zero 

Using qemu_memalign only leaves the RAM zero by chance, because libc
will usually use mmap to satisfy our huge requests.  But memory will
not be zero when using MALLOC_PERTURB_ with a nonzero value.  In the
case of incoming migration, this breaks a recently-introduced
invariant (commit f1c7279, migration: do not sent zero pages in
bulk stage, 2013-03-26).

To fix this, use mmap ourselves to get a well-aligned, always zero
block for the RAM.  Mmap-ed memory is easy to "trim" at the sides.

This also removes the need to do something special on valgrind
(see commit c2a8238a, Support running QEMU on Valgrind, 2011-10-31),
thus effectively reverts that patch.

Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1365522223-20153-1-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2013-04-09 17:43:43 +02:00 committed by Anthony Liguori
parent 86c7dba0d0
commit 7dda5dc82a
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
util/oslib-posix.c
View File

@ -40,7 +40,6 @@ extern int daemon(int, int);
Valgrind does not support alignments larger than 1 MiB, Valgrind does not support alignments larger than 1 MiB,
therefore we need special code which handles running on Valgrind. */ therefore we need special code which handles running on Valgrind. */
# define QEMU_VMALLOC_ALIGN (512 * 4096) # define QEMU_VMALLOC_ALIGN (512 * 4096)
# define CONFIG_VALGRIND
#elif defined(__linux__) && defined(__s390x__) #elif defined(__linux__) && defined(__s390x__)
/* Use 1 MiB (segment size) alignment so gmap can be used by KVM. */ /* Use 1 MiB (segment size) alignment so gmap can be used by KVM. */
# define QEMU_VMALLOC_ALIGN (256 * 4096) # define QEMU_VMALLOC_ALIGN (256 * 4096)
@ -52,12 +51,8 @@ extern int daemon(int, int);
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "trace.h" #include "trace.h"
#include "qemu/sockets.h" #include "qemu/sockets.h"
#include <sys/mman.h>
#if defined(CONFIG_VALGRIND)
static int running_on_valgrind = -1;
#else
# define running_on_valgrind 0
#endif
#ifdef CONFIG_LINUX #ifdef CONFIG_LINUX
#include <sys/syscall.h> #include <sys/syscall.h>
#endif #endif
@ -108,22 +103,28 @@ void *qemu_memalign(size_t alignment, size_t size)
/* alloc shared memory pages */ /* alloc shared memory pages */
void *qemu_vmalloc(size_t size) void *qemu_vmalloc(size_t size)
{ {
void *ptr;
size_t align = QEMU_VMALLOC_ALIGN; size_t align = QEMU_VMALLOC_ALIGN;
size_t total = size + align - getpagesize();
void *ptr = mmap(0, total, PROT_READ | PROT_WRITE,
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
size_t offset = QEMU_ALIGN_UP((uintptr_t)ptr, align) - (uintptr_t)ptr;
#if defined(CONFIG_VALGRIND) if (ptr == MAP_FAILED) {
if (running_on_valgrind < 0) { fprintf(stderr, "Failed to allocate %zu B: %s\n",
/* First call, test whether we are running on Valgrind. size, strerror(errno));
This is a substitute for RUNNING_ON_VALGRIND from valgrind.h. */ abort();
const char *ld = getenv("LD_PRELOAD");
running_on_valgrind = (ld != NULL && strstr(ld, "vgpreload"));
} }
#endif
if (size < align || running_on_valgrind) { ptr += offset;
align = getpagesize(); total -= offset;
if (offset > 0) {
munmap(ptr - offset, offset);
} }
ptr = qemu_memalign(align, size); if (total > size) {
munmap(ptr + size, total - size);
}
trace_qemu_vmalloc(size, ptr); trace_qemu_vmalloc(size, ptr);
return ptr; return ptr;
} }