diff options
| author | Michael R. Hines <mrhines@us.ibm.com> | 2013-07-22 10:01:53 -0400 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2013-07-23 11:11:59 +0200 |
| commit | 44c3b58cf9b2c91a38363f0b45d20f3f40b8f2b3 (patch) | |
| tree | 21cfc9a8daeaa59a0c8683b12a70d5050a332dff | |
| parent | de7b685c9e1cf606e37e7116e4c4f03a6ae2d14f (diff) | |
rdma: introduce ram_handle_compressed()
This gives RDMA shared access to madvise() on the destination side
when an entire chunk is found to be zero.
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Chegu Vinod <chegu_vinod@hp.com>
Tested-by: Chegu Vinod <chegu_vinod@hp.com>
Tested-by: Michael R. Hines <mrhines@us.ibm.com>
Signed-off-by: Michael R. Hines <mrhines@us.ibm.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | arch_init.c | 29 | ||||
| -rw-r--r-- | include/migration/migration.h | 2 |
2 files changed, 21 insertions, 10 deletions
diff --git a/arch_init.c b/arch_init.c index e9dd96fb28..09a712528e 100644 --- a/arch_init.c +++ b/arch_init.c @@ -808,6 +808,24 @@ static inline void *host_from_stream_offset(QEMUFile *f, return NULL; } +/* + * If a page (or a whole RDMA chunk) has been + * determined to be zero, then zap it. + */ +void ram_handle_compressed(void *host, uint8_t ch, uint64_t size) +{ + if (ch != 0 || !is_zero_page(host)) { + memset(host, ch, size); +#ifndef _WIN32 + if (ch == 0 && + (!kvm_enabled() || kvm_has_sync_mmu()) && + getpagesize() <= TARGET_PAGE_SIZE) { + qemu_madvise(host, TARGET_PAGE_SIZE, QEMU_MADV_DONTNEED); + } +#endif + } +} + static int ram_load(QEMUFile *f, void *opaque, int version_id) { ram_addr_t addr; @@ -879,16 +897,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) } ch = qemu_get_byte(f); - if (ch != 0 || !is_zero_page(host)) { - memset(host, ch, TARGET_PAGE_SIZE); -#ifndef _WIN32 - if (ch == 0 && - (!kvm_enabled() || kvm_has_sync_mmu()) && - getpagesize() <= TARGET_PAGE_SIZE) { - qemu_madvise(host, TARGET_PAGE_SIZE, QEMU_MADV_DONTNEED); - } -#endif - } + ram_handle_compressed(host, ch, TARGET_PAGE_SIZE); } else if (flags & RAM_SAVE_FLAG_PAGE) { void *host; diff --git a/include/migration/migration.h b/include/migration/migration.h index 701709a1e9..90b5021bd2 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -109,6 +109,8 @@ uint64_t xbzrle_mig_pages_transferred(void); uint64_t xbzrle_mig_pages_overflow(void); uint64_t xbzrle_mig_pages_cache_miss(void); +void ram_handle_compressed(void *host, uint8_t ch, uint64_t size); + /** * @migrate_add_blocker - prevent migration from proceeding * |