diff mbox

[V6,7/7] migration/ram: ensure write persistence on loading all data to PMEM.

Message ID 1527840629-18648-8-git-send-email-junyan.he@gmx.com (mailing list archive)
State New, archived
Headers show

Commit Message

junyan.he@gmx.com June 1, 2018, 8:10 a.m. UTC 
From: Junyan He <junyan.he@intel.com>

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 <junyan.he@intel.com>
---
 include/qemu/pmem.h | 1 +
 migration/ram.c     | 8 ++++++++
 stubs/pmem.c        | 4 ++++
 3 files changed, 13 insertions(+)

Comments

Stefan Hajnoczi June 5, 2018, 11:44 a.m. UTC | #1 
On Fri, Jun 01, 2018 at 04:10:29PM +0800, junyan.he@gmx.com wrote:
> diff --git a/migration/ram.c b/migration/ram.c
> index aa0c6f0..09525b2 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"
> @@ -3046,6 +3047,13 @@ static int ram_load_setup(QEMUFile *f, void *opaque)
>  static int ram_load_cleanup(void *opaque)
>  {
>      RAMBlock *rb;
> +
> +    RAMBLOCK_FOREACH(rb) {
> +        if (ramblock_is_pmem(rb)) {
> +            pmem_persist(rb->host, rb->used_length);
> +         }

Indentation is off.  This can be fixed by the maintainer who merges
these patches.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Dr. David Alan Gilbert June 7, 2018, 10:42 a.m. UTC | #2 
* Stefan Hajnoczi (stefanha@gmail.com) wrote:
> On Fri, Jun 01, 2018 at 04:10:29PM +0800, junyan.he@gmx.com wrote:
> > diff --git a/migration/ram.c b/migration/ram.c
> > index aa0c6f0..09525b2 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"
> > @@ -3046,6 +3047,13 @@ static int ram_load_setup(QEMUFile *f, void *opaque)
> >  static int ram_load_cleanup(void *opaque)
> >  {
> >      RAMBlock *rb;
> > +
> > +    RAMBLOCK_FOREACH(rb) {
> > +        if (ramblock_is_pmem(rb)) {
> > +            pmem_persist(rb->host, rb->used_length);
> > +         }
> 
> Indentation is off.  This can be fixed by the maintainer who merges
> these patches.
> 
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>


The other thing that needs a fixup for is RAMBLOCK_FOREACH_MIGRATABLE
that recently got merged.

Dave

--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff mbox

Patch

diff --git a/include/qemu/pmem.h b/include/qemu/pmem.h
index 00d6680..b1e1b5c 100644
--- a/include/qemu/pmem.h
+++ b/include/qemu/pmem.h
@@ -17,6 +17,7 @@ 
 #else  /* !CONFIG_LIBPMEM */
 
 void *pmem_memcpy_persist(void *pmemdest, const void *src, size_t len);
+void *pmem_persist(const void *addr, size_t len);
 
 #endif /* CONFIG_LIBPMEM */
 
diff --git a/migration/ram.c b/migration/ram.c
index aa0c6f0..09525b2 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"
@@ -3046,6 +3047,13 @@  static int ram_load_setup(QEMUFile *f, void *opaque)
 static int ram_load_cleanup(void *opaque)
 {
     RAMBlock *rb;
+
+    RAMBLOCK_FOREACH(rb) {
+        if (ramblock_is_pmem(rb)) {
+            pmem_persist(rb->host, rb->used_length);
+         }
+    }
+
     xbzrle_load_cleanup();
     compress_threads_load_cleanup();
 
diff --git a/stubs/pmem.c b/stubs/pmem.c
index b4ec72d..c5bc6d6 100644
--- a/stubs/pmem.c
+++ b/stubs/pmem.c
@@ -17,3 +17,7 @@  void *pmem_memcpy_persist(void *pmemdest, const void *src, size_t len)
 {
     return memcpy(pmemdest, src, len);
 }
+
+void *pmem_persist(const void *addr, size_t len)
+{
+}