From patchwork Fri Feb 16 08:46:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haozhong Zhang X-Patchwork-Id: 10224205 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2E92B60231 for ; Fri, 16 Feb 2018 08:56:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 23BD32906C for ; Fri, 16 Feb 2018 08:56:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 185892908E; Fri, 16 Feb 2018 08:56:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E37332906C for ; Fri, 16 Feb 2018 08:56:34 +0000 (UTC) Received: from localhost ([::1]:52814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emboo-0004AK-37 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 16 Feb 2018 03:56:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1embfs-0004YM-Jr for qemu-devel@nongnu.org; Fri, 16 Feb 2018 03:47:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1embfr-0001R4-El for qemu-devel@nongnu.org; Fri, 16 Feb 2018 03:47:20 -0500 Received: from mga17.intel.com ([192.55.52.151]:12665) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1embfr-0001Da-2z for qemu-devel@nongnu.org; Fri, 16 Feb 2018 03:47:19 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Feb 2018 00:47:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,519,1511856000"; d="scan'208";a="28535546" Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.13.35]) by orsmga003.jf.intel.com with ESMTP; 16 Feb 2018 00:47:16 -0800 From: Haozhong Zhang To: qemu-devel@nongnu.org Date: Fri, 16 Feb 2018 16:46:15 +0800 Message-Id: <20180216084615.26483-9-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180216084615.26483-1-haozhong.zhang@intel.com> References: <20180216084615.26483-1-haozhong.zhang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.151 Subject: [Qemu-devel] [PATCH v3 8/8] migration/ram: ensure write persistence on loading xbzrle pages to PMEM X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Haozhong Zhang , Xiao Guangrong , mst@redhat.com, Juan Quintela , dgilbert@redhat.com, Stefan Hajnoczi , Paolo Bonzini , Igor Mammedov , Dan Williams , Eduardo Habkost Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP When loading a xbzrle encoded page to persistent memory, load the data via libpmem function pmem_memcpy_nodrain() instead of memcpy(). Combined with a call to pmem_drain() at the end of memory loading, we can guarantee those xbzrle encoded pages are persistently loaded to PMEM. Signed-off-by: Haozhong Zhang --- migration/ram.c | 6 +++--- migration/xbzrle.c | 8 ++++++-- migration/xbzrle.h | 3 ++- tests/Makefile.include | 2 +- tests/test-xbzrle.c | 4 ++-- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 140f6886df..100083287c 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2389,7 +2389,7 @@ static void ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size, } } -static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host) +static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host, bool is_pmem) { unsigned int xh_len; int xh_flags; @@ -2415,7 +2415,7 @@ static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host) /* decode RLE */ if (xbzrle_decode_buffer(loaded_data, xh_len, host, - TARGET_PAGE_SIZE) == -1) { + TARGET_PAGE_SIZE, is_pmem) == -1) { error_report("Failed to load XBZRLE page - decode error!"); return -1; } @@ -2964,7 +2964,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) break; case RAM_SAVE_FLAG_XBZRLE: - if (load_xbzrle(f, addr, host) < 0) { + if (load_xbzrle(f, addr, host, is_pmem) < 0) { error_report("Failed to decompress XBZRLE page at " RAM_ADDR_FMT, addr); ret = -EINVAL; diff --git a/migration/xbzrle.c b/migration/xbzrle.c index 1ba482ded9..ca713c3697 100644 --- a/migration/xbzrle.c +++ b/migration/xbzrle.c @@ -12,6 +12,7 @@ */ #include "qemu/osdep.h" #include "qemu/cutils.h" +#include "qemu/pmem.h" #include "xbzrle.h" /* @@ -126,11 +127,14 @@ int xbzrle_encode_buffer(uint8_t *old_buf, uint8_t *new_buf, int slen, return d; } -int xbzrle_decode_buffer(uint8_t *src, int slen, uint8_t *dst, int dlen) +int xbzrle_decode_buffer(uint8_t *src, int slen, uint8_t *dst, int dlen, + bool is_pmem) { int i = 0, d = 0; int ret; uint32_t count = 0; + void *(*memcpy_func)(void *d, const void *s, size_t n) = + is_pmem ? pmem_memcpy_nodrain : memcpy; while (i < slen) { @@ -167,7 +171,7 @@ int xbzrle_decode_buffer(uint8_t *src, int slen, uint8_t *dst, int dlen) return -1; } - memcpy(dst + d, src + i, count); + memcpy_func(dst + d, src + i, count); d += count; i += count; } diff --git a/migration/xbzrle.h b/migration/xbzrle.h index a0db507b9c..f18f679f47 100644 --- a/migration/xbzrle.h +++ b/migration/xbzrle.h @@ -17,5 +17,6 @@ int xbzrle_encode_buffer(uint8_t *old_buf, uint8_t *new_buf, int slen, uint8_t *dst, int dlen); -int xbzrle_decode_buffer(uint8_t *src, int slen, uint8_t *dst, int dlen); +int xbzrle_decode_buffer(uint8_t *src, int slen, uint8_t *dst, int dlen, + bool is_pmem); #endif diff --git a/tests/Makefile.include b/tests/Makefile.include index 9ffb0cf8eb..1005195cdc 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -616,7 +616,7 @@ tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(test-block-obj-y) tests/test-iov$(EXESUF): tests/test-iov.o $(test-util-obj-y) tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o $(test-util-obj-y) $(test-crypto-obj-y) tests/test-x86-cpuid$(EXESUF): tests/test-x86-cpuid.o -tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/xbzrle.o migration/page_cache.o $(test-util-obj-y) +tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/xbzrle.o migration/page_cache.o stubs/pmem.o $(test-util-obj-y) tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.o $(test-util-obj-y) tests/test-int128$(EXESUF): tests/test-int128.o tests/rcutorture$(EXESUF): tests/rcutorture.o $(test-util-obj-y) diff --git a/tests/test-xbzrle.c b/tests/test-xbzrle.c index f5e08de91e..9afa0c4bcb 100644 --- a/tests/test-xbzrle.c +++ b/tests/test-xbzrle.c @@ -101,7 +101,7 @@ static void test_encode_decode_1_byte(void) PAGE_SIZE); g_assert(dlen == (uleb128_encode_small(&buf[0], 4095) + 2)); - rc = xbzrle_decode_buffer(compressed, dlen, buffer, PAGE_SIZE); + rc = xbzrle_decode_buffer(compressed, dlen, buffer, PAGE_SIZE, false); g_assert(rc == PAGE_SIZE); g_assert(memcmp(test, buffer, PAGE_SIZE) == 0); @@ -156,7 +156,7 @@ static void encode_decode_range(void) dlen = xbzrle_encode_buffer(test, buffer, PAGE_SIZE, compressed, PAGE_SIZE); - rc = xbzrle_decode_buffer(compressed, dlen, test, PAGE_SIZE); + rc = xbzrle_decode_buffer(compressed, dlen, test, PAGE_SIZE, false); g_assert(rc < PAGE_SIZE); g_assert(memcmp(test, buffer, PAGE_SIZE) == 0);