[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/21] migration/rdma: Split the zero page case from acct_update_p
From: |
Juan Quintela |
Subject: |
[PULL 05/21] migration/rdma: Split the zero page case from acct_update_position |
Date: |
Fri, 28 Apr 2023 21:11:47 +0200 |
Now that we have atomic counters, we can do it on the place that we
need it, no need to do it inside ram.c.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Lukas Straub <lukasstraub2@web.de>
---
migration/ram.c | 12 ++++--------
migration/ram.h | 2 +-
migration/rdma.c | 7 +++++--
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index c3981f64e4..c249a1f468 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2629,17 +2629,13 @@ static int ram_find_and_save_block(RAMState *rs)
return pages;
}
-void acct_update_position(QEMUFile *f, size_t size, bool zero)
+void acct_update_position(QEMUFile *f, size_t size)
{
uint64_t pages = size / TARGET_PAGE_SIZE;
- if (zero) {
- stat64_add(&mig_stats.zero_pages, pages);
- } else {
- stat64_add(&mig_stats.normal_pages, pages);
- ram_transferred_add(size);
- qemu_file_credit_transfer(f, size);
- }
+ stat64_add(&mig_stats.normal_pages, pages);
+ ram_transferred_add(size);
+ qemu_file_credit_transfer(f, size);
}
static uint64_t ram_bytes_total_with_ignored(void)
diff --git a/migration/ram.h b/migration/ram.h
index 8692de6ba0..3804753ca3 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -53,7 +53,7 @@ void mig_throttle_counter_reset(void);
uint64_t ram_pagesize_summary(void);
int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len);
-void acct_update_position(QEMUFile *f, size_t size, bool zero);
+void acct_update_position(QEMUFile *f, size_t size);
void ram_postcopy_migrated_memory_release(MigrationState *ms);
/* For outgoing discard bitmap */
void ram_postcopy_send_discard_bitmap(MigrationState *ms);
diff --git a/migration/rdma.c b/migration/rdma.c
index 0af5e944f0..7a9b284c3f 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -17,8 +17,10 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/cutils.h"
+#include "exec/target_page.h"
#include "rdma.h"
#include "migration.h"
+#include "migration-stats.h"
#include "qemu-file.h"
#include "ram.h"
#include "qemu/error-report.h"
@@ -2120,7 +2122,8 @@ retry:
return -EIO;
}
- acct_update_position(f, sge.length, true);
+ stat64_add(&mig_stats.zero_pages,
+ sge.length / qemu_target_page_size());
return 1;
}
@@ -2228,7 +2231,7 @@ retry:
}
set_bit(chunk, block->transit_bitmap);
- acct_update_position(f, sge.length, false);
+ acct_update_position(f, sge.length);
rdma->total_writes++;
return 0;
--
2.40.0
- [PULL 00/21] Migration 20230428 patches, Juan Quintela, 2023/04/28
- [PULL 02/21] migration: Move ram_stats to its own file migration-stats.[ch], Juan Quintela, 2023/04/28
- [PULL 01/21] multifd: We already account for this packet on the multifd thread, Juan Quintela, 2023/04/28
- [PULL 03/21] migration: Rename ram_counters to mig_stats, Juan Quintela, 2023/04/28
- [PULL 04/21] migration: Rename RAMStats to MigrationAtomicStats, Juan Quintela, 2023/04/28
- [PULL 07/21] migration: Drop unused parameter for migration_tls_get_creds(), Juan Quintela, 2023/04/28
- [PULL 05/21] migration/rdma: Split the zero page case from acct_update_position,
Juan Quintela <=
- [PULL 06/21] migration/rdma: Unfold last user of acct_update_position(), Juan Quintela, 2023/04/28
- [PULL 08/21] migration: Drop unused parameter for migration_tls_client_create(), Juan Quintela, 2023/04/28
- [PULL 10/21] qtest/migration-test.c: Add postcopy tests with compress enabled, Juan Quintela, 2023/04/28
- [PULL 09/21] qtest/migration-test.c: Add tests with compress enabled, Juan Quintela, 2023/04/28
- [PULL 11/21] ram.c: Let the compress threads return a CompressResult enum, Juan Quintela, 2023/04/28
- [PULL 14/21] ram.c: Do not call save_page_header() from compress threads, Juan Quintela, 2023/04/28
- [PULL 12/21] ram.c: Dont change param->block in the compress thread, Juan Quintela, 2023/04/28
- [PULL 13/21] ram.c: Reset result after sending queued data, Juan Quintela, 2023/04/28
- [PULL 16/21] ram.c: Remove last ram.c dependency from the core compress code, Juan Quintela, 2023/04/28
- [PULL 15/21] ram.c: Call update_compress_thread_counts from compress_send_queued_data, Juan Quintela, 2023/04/28