{"id":810544,"url":"http://patchwork.ozlabs.org/api/patches/810544/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906115143.27451-12-quintela@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170906115143.27451-12-quintela@redhat.com>","list_archive_url":null,"date":"2017-09-06T11:51:32","name":"[v7,11/22] migration: Create x-multifd-group parameter","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"d9ff58eb1bee6220bfa179d1c47749a22b013f87","submitter":{"id":2643,"url":"http://patchwork.ozlabs.org/api/people/2643/?format=json","name":"Juan Quintela","email":"quintela@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906115143.27451-12-quintela@redhat.com/mbox/","series":[{"id":1773,"url":"http://patchwork.ozlabs.org/api/series/1773/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1773","date":"2017-09-06T11:51:21","name":"Multifd","version":7,"mbox":"http://patchwork.ozlabs.org/series/1773/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810544/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810544/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=quintela@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xnMdf5j7Hz9s81\n\tfor ;\n\tWed, 6 Sep 2017 22:02:14 +1000 (AEST)","from localhost ([::1]:35647 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpZ24-000781-SA\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 08:02:12 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60266)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpYsT-0007Vi-JB\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:19 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpYsS-00084u-76\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:17 -0400","from mx1.redhat.com ([209.132.183.28]:57276)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpYsR-00084U-VM\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:16 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id F24F6883AD\n\tfor ; Wed, 6 Sep 2017 11:52:14 +0000 (UTC)","from secure.mitica (ovpn-117-188.ams2.redhat.com [10.36.117.188])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 9FA8419C94;\n\tWed, 6 Sep 2017 11:52:13 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com F24F6883AD","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\n\t(mx1.redhat.com [10.5.110.26]);\n\tWed, 06 Sep 2017 11:52:15 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v7 11/22] migration: Create x-multifd-group\n\tparameter","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Indicates how many pages we are going to send in each batch to a multifd\nthread.\n\nSigned-off-by: Juan Quintela \nReviewed-by: Dr. David Alan Gilbert \nReviewed-by: Peter Xu \n\n--\n\nBe consistent with defaults and documentation\nUse new DEFINE_PROP_*\n---\n hmp.c | 7 +++++++\n migration/migration.c | 26 ++++++++++++++++++++++++++\n migration/migration.h | 1 +\n qapi/migration.json | 17 ++++++++++++++---\n 4 files changed, 48 insertions(+), 3 deletions(-)","diff":"diff --git a/hmp.c b/hmp.c\nindex 4931b2fe9f..d9562103ee 100644\n--- a/hmp.c\n+++ b/hmp.c\n@@ -339,6 +339,9 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)\n monitor_printf(mon, \"%s: %\" PRId64 \"\\n\",\n MigrationParameter_str(MIGRATION_PARAMETER_X_MULTIFD_THREADS),\n params->x_multifd_threads);\n+ monitor_printf(mon, \"%s: %\" PRId64 \"\\n\",\n+ MigrationParameter_str(MIGRATION_PARAMETER_X_MULTIFD_GROUP),\n+ params->x_multifd_group);\n }\n \n qapi_free_MigrationParameters(params);\n@@ -1628,6 +1631,10 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)\n p->has_x_multifd_threads = true;\n visit_type_int(v, param, &p->x_multifd_threads, &err);\n break;\n+ case MIGRATION_PARAMETER_X_MULTIFD_GROUP:\n+ p->has_x_multifd_group = true;\n+ visit_type_int(v, param, &p->x_multifd_group, &err);\n+ break;\n default:\n assert(0);\n }\ndiff --git a/migration/migration.c b/migration/migration.c\nindex fe9788ed62..208554dc37 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -78,6 +78,7 @@\n */\n #define DEFAULT_MIGRATE_X_CHECKPOINT_DELAY 200\n #define DEFAULT_MIGRATE_MULTIFD_THREADS 2\n+#define DEFAULT_MIGRATE_MULTIFD_GROUP 16\n \n static NotifierList migration_state_notifiers =\n NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);\n@@ -485,6 +486,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp)\n params->block_incremental = s->parameters.block_incremental;\n params->has_x_multifd_threads = true;\n params->x_multifd_threads = s->parameters.x_multifd_threads;\n+ params->has_x_multifd_group = true;\n+ params->x_multifd_group = s->parameters.x_multifd_group;\n \n return params;\n }\n@@ -773,6 +776,13 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp)\n \"is invalid, it should be in the range of 1 to 255\");\n return false;\n }\n+ if (params->has_x_multifd_group &&\n+ (params->x_multifd_group < 1 || params->x_multifd_group > 10000)) {\n+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE,\n+ \"multifd_group\",\n+ \"is invalid, it should be in the range of 1 to 10000\");\n+ return false;\n+ }\n \n return true;\n }\n@@ -894,6 +904,9 @@ static void migrate_params_apply(MigrateSetParameters *params)\n if (params->has_x_multifd_threads) {\n s->parameters.x_multifd_threads = params->x_multifd_threads;\n }\n+ if (params->has_x_multifd_group) {\n+ s->parameters.x_multifd_group = params->x_multifd_group;\n+ }\n }\n \n void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp)\n@@ -1489,6 +1502,15 @@ int migrate_multifd_threads(void)\n return s->parameters.x_multifd_threads;\n }\n \n+int migrate_multifd_group(void)\n+{\n+ MigrationState *s;\n+\n+ s = migrate_get_current();\n+\n+ return s->parameters.x_multifd_group;\n+}\n+\n int migrate_use_xbzrle(void)\n {\n MigrationState *s;\n@@ -2257,6 +2279,9 @@ static Property migration_properties[] = {\n DEFINE_PROP_INT64(\"x-multifd-threads\", MigrationState,\n parameters.x_multifd_threads,\n DEFAULT_MIGRATE_MULTIFD_THREADS),\n+ DEFINE_PROP_INT64(\"x-multifd-group\", MigrationState,\n+ parameters.x_multifd_group,\n+ DEFAULT_MIGRATE_MULTIFD_GROUP),\n \n /* Migration capabilities */\n DEFINE_PROP_MIG_CAP(\"x-xbzrle\", MIGRATION_CAPABILITY_XBZRLE),\n@@ -2317,6 +2342,7 @@ static void migration_instance_init(Object *obj)\n params->has_x_checkpoint_delay = true;\n params->has_block_incremental = true;\n params->has_x_multifd_threads = true;\n+ params->has_x_multifd_group = true;\n }\n \n /*\ndiff --git a/migration/migration.h b/migration/migration.h\nindex 8a61f460b0..cb634fc31f 100644\n--- a/migration/migration.h\n+++ b/migration/migration.h\n@@ -181,6 +181,7 @@ bool migrate_zero_blocks(void);\n bool migrate_auto_converge(void);\n bool migrate_use_multifd(void);\n int migrate_multifd_threads(void);\n+int migrate_multifd_group(void);\n \n int migrate_use_xbzrle(void);\n int64_t migrate_xbzrle_cache_size(void);\ndiff --git a/qapi/migration.json b/qapi/migration.json\nindex b5a5d694f4..6a838369ef 100644\n--- a/qapi/migration.json\n+++ b/qapi/migration.json\n@@ -471,6 +471,9 @@\n # number of sockets used for migration.\n # The default value is 2 (since 2.11)\n #\n+# @x-multifd-group: Number of pages sent together to a thread\n+# The default value is 16 (since 2.11)\n+#\n # Since: 2.4\n ##\n { 'enum': 'MigrationParameter',\n@@ -478,7 +481,7 @@\n 'cpu-throttle-initial', 'cpu-throttle-increment',\n 'tls-creds', 'tls-hostname', 'max-bandwidth',\n 'downtime-limit', 'x-checkpoint-delay', 'block-incremental',\n- 'x-multifd-threads'] }\n+ 'x-multifd-threads', 'x-multifd-group' ] }\n \n ##\n # @MigrateSetParameters:\n@@ -539,6 +542,9 @@\n # number of sockets used for migration.\n # The default value is 2 (since 2.11)\n #\n+# @x-multifd-group: Number of pages sent together to a thread\n+# The default value is 16 (since 2.11)\n+#\n # Since: 2.4\n ##\n # TODO either fuse back into MigrationParameters, or make\n@@ -555,7 +561,8 @@\n '*downtime-limit': 'int',\n '*x-checkpoint-delay': 'int',\n '*block-incremental': 'bool',\n- '*x-multifd-threads': 'int' } }\n+ '*x-multifd-threads': 'int',\n+ '*x-multifd-group': 'int' } }\n \n ##\n # @migrate-set-parameters:\n@@ -631,6 +638,9 @@\n # number of sockets used for migration.\n # The default value is 2 (since 2.11)\n #\n+# @x-multifd-group: Number of pages sent together to a thread\n+# The default value is 16 (since 2.11)\n+#\n # Since: 2.4\n ##\n { 'struct': 'MigrationParameters',\n@@ -645,7 +655,8 @@\n '*downtime-limit': 'int',\n '*x-checkpoint-delay': 'int',\n '*block-incremental': 'bool' ,\n- '*x-multifd-threads': 'int' } }\n+ '*x-multifd-threads': 'int',\n+ '*x-multifd-group': 'int' } }\n \n ##\n # @query-migrate-parameters:\n","prefixes":["v7","11/22"]}