From patchwork Wed Sep 6 11:51:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 810544 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xnMdf5j7Hz9s81 for ; Wed, 6 Sep 2017 22:02:14 +1000 (AEST) Received: from localhost ([::1]:35647 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpZ24-000781-SA for incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 08:02:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpYsT-0007Vi-JB for qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpYsS-00084u-76 for qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57276) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpYsR-00084U-VM for qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:16 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F24F6883AD for ; Wed, 6 Sep 2017 11:52:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com F24F6883AD Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=quintela@redhat.com Received: from secure.mitica (ovpn-117-188.ams2.redhat.com [10.36.117.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FA8419C94; Wed, 6 Sep 2017 11:52:13 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 6 Sep 2017 13:51:32 +0200 Message-Id: <20170906115143.27451-12-quintela@redhat.com> In-Reply-To: <20170906115143.27451-1-quintela@redhat.com> References: <20170906115143.27451-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 06 Sep 2017 11:52:15 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v7 11/22] migration: Create x-multifd-group parameter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Indicates how many pages we are going to send in each batch to a multifd thread. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu --- Be consistent with defaults and documentation Use new DEFINE_PROP_* --- hmp.c | 7 +++++++ migration/migration.c | 26 ++++++++++++++++++++++++++ migration/migration.h | 1 + qapi/migration.json | 17 ++++++++++++++--- 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/hmp.c b/hmp.c index 4931b2fe9f..d9562103ee 100644 --- a/hmp.c +++ b/hmp.c @@ -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); } diff --git a/migration/migration.c b/migration/migration.c index fe9788ed62..208554dc37 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -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; } /* diff --git a/migration/migration.h b/migration/migration.h index 8a61f460b0..cb634fc31f 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -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); diff --git a/qapi/migration.json b/qapi/migration.json index b5a5d694f4..6a838369ef 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -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: