From patchwork Tue Jun 25 01:58:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mrhines@linux.vnet.ibm.com X-Patchwork-Id: 254013 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0046F2C007E for ; Tue, 25 Jun 2013 12:05:13 +1000 (EST) Received: from localhost ([::1]:32851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UrId5-0003m2-Q9 for incoming@patchwork.ozlabs.org; Mon, 24 Jun 2013 22:05:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44354) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UrIWT-0001lb-Qm for qemu-devel@nongnu.org; Mon, 24 Jun 2013 21:58:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UrIWO-00019E-4a for qemu-devel@nongnu.org; Mon, 24 Jun 2013 21:58:21 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:45936) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UrIWO-000192-0m for qemu-devel@nongnu.org; Mon, 24 Jun 2013 21:58:16 -0400 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 24 Jun 2013 21:58:15 -0400 Received: from d01dlp01.pok.ibm.com (9.56.250.166) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 24 Jun 2013 21:58:13 -0400 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id DA7DE38C806B for ; Mon, 24 Jun 2013 21:58:11 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5P1wCVY45154440 for ; Mon, 24 Jun 2013 21:58:12 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5P1wCK3029388 for ; Mon, 24 Jun 2013 22:58:12 -0300 Received: from mrhinesdev.klabtestbed.com (klinux.watson.ibm.com [9.2.208.21]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r5P1w8C5029131; Mon, 24 Jun 2013 22:58:12 -0300 From: mrhines@linux.vnet.ibm.com To: qemu-devel@nongnu.org Date: Mon, 24 Jun 2013 21:58:05 -0400 Message-Id: <1372125485-11795-16-git-send-email-mrhines@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1372125485-11795-1-git-send-email-mrhines@linux.vnet.ibm.com> References: <1372125485-11795-1-git-send-email-mrhines@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13062501-7182-0000-0000-000007812FFD X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.182.139 Cc: aliguori@us.ibm.com, quintela@redhat.com, knoel@redhat.com, owasserm@redhat.com, abali@us.ibm.com, mrhines@us.ibm.com, gokul@us.ibm.com, pbonzini@redhat.com, chegu_vinod@hp.com Subject: [Qemu-devel] [PATCH v11 15/15] rdma: account for the time spent in MIG_STATE_SETUP through QMP X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Michael R. Hines" Using the previous patches, we're now able to timestamp the SETUP state. Once we have this time, let the user know about it in the schema. Signed-off-by: Michael R. Hines Reviewed-by: Juan Quintela --- hmp.c | 4 ++++ include/migration/migration.h | 1 + migration.c | 9 +++++++++ qapi-schema.json | 9 ++++++++- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/hmp.c b/hmp.c index a3c6b55..2b75b28 100644 --- a/hmp.c +++ b/hmp.c @@ -166,6 +166,10 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) monitor_printf(mon, "downtime: %" PRIu64 " milliseconds\n", info->downtime); } + if (info->has_setup_time) { + monitor_printf(mon, "setup: %" PRIu64 " milliseconds\n", + info->setup_time); + } } if (info->has_ram) { diff --git a/include/migration/migration.h b/include/migration/migration.h index b5e413a..e41397e 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -49,6 +49,7 @@ struct MigrationState int64_t dirty_bytes_rate; bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; int64_t xbzrle_cache_size; + int64_t setup_time; }; void process_incoming_migration(QEMUFile *f); diff --git a/migration.c b/migration.c index 758d99d..bb412df 100644 --- a/migration.c +++ b/migration.c @@ -191,6 +191,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) case MIG_STATE_SETUP: info->has_status = true; info->status = g_strdup("setup"); + info->has_total_time = false; break; case MIG_STATE_ACTIVE: info->has_status = true; @@ -200,6 +201,8 @@ MigrationInfo *qmp_query_migrate(Error **errp) - s->total_time; info->has_expected_downtime = true; info->expected_downtime = s->expected_downtime; + info->has_setup_time = true; + info->setup_time = s->setup_time; info->has_ram = true; info->ram = g_malloc0(sizeof(*info->ram)); @@ -231,6 +234,8 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->total_time = s->total_time; info->has_downtime = true; info->downtime = s->downtime; + info->has_setup_time = true; + info->setup_time = s->setup_time; info->has_ram = true; info->ram = g_malloc0(sizeof(*info->ram)); @@ -523,6 +528,7 @@ static void *migration_thread(void *opaque) { MigrationState *s = opaque; int64_t initial_time = qemu_get_clock_ms(rt_clock); + int64_t setup_start = qemu_get_clock_ms(host_clock); int64_t initial_bytes = 0; int64_t max_size = 0; int64_t start_time = initial_time; @@ -531,8 +537,11 @@ static void *migration_thread(void *opaque) DPRINTF("beginning savevm\n"); qemu_savevm_state_begin(s->file, &s->params); + s->setup_time = qemu_get_clock_ms(host_clock) - setup_start; migrate_set_state(s, MIG_STATE_SETUP, MIG_STATE_ACTIVE); + DPRINTF("setup complete\n"); + while (s->state == MIG_STATE_ACTIVE) { int64_t current_time; uint64_t pending_size; diff --git a/qapi-schema.json b/qapi-schema.json index a30a728..b5e1e6b 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -578,6 +578,12 @@ # expected downtime in milliseconds for the guest in last walk # of the dirty bitmap. (since 1.3) # +# @setup-time: #optional amount of setup time spent _before_ the iterations +# begin but _after_ the QMP command is issued. This is designed to +# provide an accounting of any activities (such as RDMA pinning) which +# may be expensive, but do not actually occur during the iterative +# migration rounds themselves. (since 1.6) +# # Since: 0.14.0 ## { 'type': 'MigrationInfo', @@ -586,7 +592,8 @@ '*xbzrle-cache': 'XBZRLECacheStats', '*total-time': 'int', '*expected-downtime': 'int', - '*downtime': 'int'} } + '*downtime': 'int', + '*setup-time' : 'int'} } ## # @query-migrate