aboutsummaryrefslogtreecommitdiff
path: root/migration
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2023-05-15 21:57:01 +0200
committerJuan Quintela <quintela@redhat.com>2023-05-18 18:40:51 +0200
commit813cd61669e45ee6d5db09a83d03df8f0c6eb5d2 (patch)
tree7a9dc33647ab2952477c3f3ede345ad7b7759551 /migration
parent3db9c05a9006550da3a73600cec89bb995420325 (diff)
downloadqemu-813cd61669e45ee6d5db09a83d03df8f0c6eb5d2.zip
qemu-813cd61669e45ee6d5db09a83d03df8f0c6eb5d2.tar.gz
qemu-813cd61669e45ee6d5db09a83d03df8f0c6eb5d2.tar.bz2
migration: Use migration_transferred_bytes() to calculate rate_limit
Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Message-Id: <20230515195709.63843-9-quintela@redhat.com>
Diffstat (limited to 'migration')
-rw-r--r--migration/migration-stats.c7
-rw-r--r--migration/migration-stats.h8
-rw-r--r--migration/migration.c2
3 files changed, 13 insertions, 4 deletions
diff --git a/migration/migration-stats.c b/migration/migration-stats.c
index feec7d7..97759a4 100644
--- a/migration/migration-stats.c
+++ b/migration/migration-stats.c
@@ -24,7 +24,9 @@ bool migration_rate_exceeded(QEMUFile *f)
return true;
}
- uint64_t rate_limit_used = stat64_get(&mig_stats.rate_limit_used);
+ uint64_t rate_limit_start = stat64_get(&mig_stats.rate_limit_start);
+ uint64_t rate_limit_current = migration_transferred_bytes(f);
+ uint64_t rate_limit_used = rate_limit_current - rate_limit_start;
uint64_t rate_limit_max = stat64_get(&mig_stats.rate_limit_max);
if (rate_limit_max == RATE_LIMIT_DISABLED) {
@@ -51,9 +53,10 @@ void migration_rate_set(uint64_t limit)
stat64_set(&mig_stats.rate_limit_max, limit / XFER_LIMIT_RATIO);
}
-void migration_rate_reset(void)
+void migration_rate_reset(QEMUFile *f)
{
stat64_set(&mig_stats.rate_limit_used, 0);
+ stat64_set(&mig_stats.rate_limit_start, migration_transferred_bytes(f));
}
void migration_rate_account(uint64_t len)
diff --git a/migration/migration-stats.h b/migration/migration-stats.h
index 827ea80..4c4daa2 100644
--- a/migration/migration-stats.h
+++ b/migration/migration-stats.h
@@ -82,6 +82,10 @@ typedef struct {
*/
Stat64 precopy_bytes;
/*
+ * Amount of transferred data at the start of current cycle.
+ */
+ Stat64 rate_limit_start;
+ /*
* Maximum amount of data we can send in a cycle.
*/
Stat64 rate_limit_max;
@@ -122,8 +126,10 @@ uint64_t migration_rate_get(void);
* migration_rate_reset: Reset the rate limit counter.
*
* This is called when we know we start a new transfer cycle.
+ *
+ * @f: QEMUFile used for main migration channel
*/
-void migration_rate_reset(void);
+void migration_rate_reset(QEMUFile *f);
/**
* migration_rate_set: Set the maximum amount that can be transferred.
diff --git a/migration/migration.c b/migration/migration.c
index 952100c..5de7f73 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2692,7 +2692,7 @@ static void migration_update_counters(MigrationState *s,
stat64_get(&mig_stats.dirty_bytes_last_sync) / bandwidth;
}
- migration_rate_reset();
+ migration_rate_reset(s->to_dst_file);
update_iteration_initial_status(s);