summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorElena Ufimtseva <elena.ufimtseva@oracle.com>2023-10-11 11:43:55 -0700
committerJuan Quintela <quintela@redhat.com>2023-10-17 09:25:13 +0200
commit60c7981aa3e84eb6d926fd4f7bb4aca4d2edf7cc (patch)
tree5ad4814b9829e71c1fd61298179a28b0b7c6a4f0
parente4ceec292fcdcae390eee539b79fbb6107f402e9 (diff)
downloadfocaccia-qemu-60c7981aa3e84eb6d926fd4f7bb4aca4d2edf7cc.tar.gz
focaccia-qemu-60c7981aa3e84eb6d926fd4f7bb4aca4d2edf7cc.zip
migration: check for rate_limit_max for RATE_LIMIT_DISABLED
In migration rate limiting atomic operations are used
to read the rate limit variables and transferred bytes and
they are expensive. Check first if rate_limit_max is equal
to RATE_LIMIT_DISABLED and return false immediately if so.

Note that with this patch we will also will stop flushing
by not calling qemu_fflush() from migration_transferred_bytes()
if the migration rate is not exceeded.
This should be fine since migration thread calls in the loop
migration_update_counters from migration_rate_limit() that
calls the migration_transferred_bytes() and flushes there.

Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231011184358.97349-2-elena.ufimtseva@oracle.com>
-rw-r--r--migration/migration-stats.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/migration/migration-stats.c b/migration/migration-stats.c
index 84e11e6dd8..4cc989d975 100644
--- a/migration/migration-stats.c
+++ b/migration/migration-stats.c
@@ -24,14 +24,15 @@ bool migration_rate_exceeded(QEMUFile *f)
         return true;
     }
 
+    uint64_t rate_limit_max = migration_rate_get();
+    if (rate_limit_max == RATE_LIMIT_DISABLED) {
+        return false;
+    }
+
     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) {
-        return false;
-    }
     if (rate_limit_max > 0 && rate_limit_used > rate_limit_max) {
         return true;
     }