[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/9 V5] migration/ram: ensure write persistence on l
From: |
junyan . he |
Subject: |
[Qemu-devel] [PATCH 7/9 V5] migration/ram: ensure write persistence on loading compressed pages to PMEM |
Date: |
Thu, 10 May 2018 10:08:56 +0800 |
From: Junyan He <address@hidden>
When loading a compressed page to persistent memory, flush CPU cache
after the data is decompressed. Combined with a call to pmem_drain()
at the end of memory loading, we can guarantee those compressed pages
are persistently loaded to PMEM.
Signed-off-by: Haozhong Zhang <address@hidden>
---
include/qemu/pmem.h | 1 +
migration/ram.c | 10 ++++++++--
stubs/pmem.c | 4 ++++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/include/qemu/pmem.h b/include/qemu/pmem.h
index cb9fa5f..c9140fb 100644
--- a/include/qemu/pmem.h
+++ b/include/qemu/pmem.h
@@ -20,6 +20,7 @@ void *pmem_memcpy_nodrain(void *pmemdest, const void *src,
size_t len);
void *pmem_memcpy_persist(void *pmemdest, const void *src, size_t len);
void *pmem_memset_nodrain(void *pmemdest, int c, size_t len);
void pmem_drain(void);
+void pmem_flush(const void *addr, size_t len);
#endif /* CONFIG_LIBPMEM */
diff --git a/migration/ram.c b/migration/ram.c
index 2a180bc..e0f3dbc 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -286,6 +286,7 @@ struct DecompressParam {
uint8_t *compbuf;
int len;
z_stream stream;
+ bool is_pmem;
};
typedef struct DecompressParam DecompressParam;
@@ -2591,6 +2592,9 @@ static void *do_data_decompress(void *opaque)
error_report("decompress data failed");
qemu_file_set_error(decomp_file, ret);
}
+ if (param->is_pmem) {
+ pmem_flush(des, len);
+ }
qemu_mutex_lock(&decomp_done_lock);
param->done = true;
@@ -2702,7 +2706,8 @@ exit:
}
static void decompress_data_with_multi_threads(QEMUFile *f,
- void *host, int len)
+ void *host, int len,
+ bool is_pmem)
{
int idx, thread_count;
@@ -2716,6 +2721,7 @@ static void decompress_data_with_multi_threads(QEMUFile
*f,
qemu_get_buffer(f, decomp_param[idx].compbuf, len);
decomp_param[idx].des = host;
decomp_param[idx].len = len;
+ decomp_param[idx].is_pmem = is_pmem;
qemu_cond_signal(&decomp_param[idx].cond);
qemu_mutex_unlock(&decomp_param[idx].mutex);
break;
@@ -3073,7 +3079,7 @@ static int ram_load(QEMUFile *f, void *opaque, int
version_id)
ret = -EINVAL;
break;
}
- decompress_data_with_multi_threads(f, host, len);
+ decompress_data_with_multi_threads(f, host, len, is_pmem);
break;
case RAM_SAVE_FLAG_XBZRLE:
diff --git a/stubs/pmem.c b/stubs/pmem.c
index b50c35e..9e7d86a 100644
--- a/stubs/pmem.c
+++ b/stubs/pmem.c
@@ -31,3 +31,7 @@ void *pmem_memcpy_nodrain(void *pmemdest, const void *src,
size_t len)
{
return memcpy(pmemdest, src, len);
}
+
+void pmem_flush(const void *addr, size_t len)
+{
+}
--
2.7.4
- Re: [Qemu-devel] [PATCH 1/9 V5] memory, exec: switch file ram allocation functions to 'flags' parameters, (continued)
- [Qemu-devel] [PATCH 2/9 V5] hostmem-file: add the 'pmem' option, junyan . he, 2018/05/09
- [Qemu-devel] [PATCH 3/9 V5] configure: add libpmem support, junyan . he, 2018/05/09
- [Qemu-devel] [PATCH 4/9 V5] mem/nvdimm: ensure write persistence to PMEM in label emulation, junyan . he, 2018/05/09
- [Qemu-devel] [PATCH 5/9 V5] migration/ram: ensure write persistence on loading zero pages to PMEM, junyan . he, 2018/05/09
- [Qemu-devel] [PATCH 6/9 V5] migration/ram: ensure write persistence on loading normal pages to PMEM, junyan . he, 2018/05/09
- [Qemu-devel] [PATCH 7/9 V5] migration/ram: ensure write persistence on loading compressed pages to PMEM,
junyan . he <=
- [Qemu-devel] [PATCH 8/9 V5] migration/ram: ensure write persistence on loading xbzrle pages to PMEM, junyan . he, 2018/05/09
- [Qemu-devel] [PATCH 9/9 V5] migration/ram: Add check and info message to nvdimm post copy., junyan . he, 2018/05/09
- Re: [Qemu-devel] [PATCH V5 0/9] nvdimm: guarantee persistence of QEMU writes to persistent memory, He, Junyan, 2018/05/09
- Re: [Qemu-devel] [PATCH V5 0/9] nvdimm: guarantee persistence of QEMU writes to persistent memory, no-reply, 2018/05/10
- Re: [Qemu-devel] [PATCH V5 0/9] nvdimm: guarantee persistence of QEMU writes to persistent memory, Junyan He, 2018/05/20
- Re: [Qemu-devel] [PATCH V5 0/9] nvdimm: guarantee persistence of QEMU writes to persistent memory, Stefan Hajnoczi, 2018/05/31