commit b013b5d1f32ef88457e66c7ce576f6475238f97f
author Juan Quintela <quintela@redhat.com> Tue Apr 11 17:36:48 2023 +0200
committer Juan Quintela <quintela@redhat.com> Mon Apr 24 11:28:58 2023 +0200
tree 374cf44c9a514e71fe5cd33650b8c646f45adf41
parent 4291823694fd8507831d26e2558d9cd0030841f7

migration: Make precopy_bytes atomic

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>

migration/migration.c

diff --git a/migration/migration.c b/migration/migration.c
index 66e5197..cbd6f6f 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1155,7 +1155,7 @@
     info->ram->page_size = page_size;
     info->ram->multifd_bytes = stat64_get(&ram_counters.multifd_bytes);
     info->ram->pages_per_second = s->pages_per_second;
-    info->ram->precopy_bytes = ram_counters.precopy_bytes;
+    info->ram->precopy_bytes = stat64_get(&ram_counters.precopy_bytes);
     info->ram->downtime_bytes = ram_counters.downtime_bytes;
     info->ram->postcopy_bytes = stat64_get(&ram_counters.postcopy_bytes);
 

migration/ram.c

diff --git a/migration/ram.c b/migration/ram.c
index 93e0a48..0b46932 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -463,7 +463,7 @@
 void ram_transferred_add(uint64_t bytes)
 {
     if (runstate_is_running()) {
-        ram_counters.precopy_bytes += bytes;
+        stat64_add(&ram_counters.precopy_bytes, bytes);
     } else if (migration_in_postcopy()) {
         stat64_add(&ram_counters.postcopy_bytes, bytes);
     } else {

migration/ram.h

diff --git a/migration/ram.h b/migration/ram.h
index 2170c55..a766b89 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -50,7 +50,7 @@
     Stat64 normal;
     Stat64 postcopy_bytes;
     int64_t postcopy_requests;
-    uint64_t precopy_bytes;
+    Stat64 precopy_bytes;
     int64_t remaining;
     Stat64 transferred;
 } RAMStats;