[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/20] migration: Make dirty_sync_missed_zero_copy atomic
From: |
Juan Quintela |
Subject: |
[PULL 06/20] migration: Make dirty_sync_missed_zero_copy atomic |
Date: |
Thu, 20 Apr 2023 15:17:37 +0200 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
---
migration/migration.c | 2 +-
migration/multifd.c | 2 +-
migration/ram.c | 5 -----
migration/ram.h | 4 +---
4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index c3debe71f6..66e5197b77 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1150,7 +1150,7 @@ static void populate_ram_info(MigrationInfo *info,
MigrationState *s)
info->ram->mbps = s->mbps;
info->ram->dirty_sync_count = ram_counters.dirty_sync_count;
info->ram->dirty_sync_missed_zero_copy =
- ram_counters.dirty_sync_missed_zero_copy;
+ stat64_get(&ram_counters.dirty_sync_missed_zero_copy);
info->ram->postcopy_requests = ram_counters.postcopy_requests;
info->ram->page_size = page_size;
info->ram->multifd_bytes = stat64_get(&ram_counters.multifd_bytes);
diff --git a/migration/multifd.c b/migration/multifd.c
index 1c992abf53..903df2117b 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -576,7 +576,7 @@ static int multifd_zero_copy_flush(QIOChannel *c)
return -1;
}
if (ret == 1) {
- dirty_sync_missed_zero_copy();
+ stat64_add(&ram_counters.dirty_sync_missed_zero_copy, 1);
}
return ret;
diff --git a/migration/ram.c b/migration/ram.c
index 71320ed27a..93e0a48af4 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -472,11 +472,6 @@ void ram_transferred_add(uint64_t bytes)
stat64_add(&ram_counters.transferred, bytes);
}
-void dirty_sync_missed_zero_copy(void)
-{
- ram_counters.dirty_sync_missed_zero_copy++;
-}
-
struct MigrationOps {
int (*ram_save_target_page)(RAMState *rs, PageSearchStatus *pss);
};
diff --git a/migration/ram.h b/migration/ram.h
index ed70391317..2170c55e67 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -43,7 +43,7 @@
typedef struct {
int64_t dirty_pages_rate;
int64_t dirty_sync_count;
- uint64_t dirty_sync_missed_zero_copy;
+ Stat64 dirty_sync_missed_zero_copy;
uint64_t downtime_bytes;
Stat64 duplicate;
Stat64 multifd_bytes;
@@ -114,6 +114,4 @@ void ram_write_tracking_prepare(void);
int ram_write_tracking_start(void);
void ram_write_tracking_stop(void);
-void dirty_sync_missed_zero_copy(void);
-
#endif
--
2.39.2
- [PULL 00/20] Migration 20230420 patches, Juan Quintela, 2023/04/20
- [PULL 01/20] migration: remove extra whitespace character for code style, Juan Quintela, 2023/04/20
- [PULL 09/20] migration: Make dirty_sync_count atomic, Juan Quintela, 2023/04/20
- [PULL 12/20] migration: Make dirty_bytes_last_sync atomic, Juan Quintela, 2023/04/20
- [PULL 06/20] migration: Make dirty_sync_missed_zero_copy atomic,
Juan Quintela <=
- [PULL 11/20] migration: Make dirty_pages_rate atomic, Juan Quintela, 2023/04/20
- [PULL 04/20] migration: Update atomic stats out of the mutex, Juan Quintela, 2023/04/20
- [PULL 03/20] migration: Merge ram_counters and ram_atomic_counters, Juan Quintela, 2023/04/20
- [PULL 05/20] migration: Make multifd_bytes atomic, Juan Quintela, 2023/04/20
- [PULL 07/20] migration: Make precopy_bytes atomic, Juan Quintela, 2023/04/20
- [PULL 13/20] migration: Rename duplicate to zero_pages, Juan Quintela, 2023/04/20
- [PULL 08/20] migration: Make downtime_bytes atomic, Juan Quintela, 2023/04/20
- [PULL 16/20] util/mmap-alloc: qemu_fd_getfs(), Juan Quintela, 2023/04/20
- [PULL 17/20] vl.c: Create late backends before migration object, Juan Quintela, 2023/04/20
- [PULL 18/20] migration/postcopy: Detect file system on dest host, Juan Quintela, 2023/04/20