From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frqjY-0001X3-NM for qemu-devel@nongnu.org; Mon, 20 Aug 2018 16:25:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frqjX-0000BR-Ra for qemu-devel@nongnu.org; Mon, 20 Aug 2018 16:25:04 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:40810 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1frqjW-00009h-Hf for qemu-devel@nongnu.org; Mon, 20 Aug 2018 16:25:02 -0400 Date: Mon, 20 Aug 2018 23:24:59 +0300 From: "Michael S. Tsirkin" Message-ID: <20180820104045.133968-8-mst@redhat.com> References: <20180820104045.133968-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180820104045.133968-1-mst@redhat.com> Subject: [Qemu-devel] [PULL 7/7] migration/ram: ensure write persistence on loading all data to PMEM. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Junyan He , Stefan Hajnoczi , Igor Mammedov , Juan Quintela , "Dr. David Alan Gilbert" From: Junyan He Because we need to make sure the pmem kind memory data is synced after migration, we choose to call pmem_persist() when the migration finish. This will make sure the data of pmem is safe and will not lose if power is off. Signed-off-by: Junyan He Reviewed-by: Stefan Hajnoczi Reviewed-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/qemu/pmem.h | 6 ++++++ migration/ram.c | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/include/qemu/pmem.h b/include/qemu/pmem.h index ebdb070210..dfb6d0da62 100644 --- a/include/qemu/pmem.h +++ b/include/qemu/pmem.h @@ -25,6 +25,12 @@ pmem_memcpy_persist(void *pmemdest, const void *src, size_t len) return NULL; } +static inline void +pmem_persist(const void *addr, size_t len) +{ + g_assert_not_reached(); +} + #endif /* CONFIG_LIBPMEM */ #endif /* !QEMU_PMEM_H */ diff --git a/migration/ram.c b/migration/ram.c index 5beefae7f5..fa79d0a5b9 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -33,6 +33,7 @@ #include "qemu/bitops.h" #include "qemu/bitmap.h" #include "qemu/main-loop.h" +#include "qemu/pmem.h" #include "xbzrle.h" #include "ram.h" #include "migration.h" @@ -3547,6 +3548,13 @@ static int ram_load_setup(QEMUFile *f, void *opaque) static int ram_load_cleanup(void *opaque) { RAMBlock *rb; + + RAMBLOCK_FOREACH_MIGRATABLE(rb) { + if (ramblock_is_pmem(rb)) { + pmem_persist(rb->host, rb->used_length); + } + } + xbzrle_load_cleanup(); compress_threads_load_cleanup(); -- MST