From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnajB-0008J7-7I for qemu-devel@nongnu.org; Fri, 14 Jun 2013 16:36:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Unaj6-0000yE-CN for qemu-devel@nongnu.org; Fri, 14 Jun 2013 16:36:09 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:51987) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Unaj6-0000xx-8n for qemu-devel@nongnu.org; Fri, 14 Jun 2013 16:36:04 -0400 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 14 Jun 2013 16:36:04 -0400 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 6B875C9006F for ; Fri, 14 Jun 2013 16:35:56 -0400 (EDT) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5EKZuHS61800486 for ; Fri, 14 Jun 2013 16:35:56 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5EKZtgD013482 for ; Fri, 14 Jun 2013 16:35:56 -0400 From: mrhines@linux.vnet.ibm.com Date: Fri, 14 Jun 2013 16:35:46 -0400 Message-Id: <1371242153-11262-8-git-send-email-mrhines@linux.vnet.ibm.com> In-Reply-To: <1371242153-11262-1-git-send-email-mrhines@linux.vnet.ibm.com> References: <1371242153-11262-1-git-send-email-mrhines@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v9 07/14] rdma: introduce ram_handle_compressed() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, quintela@redhat.com, knoel@redhat.com, owasserm@redhat.com, abali@us.ibm.com, mrhines@us.ibm.com, gokul@us.ibm.com, pbonzini@redhat.com, chegu_vinod@hp.com From: "Michael R. Hines" This gives RDMA shared access to madvise() on the destination side when an entire chunk is found to be zero. Reviewed-by: Paolo Bonzini Signed-off-by: Michael R. Hines --- arch_init.c | 24 ++++++++++++++++-------- include/migration/migration.h | 2 ++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/arch_init.c b/arch_init.c index 819ca5a..2f1fdd3 100644 --- a/arch_init.c +++ b/arch_init.c @@ -782,6 +782,21 @@ 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) +{ + memset(host, ch, TARGET_PAGE_SIZE); +#ifndef _WIN32 + if (ch == 0 && (!kvm_enabled() || kvm_has_sync_mmu()) && + getpagesize() <= TARGET_PAGE_SIZE) { + qemu_madvise(host, size, QEMU_MADV_DONTNEED); + } +#endif +} + static int ram_load(QEMUFile *f, void *opaque, int version_id) { ram_addr_t addr; @@ -849,14 +864,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) } ch = qemu_get_byte(f); - 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 1eeaa40..110f4ad 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -108,6 +108,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 * -- 1.7.10.4