You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
233 lines
9.8 KiB
233 lines
9.8 KiB
1 year ago
|
From b6228b3122f5c1f220f92042277ab1bfbb5ba086 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Juan Quintela <quintela@redhat.com>
|
||
|
|
Date: Thu, 2 Mar 2023 11:00:12 +0100
|
||
|
|
Subject: [PATCH 48/56] migration: Create migrate_max_bandwidth() function
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Peter Xu <peterx@redhat.com>
|
||
|
|
RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
|
||
|
|
RH-Bugzilla: 2057267
|
||
|
|
RH-Acked-by: Leonardo Brás <leobras@redhat.com>
|
||
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-Acked-by: quintela1 <quintela@redhat.com>
|
||
|
|
RH-Commit: [47/50] 3874656f70cb9c2a30f4d63e146539480d422326 (peterx/qemu-kvm)
|
||
|
|
|
||
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
||
|
|
Reviewed-by: Fabiano Rosas <farosas@suse.de>
|
||
|
|
(cherry picked from commit 9c894df3a37d675652390f7dbbe2f65b7bad7efa)
|
||
|
|
Signed-off-by: Peter Xu <peterx@redhat.com>
|
||
|
|
---
|
||
|
|
migration/migration.c | 70 +-------------------------------------
|
||
|
|
migration/options.c | 79 +++++++++++++++++++++++++++++++++++++++++++
|
||
|
|
migration/options.h | 1 +
|
||
|
|
3 files changed, 81 insertions(+), 69 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/migration/migration.c b/migration/migration.c
|
||
|
|
index 46a5ea4d42..c2e109329d 100644
|
||
|
|
--- a/migration/migration.c
|
||
|
|
+++ b/migration/migration.c
|
||
|
|
@@ -886,74 +886,6 @@ void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value)
|
||
|
|
migrate_send_rp_message(mis, MIG_RP_MSG_RESUME_ACK, sizeof(buf), &buf);
|
||
|
|
}
|
||
|
|
|
||
|
|
-MigrationParameters *qmp_query_migrate_parameters(Error **errp)
|
||
|
|
-{
|
||
|
|
- MigrationParameters *params;
|
||
|
|
- MigrationState *s = migrate_get_current();
|
||
|
|
-
|
||
|
|
- /* TODO use QAPI_CLONE() instead of duplicating it inline */
|
||
|
|
- params = g_malloc0(sizeof(*params));
|
||
|
|
- params->has_compress_level = true;
|
||
|
|
- params->compress_level = s->parameters.compress_level;
|
||
|
|
- params->has_compress_threads = true;
|
||
|
|
- params->compress_threads = s->parameters.compress_threads;
|
||
|
|
- params->has_compress_wait_thread = true;
|
||
|
|
- params->compress_wait_thread = s->parameters.compress_wait_thread;
|
||
|
|
- params->has_decompress_threads = true;
|
||
|
|
- params->decompress_threads = s->parameters.decompress_threads;
|
||
|
|
- params->has_throttle_trigger_threshold = true;
|
||
|
|
- params->throttle_trigger_threshold = s->parameters.throttle_trigger_threshold;
|
||
|
|
- params->has_cpu_throttle_initial = true;
|
||
|
|
- params->cpu_throttle_initial = s->parameters.cpu_throttle_initial;
|
||
|
|
- params->has_cpu_throttle_increment = true;
|
||
|
|
- params->cpu_throttle_increment = s->parameters.cpu_throttle_increment;
|
||
|
|
- params->has_cpu_throttle_tailslow = true;
|
||
|
|
- params->cpu_throttle_tailslow = s->parameters.cpu_throttle_tailslow;
|
||
|
|
- params->tls_creds = g_strdup(s->parameters.tls_creds);
|
||
|
|
- params->tls_hostname = g_strdup(s->parameters.tls_hostname);
|
||
|
|
- params->tls_authz = g_strdup(s->parameters.tls_authz ?
|
||
|
|
- s->parameters.tls_authz : "");
|
||
|
|
- params->has_max_bandwidth = true;
|
||
|
|
- params->max_bandwidth = s->parameters.max_bandwidth;
|
||
|
|
- params->has_downtime_limit = true;
|
||
|
|
- params->downtime_limit = s->parameters.downtime_limit;
|
||
|
|
- params->has_x_checkpoint_delay = true;
|
||
|
|
- params->x_checkpoint_delay = s->parameters.x_checkpoint_delay;
|
||
|
|
- params->has_block_incremental = true;
|
||
|
|
- params->block_incremental = s->parameters.block_incremental;
|
||
|
|
- params->has_multifd_channels = true;
|
||
|
|
- params->multifd_channels = s->parameters.multifd_channels;
|
||
|
|
- params->has_multifd_compression = true;
|
||
|
|
- params->multifd_compression = s->parameters.multifd_compression;
|
||
|
|
- params->has_multifd_zlib_level = true;
|
||
|
|
- params->multifd_zlib_level = s->parameters.multifd_zlib_level;
|
||
|
|
- params->has_multifd_zstd_level = true;
|
||
|
|
- params->multifd_zstd_level = s->parameters.multifd_zstd_level;
|
||
|
|
- params->has_xbzrle_cache_size = true;
|
||
|
|
- params->xbzrle_cache_size = s->parameters.xbzrle_cache_size;
|
||
|
|
- params->has_max_postcopy_bandwidth = true;
|
||
|
|
- params->max_postcopy_bandwidth = s->parameters.max_postcopy_bandwidth;
|
||
|
|
- params->has_max_cpu_throttle = true;
|
||
|
|
- params->max_cpu_throttle = s->parameters.max_cpu_throttle;
|
||
|
|
- params->has_announce_initial = true;
|
||
|
|
- params->announce_initial = s->parameters.announce_initial;
|
||
|
|
- params->has_announce_max = true;
|
||
|
|
- params->announce_max = s->parameters.announce_max;
|
||
|
|
- params->has_announce_rounds = true;
|
||
|
|
- params->announce_rounds = s->parameters.announce_rounds;
|
||
|
|
- params->has_announce_step = true;
|
||
|
|
- params->announce_step = s->parameters.announce_step;
|
||
|
|
-
|
||
|
|
- if (s->parameters.has_block_bitmap_mapping) {
|
||
|
|
- params->has_block_bitmap_mapping = true;
|
||
|
|
- params->block_bitmap_mapping =
|
||
|
|
- QAPI_CLONE(BitmapMigrationNodeAliasList,
|
||
|
|
- s->parameters.block_bitmap_mapping);
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- return params;
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
/*
|
||
|
|
* Return true if we're already in the middle of a migration
|
||
|
|
* (i.e. any of the active or setup states)
|
||
|
|
@@ -3775,7 +3707,7 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)
|
||
|
|
XFER_LIMIT_RATIO;
|
||
|
|
} else {
|
||
|
|
/* This is a fresh new migration */
|
||
|
|
- rate_limit = s->parameters.max_bandwidth / XFER_LIMIT_RATIO;
|
||
|
|
+ rate_limit = migrate_max_bandwidth() / XFER_LIMIT_RATIO;
|
||
|
|
|
||
|
|
/* Notify before starting migration thread */
|
||
|
|
notifier_list_notify(&migration_state_notifiers, s);
|
||
|
|
diff --git a/migration/options.c b/migration/options.c
|
||
|
|
index 8bd2d949ae..8e8753d9be 100644
|
||
|
|
--- a/migration/options.c
|
||
|
|
+++ b/migration/options.c
|
||
|
|
@@ -12,8 +12,10 @@
|
||
|
|
*/
|
||
|
|
|
||
|
|
#include "qemu/osdep.h"
|
||
|
|
+#include "qapi/clone-visitor.h"
|
||
|
|
#include "qapi/error.h"
|
||
|
|
#include "qapi/qapi-commands-migration.h"
|
||
|
|
+#include "qapi/qapi-visit-migration.h"
|
||
|
|
#include "qapi/qmp/qerror.h"
|
||
|
|
#include "sysemu/runstate.h"
|
||
|
|
#include "migration/misc.h"
|
||
|
|
@@ -562,6 +564,15 @@ uint8_t migrate_max_cpu_throttle(void)
|
||
|
|
return s->parameters.max_cpu_throttle;
|
||
|
|
}
|
||
|
|
|
||
|
|
+uint64_t migrate_max_bandwidth(void)
|
||
|
|
+{
|
||
|
|
+ MigrationState *s;
|
||
|
|
+
|
||
|
|
+ s = migrate_get_current();
|
||
|
|
+
|
||
|
|
+ return s->parameters.max_bandwidth;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
int64_t migrate_max_postcopy_bandwidth(void)
|
||
|
|
{
|
||
|
|
MigrationState *s;
|
||
|
|
@@ -641,3 +652,71 @@ AnnounceParameters *migrate_announce_params(void)
|
||
|
|
|
||
|
|
return ≈
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+MigrationParameters *qmp_query_migrate_parameters(Error **errp)
|
||
|
|
+{
|
||
|
|
+ MigrationParameters *params;
|
||
|
|
+ MigrationState *s = migrate_get_current();
|
||
|
|
+
|
||
|
|
+ /* TODO use QAPI_CLONE() instead of duplicating it inline */
|
||
|
|
+ params = g_malloc0(sizeof(*params));
|
||
|
|
+ params->has_compress_level = true;
|
||
|
|
+ params->compress_level = s->parameters.compress_level;
|
||
|
|
+ params->has_compress_threads = true;
|
||
|
|
+ params->compress_threads = s->parameters.compress_threads;
|
||
|
|
+ params->has_compress_wait_thread = true;
|
||
|
|
+ params->compress_wait_thread = s->parameters.compress_wait_thread;
|
||
|
|
+ params->has_decompress_threads = true;
|
||
|
|
+ params->decompress_threads = s->parameters.decompress_threads;
|
||
|
|
+ params->has_throttle_trigger_threshold = true;
|
||
|
|
+ params->throttle_trigger_threshold = s->parameters.throttle_trigger_threshold;
|
||
|
|
+ params->has_cpu_throttle_initial = true;
|
||
|
|
+ params->cpu_throttle_initial = s->parameters.cpu_throttle_initial;
|
||
|
|
+ params->has_cpu_throttle_increment = true;
|
||
|
|
+ params->cpu_throttle_increment = s->parameters.cpu_throttle_increment;
|
||
|
|
+ params->has_cpu_throttle_tailslow = true;
|
||
|
|
+ params->cpu_throttle_tailslow = s->parameters.cpu_throttle_tailslow;
|
||
|
|
+ params->tls_creds = g_strdup(s->parameters.tls_creds);
|
||
|
|
+ params->tls_hostname = g_strdup(s->parameters.tls_hostname);
|
||
|
|
+ params->tls_authz = g_strdup(s->parameters.tls_authz ?
|
||
|
|
+ s->parameters.tls_authz : "");
|
||
|
|
+ params->has_max_bandwidth = true;
|
||
|
|
+ params->max_bandwidth = s->parameters.max_bandwidth;
|
||
|
|
+ params->has_downtime_limit = true;
|
||
|
|
+ params->downtime_limit = s->parameters.downtime_limit;
|
||
|
|
+ params->has_x_checkpoint_delay = true;
|
||
|
|
+ params->x_checkpoint_delay = s->parameters.x_checkpoint_delay;
|
||
|
|
+ params->has_block_incremental = true;
|
||
|
|
+ params->block_incremental = s->parameters.block_incremental;
|
||
|
|
+ params->has_multifd_channels = true;
|
||
|
|
+ params->multifd_channels = s->parameters.multifd_channels;
|
||
|
|
+ params->has_multifd_compression = true;
|
||
|
|
+ params->multifd_compression = s->parameters.multifd_compression;
|
||
|
|
+ params->has_multifd_zlib_level = true;
|
||
|
|
+ params->multifd_zlib_level = s->parameters.multifd_zlib_level;
|
||
|
|
+ params->has_multifd_zstd_level = true;
|
||
|
|
+ params->multifd_zstd_level = s->parameters.multifd_zstd_level;
|
||
|
|
+ params->has_xbzrle_cache_size = true;
|
||
|
|
+ params->xbzrle_cache_size = s->parameters.xbzrle_cache_size;
|
||
|
|
+ params->has_max_postcopy_bandwidth = true;
|
||
|
|
+ params->max_postcopy_bandwidth = s->parameters.max_postcopy_bandwidth;
|
||
|
|
+ params->has_max_cpu_throttle = true;
|
||
|
|
+ params->max_cpu_throttle = s->parameters.max_cpu_throttle;
|
||
|
|
+ params->has_announce_initial = true;
|
||
|
|
+ params->announce_initial = s->parameters.announce_initial;
|
||
|
|
+ params->has_announce_max = true;
|
||
|
|
+ params->announce_max = s->parameters.announce_max;
|
||
|
|
+ params->has_announce_rounds = true;
|
||
|
|
+ params->announce_rounds = s->parameters.announce_rounds;
|
||
|
|
+ params->has_announce_step = true;
|
||
|
|
+ params->announce_step = s->parameters.announce_step;
|
||
|
|
+
|
||
|
|
+ if (s->parameters.has_block_bitmap_mapping) {
|
||
|
|
+ params->has_block_bitmap_mapping = true;
|
||
|
|
+ params->block_bitmap_mapping =
|
||
|
|
+ QAPI_CLONE(BitmapMigrationNodeAliasList,
|
||
|
|
+ s->parameters.block_bitmap_mapping);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return params;
|
||
|
|
+}
|
||
|
|
diff --git a/migration/options.h b/migration/options.h
|
||
|
|
index 093bc907a1..1b78fa9f3d 100644
|
||
|
|
--- a/migration/options.h
|
||
|
|
+++ b/migration/options.h
|
||
|
|
@@ -64,6 +64,7 @@ uint8_t migrate_cpu_throttle_initial(void);
|
||
|
|
bool migrate_cpu_throttle_tailslow(void);
|
||
|
|
int migrate_decompress_threads(void);
|
||
|
|
uint8_t migrate_max_cpu_throttle(void);
|
||
|
|
+uint64_t migrate_max_bandwidth(void);
|
||
|
|
int64_t migrate_max_postcopy_bandwidth(void);
|
||
|
|
int migrate_multifd_channels(void);
|
||
|
|
MultiFDCompression migrate_multifd_compression(void);
|
||
|
|
--
|
||
|
|
2.39.1
|
||
|
|
|