From patchwork Thu Jul 5 12:51:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orit Wasserman X-Patchwork-Id: 169162 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 ED0222C0201 for ; Thu, 5 Jul 2012 23:13:28 +1000 (EST) Received: from localhost ([::1]:33081 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Smls6-0007aK-PB for incoming@patchwork.ozlabs.org; Thu, 05 Jul 2012 09:13:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmlrX-0006MO-Tu for qemu-devel@nongnu.org; Thu, 05 Jul 2012 09:12:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SmlrQ-0004RH-Pn for qemu-devel@nongnu.org; Thu, 05 Jul 2012 09:12:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17258) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmlrQ-0004Qa-Ex for qemu-devel@nongnu.org; Thu, 05 Jul 2012 09:12:44 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q65CrJaf026654 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 5 Jul 2012 08:53:19 -0400 Received: from dhcp-1-120.tlv.redhat.com (vpn-200-186.tlv.redhat.com [10.35.200.186]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q65Cpaqu028431; Thu, 5 Jul 2012 08:53:15 -0400 From: Orit Wasserman To: qemu-devel@nongnu.org Date: Thu, 5 Jul 2012 15:51:49 +0300 Message-Id: <1341492709-13897-10-git-send-email-owasserm@redhat.com> In-Reply-To: <1341492709-13897-1-git-send-email-owasserm@redhat.com> References: <1341492709-13897-1-git-send-email-owasserm@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 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 , blauwirbel@gmail.com, Orit Wasserman , chegu_vinod@hp.com, avi@redhat.com, Aidan Shribman , pbonzini@redhat.com, eblake@redhat.com Subject: [Qemu-devel] [PATCH v15 9/9] Add XBZRLE statistics 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 --- arch_init.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++- hmp.c | 13 ++++++++++ migration.c | 49 ++++++++++++++++++++++++++++++++++++++ migration.h | 9 +++++++ qapi-schema.json | 37 +++++++++++++++++++++++++---- qmp-commands.hx | 35 +++++++++++++++++++++++++++- 6 files changed, 204 insertions(+), 7 deletions(-) diff --git a/arch_init.c b/arch_init.c index da7a630..51db360 100644 --- a/arch_init.c +++ b/arch_init.c @@ -202,8 +202,66 @@ int64_t xbzrle_cache_resize(int64_t new_size) return pow2floor(new_size); } +/* accounting */ +typedef struct AccountingInfo { + uint64_t dup_pages; + uint64_t norm_pages; + uint64_t xbzrle_bytes; + uint64_t xbzrle_pages; + uint64_t xbzrle_cache_miss; + uint64_t iterations; + uint64_t xbzrle_overflows; +} 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; +} + +uint64_t xbzrle_mig_bytes_transferred(void) +{ + return acct_info.xbzrle_bytes; +} + +uint64_t xbzrle_mig_pages_transferred(void) +{ + return acct_info.xbzrle_pages; +} + +uint64_t xbzrle_mig_pages_cache_miss(void) +{ + return acct_info.xbzrle_cache_miss; +} + +uint64_t xbzrle_mig_pages_overflow(void) +{ + return acct_info.xbzrle_overflows; +} + static void save_block_hdr(QEMUFile *f, RAMBlock *block, ram_addr_t offset, - int cont, int flag) + int cont, int flag) { qemu_put_be64(f, offset | cont | flag); if (!cont) { @@ -234,6 +292,7 @@ static int save_xbzrle_page(QEMUFile *f, uint8_t *current_data, if (stage == 1 || !cache_is_cached(XBZRLE.cache, current_addr)) { cache_insert(XBZRLE.cache, current_addr, g_memdup(current_data, TARGET_PAGE_SIZE)); + acct_info.xbzrle_cache_miss++; return -1; } @@ -248,6 +307,7 @@ static int save_xbzrle_page(QEMUFile *f, uint8_t *current_data, return 0; } else if (encoded_len == -1) { DPRINTF("Overflow\n"); + acct_info.xbzrle_overflows++; /* update data in the cache */ memcpy(prev_cached_page, current_data, TARGET_PAGE_SIZE); return -1; @@ -267,7 +327,9 @@ static int save_xbzrle_page(QEMUFile *f, uint8_t *current_data, qemu_put_byte(f, hdr.xh_flags); qemu_put_be16(f, hdr.xh_len); qemu_put_buffer(f, XBZRLE.encoded_buf, encoded_len); + acct_info.xbzrle_pages++; bytes_sent = encoded_len + sizeof(hdr); + acct_info.xbzrle_bytes += bytes_sent; return bytes_sent; } @@ -299,6 +361,7 @@ static int ram_save_block(QEMUFile *f, int stage) 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; @@ -321,6 +384,7 @@ static int ram_save_block(QEMUFile *f, int stage) 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 lets continue to the next */ @@ -447,6 +511,7 @@ int ram_save_live(QEMUFile *f, int stage, void *opaque) return -1; } XBZRLE.encoded_buf = g_malloc0(TARGET_PAGE_SIZE); + acct_clear(); } /* Make sure all dirty bits are set */ @@ -482,6 +547,7 @@ int ram_save_live(QEMUFile *f, int stage, void *opaque) bytes_sent -1 represent no more blocks*/ if (bytes_sent > 0) { bytes_transferred += bytes_sent; + acct_info.iterations++; } else if (bytes_sent == -1) { /* no more blocks */ break; } diff --git a/hmp.c b/hmp.c index 5833e1c..5c56f4a 100644 --- a/hmp.c +++ b/hmp.c @@ -168,6 +168,19 @@ void hmp_info_migrate(Monitor *mon) info->disk->total >> 10); } + if (info->has_cache) { + monitor_printf(mon, "cache size: %" PRIu64 " bytes\n", + info->cache->cache_size); + monitor_printf(mon, "xbzrle transferred: %" PRIu64 " kbytes\n", + info->cache->xbzrle_bytes >> 10); + monitor_printf(mon, "xbzrle pages: %" PRIu64 " pages\n", + info->cache->xbzrle_pages); + monitor_printf(mon, "xbzrle cache miss: %" PRIu64 "\n", + info->cache->xbzrle_cache_miss); + monitor_printf(mon, "xbzrle overflow : %" PRIu64 "\n", + info->cache->xbzrle_overflow); + } + qapi_free_MigrationInfo(info); } diff --git a/migration.c b/migration.c index 9df6fc5..2054b6a 100644 --- a/migration.c +++ b/migration.c @@ -138,6 +138,17 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->capabilities->value->state = s->enabled_capabilities[i]; info->capabilities->next = NULL; } + + /* display xbzrle cache size */ + if (migrate_use_xbzrle()) { + info->has_cache = true; + info->cache = g_malloc0(sizeof(*info->cache)); + info->cache->cache_size = migrate_xbzrle_cache_size(); + info->cache->xbzrle_bytes = xbzrle_mig_bytes_transferred(); + info->cache->xbzrle_pages = xbzrle_mig_pages_transferred(); + info->cache->xbzrle_cache_miss = xbzrle_mig_pages_cache_miss(); + info->cache->xbzrle_overflow = xbzrle_mig_pages_overflow(); + } break; case MIG_STATE_ACTIVE: for (i = 0; i < MIGRATION_CAPABILITY_MAX; i++) { @@ -162,6 +173,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; @@ -170,6 +183,16 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->disk->remaining = blk_mig_bytes_remaining(); info->disk->total = blk_mig_bytes_total(); } + + if (migrate_use_xbzrle()) { + info->has_cache = true; + info->cache = g_malloc0(sizeof(*info->cache)); + info->cache->cache_size = migrate_xbzrle_cache_size(); + info->cache->xbzrle_bytes = xbzrle_mig_bytes_transferred(); + info->cache->xbzrle_pages = xbzrle_mig_pages_transferred(); + info->cache->xbzrle_cache_miss = xbzrle_mig_pages_cache_miss(); + info->cache->xbzrle_overflow = xbzrle_mig_pages_overflow(); + } break; case MIG_STATE_COMPLETED: for (i = 0; i < MIGRATION_CAPABILITY_MAX; i++) { @@ -184,6 +207,32 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->capabilities->next = NULL; } + info->has_ram = true; + info->ram = g_malloc0(sizeof(*info->ram)); + info->ram->transferred = ram_bytes_transferred(); + info->ram->remaining = ram_bytes_remaining(); + info->ram->total = ram_bytes_total(); + info->ram->duplicate = dup_mig_pages_transferred(); + info->ram->normal = norm_mig_pages_transferred(); + + if (blk_mig_active()) { + info->has_disk = true; + info->disk = g_malloc0(sizeof(*info->disk)); + info->disk->transferred = blk_mig_bytes_transferred(); + info->disk->remaining = blk_mig_bytes_remaining(); + info->disk->total = blk_mig_bytes_total(); + } + + if (migrate_use_xbzrle()) { + info->has_cache = true; + info->cache = g_malloc0(sizeof(*info->cache)); + info->cache->cache_size = migrate_xbzrle_cache_size(); + info->cache->xbzrle_bytes = xbzrle_mig_bytes_transferred(); + info->cache->xbzrle_pages = xbzrle_mig_pages_transferred(); + info->cache->xbzrle_cache_miss = xbzrle_mig_pages_cache_miss(); + info->cache->xbzrle_overflow = xbzrle_mig_pages_overflow(); + } + info->has_status = true; info->status = g_strdup("completed"); diff --git a/migration.h b/migration.h index a73a34a..67f4462 100644 --- a/migration.h +++ b/migration.h @@ -84,6 +84,15 @@ uint64_t ram_bytes_remaining(void); uint64_t ram_bytes_transferred(void); uint64_t ram_bytes_total(void); +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); +uint64_t xbzrle_mig_bytes_transferred(void); +uint64_t xbzrle_mig_pages_transferred(void); +uint64_t xbzrle_mig_pages_overflow(void); +uint64_t xbzrle_mig_pages_cache_miss(void); + int ram_save_live(QEMUFile *f, int stage, void *opaque); int ram_load(QEMUFile *f, void *opaque, int version_id); diff --git a/qapi-schema.json b/qapi-schema.json index c13577d..71b8dda 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -264,11 +264,35 @@ # migration has ended, it returns the total migration # time. (since 1.2) # -# Since: 0.14.0. +# @duplicate: #optional, number of duplicate pages +# +# @normal : #optional, number of normal pages +# +# Since: 0.14.0, 'duplicate' and 'normal' since 1.2 ## { 'type': 'MigrationStats', 'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' , - 'total_time': 'int' } } + 'total_time': 'int', '*duplicate': 'int', '*normal': 'int' } } +## +# @CacheStats +# +# Detailed XBZRLE migration cache statistics +# +# @cache_size: XBZRLE cache size +# +# @xbzrle_bytes: amount of bytes already transferred to the target VM +# +# @xbzrle_pages: amount of pages transferred to the target VM +# +# @xbzrle_cache_miss: number of cache miss +# +# @xbzrle_overflow: number of overflows +# +# Since: 1.2 +## +{ 'type': 'CacheStats', + 'data': {'cache-size': 'int', 'xbzrle-bytes': 'int', 'xbzrle-pages': 'int', + 'xbzrle-cache-miss': 'int', 'xbzrle-overflow': 'int' } } ## # @MigrationInfo @@ -291,13 +315,16 @@ # @capabilities: #optional a list describing all the migration capabilities # state # -# Since: 0.14.0, 'capabilities' since 1.2 +# @cache: #optional @MigrationStats containing detailed XBZRLE migration +# statistics +# +# Since: 0.14.0, 'capabilities' and 'cache' since 1. ## { 'type': 'MigrationInfo', 'data': {'*status': 'str', '*ram': 'MigrationStats', '*disk': 'MigrationStats', - '*capabilities': ['MigrationCapabilityInfo']} } - + '*capabilities': ['MigrationCapabilityInfo'], + '*cache': 'CacheStats'} } ## # @query-migrate # diff --git a/qmp-commands.hx b/qmp-commands.hx index 3ae46dc..3296f80 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2093,6 +2093,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) @@ -2100,10 +2102,17 @@ The main json-object contains the following: - "total": total (json-int) - "capabilities": migration capabilities state - "xbzrle" : XBZRLE state (json-bool) +- "cache": only present if "status" and XBZRLE is active. + It is a json-object with the following XBZRLE information: + - "cache-size": XBZRLE cache size + - "xbzrle-bytes": total XBZRLE bytes transferred + - "xbzrle-pages": number of XBZRLE compressed pages + - "cache-miss": number of cache misses + - "overflow": number of XBZRLE overflows + Examples: 1. Before the first migration - -> { "execute": "query-migrate" } <- { "return": { "capabilities" : [ { "capability" : "xbzrle", "state" : false } ] @@ -2164,6 +2173,30 @@ Examples: } } +5. Migration is being performed and XBZRLE is active: + +-> { "execute": "query-migrate" } +<- { + "return":{ + "status":"active", + "capabilities" : [ { "capability": "xbzrle", "state" : true } ], + "ram":{ + "total":1057024, + "remaining":1053304, + "transferred":3720 + "duplicate": 10, + "normal" : 3333 + }, + "cache":{ + "cache-size": 1024 + "xbzrle-transferred":20971520, + "xbzrle-pages":2444343, + "xbzrle-cache-miss":2244, + "xbzrle-overflow":34434 + } + } + } + EQMP {