@@ -339,6 +339,9 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
monitor_printf(mon, "%s: %" PRId64 "\n",
MigrationParameter_str(MIGRATION_PARAMETER_X_MULTIFD_THREADS),
params->x_multifd_threads);
+ monitor_printf(mon, "%s: %" PRId64 "\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_X_MULTIFD_GROUP),
+ params->x_multifd_group);
}
qapi_free_MigrationParameters(params);
@@ -1628,6 +1631,10 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
p->has_x_multifd_threads = true;
visit_type_int(v, param, &p->x_multifd_threads, &err);
break;
+ case MIGRATION_PARAMETER_X_MULTIFD_GROUP:
+ p->has_x_multifd_group = true;
+ visit_type_int(v, param, &p->x_multifd_group, &err);
+ break;
default:
assert(0);
}
@@ -78,6 +78,7 @@
*/
#define DEFAULT_MIGRATE_X_CHECKPOINT_DELAY 200
#define DEFAULT_MIGRATE_MULTIFD_THREADS 2
+#define DEFAULT_MIGRATE_MULTIFD_GROUP 16
static NotifierList migration_state_notifiers =
NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
@@ -485,6 +486,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp)
params->block_incremental = s->parameters.block_incremental;
params->has_x_multifd_threads = true;
params->x_multifd_threads = s->parameters.x_multifd_threads;
+ params->has_x_multifd_group = true;
+ params->x_multifd_group = s->parameters.x_multifd_group;
return params;
}
@@ -773,6 +776,13 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp)
"is invalid, it should be in the range of 1 to 255");
return false;
}
+ if (params->has_x_multifd_group &&
+ (params->x_multifd_group < 1 || params->x_multifd_group > 10000)) {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
+ "multifd_group",
+ "is invalid, it should be in the range of 1 to 10000");
+ return false;
+ }
return true;
}
@@ -894,6 +904,9 @@ static void migrate_params_apply(MigrateSetParameters *params)
if (params->has_x_multifd_threads) {
s->parameters.x_multifd_threads = params->x_multifd_threads;
}
+ if (params->has_x_multifd_group) {
+ s->parameters.x_multifd_group = params->x_multifd_group;
+ }
}
void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp)
@@ -1489,6 +1502,15 @@ int migrate_multifd_threads(void)
return s->parameters.x_multifd_threads;
}
+int migrate_multifd_group(void)
+{
+ MigrationState *s;
+
+ s = migrate_get_current();
+
+ return s->parameters.x_multifd_group;
+}
+
int migrate_use_xbzrle(void)
{
MigrationState *s;
@@ -2257,6 +2279,9 @@ static Property migration_properties[] = {
DEFINE_PROP_INT64("x-multifd-threads", MigrationState,
parameters.x_multifd_threads,
DEFAULT_MIGRATE_MULTIFD_THREADS),
+ DEFINE_PROP_INT64("x-multifd-group", MigrationState,
+ parameters.x_multifd_group,
+ DEFAULT_MIGRATE_MULTIFD_GROUP),
/* Migration capabilities */
DEFINE_PROP_MIG_CAP("x-xbzrle", MIGRATION_CAPABILITY_XBZRLE),
@@ -2317,6 +2342,7 @@ static void migration_instance_init(Object *obj)
params->has_x_checkpoint_delay = true;
params->has_block_incremental = true;
params->has_x_multifd_threads = true;
+ params->has_x_multifd_group = true;
}
/*
@@ -181,6 +181,7 @@ bool migrate_zero_blocks(void);
bool migrate_auto_converge(void);
bool migrate_use_multifd(void);
int migrate_multifd_threads(void);
+int migrate_multifd_group(void);
int migrate_use_xbzrle(void);
int64_t migrate_xbzrle_cache_size(void);
@@ -471,6 +471,9 @@
# number of sockets used for migration.
# The default value is 2 (since 2.11)
#
+# @x-multifd-group: Number of pages sent together to a thread
+# The default value is 16 (since 2.11)
+#
# Since: 2.4
##
{ 'enum': 'MigrationParameter',
@@ -478,7 +481,7 @@
'cpu-throttle-initial', 'cpu-throttle-increment',
'tls-creds', 'tls-hostname', 'max-bandwidth',
'downtime-limit', 'x-checkpoint-delay', 'block-incremental',
- 'x-multifd-threads'] }
+ 'x-multifd-threads', 'x-multifd-group' ] }
##
# @MigrateSetParameters:
@@ -539,6 +542,9 @@
# number of sockets used for migration.
# The default value is 2 (since 2.11)
#
+# @x-multifd-group: Number of pages sent together to a thread
+# The default value is 16 (since 2.11)
+#
# Since: 2.4
##
# TODO either fuse back into MigrationParameters, or make
@@ -555,7 +561,8 @@
'*downtime-limit': 'int',
'*x-checkpoint-delay': 'int',
'*block-incremental': 'bool',
- '*x-multifd-threads': 'int' } }
+ '*x-multifd-threads': 'int',
+ '*x-multifd-group': 'int' } }
##
# @migrate-set-parameters:
@@ -631,6 +638,9 @@
# number of sockets used for migration.
# The default value is 2 (since 2.11)
#
+# @x-multifd-group: Number of pages sent together to a thread
+# The default value is 16 (since 2.11)
+#
# Since: 2.4
##
{ 'struct': 'MigrationParameters',
@@ -645,7 +655,8 @@
'*downtime-limit': 'int',
'*x-checkpoint-delay': 'int',
'*block-incremental': 'bool' ,
- '*x-multifd-threads': 'int' } }
+ '*x-multifd-threads': 'int',
+ '*x-multifd-group': 'int' } }
##
# @query-migrate-parameters: