From patchwork Wed Jul 25 14:50:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orit Wasserman X-Patchwork-Id: 173203 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A6B002C00A9 for ; Thu, 26 Jul 2012 01:30:34 +1000 (EST) Received: from localhost ([::1]:56522 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su3Xk-0002gM-Pc for incoming@patchwork.ozlabs.org; Wed, 25 Jul 2012 11:30:32 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su3XT-0002dG-QT for qemu-devel@nongnu.org; Wed, 25 Jul 2012 11:30:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Su3XN-0006LB-Ho for qemu-devel@nongnu.org; Wed, 25 Jul 2012 11:30:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23999) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su3XN-0006Jq-9k for qemu-devel@nongnu.org; Wed, 25 Jul 2012 11:30:09 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6PEpIbb005686 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 25 Jul 2012 10:51:18 -0400 Received: from dhcp-1-120.tlv.redhat.com (vpn-201-149.tlv.redhat.com [10.35.201.149]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q6PEoLQW024922; Wed, 25 Jul 2012 10:51:14 -0400 From: Orit Wasserman To: qemu-devel@nongnu.org Date: Wed, 25 Jul 2012 17:50:32 +0300 Message-Id: <1343227834-5400-11-git-send-email-owasserm@redhat.com> In-Reply-To: <1343227834-5400-1-git-send-email-owasserm@redhat.com> References: <1343227834-5400-1-git-send-email-owasserm@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, quintela@redhat.com, Petter Svard , stefanha@gmail.com, mdroth@linux.vnet.ibm.com, Benoit Hudzia , lcapitulino@redhat.com, blauwirbel@gmail.com, Orit Wasserman , chegu_vinod@hp.com, avi@redhat.com, Aidan Shribman , pbonzini@redhat.com, eblake@redhat.com Subject: [Qemu-devel] [PATCH 09/11] Add migration accounting for normal and duplicate pages 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 Signed-off-by: Benoit Hudzia Signed-off-by: Petter Svard Signed-off-by: Aidan Shribman Signed-off-by: Orit Wasserman Signed-off-by: Juan Quintela --- arch_init.c | 38 ++++++++++++++++++++++++++++++++++++++ migration.c | 4 ++++ migration.h | 5 +++++ qapi-schema.json | 8 ++++++-- qmp-commands.hx | 2 ++ 5 files changed, 55 insertions(+), 2 deletions(-) diff --git a/arch_init.c b/arch_init.c index cdf13ef..e50cdf2 100644 --- a/arch_init.c +++ b/arch_init.c @@ -205,6 +205,40 @@ int64_t xbzrle_cache_resize(int64_t new_size) return pow2floor(new_size); } +/* accounting for migration statistics */ +typedef struct AccountingInfo { + uint64_t dup_pages; + uint64_t norm_pages; + uint64_t iterations; +} AccountingInfo; + +static AccountingInfo acct_info; + +static void acct_clear(void) +{ + memset(&acct_info, 0, sizeof(acct_info)); +} + +uint64_t dup_mig_bytes_transferred(void) +{ + return acct_info.dup_pages * TARGET_PAGE_SIZE; +} + +uint64_t dup_mig_pages_transferred(void) +{ + return acct_info.dup_pages; +} + +uint64_t norm_mig_bytes_transferred(void) +{ + return acct_info.norm_pages * TARGET_PAGE_SIZE; +} + +uint64_t norm_mig_pages_transferred(void) +{ + return acct_info.norm_pages; +} + static void save_block_hdr(QEMUFile *f, RAMBlock *block, ram_addr_t offset, int cont, int flag) { @@ -307,6 +341,7 @@ static int ram_save_block(QEMUFile *f) p = memory_region_get_ram_ptr(mr) + offset; if (is_dup_page(p)) { + acct_info.dup_pages++; save_block_hdr(f, block, offset, cont, RAM_SAVE_FLAG_COMPRESS); qemu_put_byte(f, *p); bytes_sent = 1; @@ -322,6 +357,7 @@ static int ram_save_block(QEMUFile *f) save_block_hdr(f, block, offset, cont, RAM_SAVE_FLAG_PAGE); qemu_put_buffer(f, p, TARGET_PAGE_SIZE); bytes_sent = TARGET_PAGE_SIZE; + acct_info.norm_pages++; } /* if page is unmodified, continue to the next */ @@ -443,6 +479,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque) } XBZRLE.encoded_buf = g_malloc0(TARGET_PAGE_SIZE); XBZRLE.current_buf = g_malloc(TARGET_PAGE_SIZE); + acct_clear(); } QLIST_FOREACH(block, &ram_list.blocks, next) { @@ -490,6 +527,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) break; } bytes_transferred += bytes_sent; + acct_info.iterations++; /* we want to check in the 1st loop, just in case it was the 1st time and we had to sync the dirty bitmap. qemu_get_clock_ns() is a bit expensive, so we only check each some diff --git a/migration.c b/migration.c index bc2231d..4dc99ba 100644 --- a/migration.c +++ b/migration.c @@ -156,6 +156,8 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->ram->total = ram_bytes_total(); info->ram->total_time = qemu_get_clock_ms(rt_clock) - s->total_time; + info->ram->duplicate = dup_mig_pages_transferred(); + info->ram->normal = norm_mig_pages_transferred(); if (blk_mig_active()) { info->has_disk = true; @@ -175,6 +177,8 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->ram->remaining = 0; info->ram->total = ram_bytes_total(); info->ram->total_time = s->total_time; + info->ram->duplicate = dup_mig_pages_transferred(); + info->ram->normal = norm_mig_pages_transferred(); break; case MIG_STATE_ERROR: info->has_status = true; diff --git a/migration.h b/migration.h index 337e225..e4a7cd7 100644 --- a/migration.h +++ b/migration.h @@ -87,6 +87,11 @@ uint64_t ram_bytes_total(void); extern SaveVMHandlers savevm_ram_handlers; +uint64_t dup_mig_bytes_transferred(void); +uint64_t dup_mig_pages_transferred(void); +uint64_t norm_mig_bytes_transferred(void); +uint64_t norm_mig_pages_transferred(void); + /** * @migrate_add_blocker - prevent migration from proceeding * diff --git a/qapi-schema.json b/qapi-schema.json index 04adcee..88b7b56 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -264,11 +264,15 @@ # migration has ended, it returns the total migration # time. (since 1.2) # -# Since: 0.14.0. +# @duplicate: #optional, number of duplicate pages (since 1.2) +# +# @normal : #optional, number of normal pages (since 1.2) +# +# Since: 0.14.0 ## { 'type': 'MigrationStats', 'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' , - 'total_time': 'int' } } + 'total_time': 'int', '*duplicate': 'int', '*normal': 'int' } } ## # @MigrationInfo diff --git a/qmp-commands.hx b/qmp-commands.hx index cfc950e..d0e8878 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2099,6 +2099,8 @@ The main json-object contains the following: - "transferred": amount transferred (json-int) - "remaining": amount remaining (json-int) - "total": total (json-int) + - "duplicate": number of duplicated pages (json-int) + - "normal" : number of normal pages transferred (json-int) - "disk": only present if "status" is "active" and it is a block migration, it is a json-object with the following disk information (in bytes): - "transferred": amount transferred (json-int)