Signed-off-by: Benoit Hudzia <benoit.hud...@sap.com> Signed-off-by: Petter Svard <pett...@cs.umu.se> Signed-off-by: Aidan Shribman <aidan.shrib...@sap.com> Signed-off-by: Orit Wasserman <owass...@redhat.com> --- arch_init.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++- hmp.c | 13 ++++++++++ migration.c | 38 ++++++++++++++++++++++++++++++ migration.h | 9 +++++++ qapi-schema.json | 40 +++++++++++++++++++++++++++---- qmp-commands.hx | 38 ++++++++++++++++++++++++++++- 6 files changed, 198 insertions(+), 8 deletions(-)
diff --git a/arch_init.c b/arch_init.c index ae7c8b1..84a2e2a 100644 --- a/arch_init.c +++ b/arch_init.c @@ -201,8 +201,66 @@ void xbzrle_cache_resize(int64_t 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) { @@ -233,6 +291,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; } @@ -247,6 +306,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; @@ -266,7 +326,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; } @@ -300,6 +362,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; @@ -322,6 +385,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 */ @@ -458,6 +522,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 */ @@ -492,6 +557,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 0a27d2d..b4d2f48 100644 --- a/hmp.c +++ b/hmp.c @@ -166,6 +166,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 a892ae1..f7e5855 100644 --- a/migration.c +++ b/migration.c @@ -158,6 +158,8 @@ MigrationInfo *qmp_query_migrate(Error **errp) 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; @@ -166,6 +168,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++) { @@ -179,6 +191,32 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->params->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"); break; diff --git a/migration.h b/migration.h index 83dba4a..c081d37 100644 --- a/migration.h +++ b/migration.h @@ -83,6 +83,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 982c93a..bcc1ef7 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -260,10 +260,35 @@ # # @total: total amount of bytes involved in the migration process # -# 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' } } + 'data': {'transferred': 'int', 'remaining': 'int', 'total': '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 @@ -282,12 +307,17 @@ # status, only returned if status is 'active' and it is a block # migration # -# Since: 0.14.0 +# @params: #optional a list describing all the migration capabilities state +# +# @cache: #optional @MigrationStats containing detailed XBZRLE migration +# statistics +# +# Since: 0.14.0, 'params' and 'cache' since 1.2 ## { 'type': 'MigrationInfo', 'data': {'*status': 'str', '*ram': 'MigrationStats', - '*disk': 'MigrationStats', '*params': ['MigrationCapabilityInfo']} } - + '*disk': 'MigrationStats', '*params': ['MigrationCapabilityInfo'], + '*cache': 'CacheStats'} } ## # @query-migrate # diff --git a/qmp-commands.hx b/qmp-commands.hx index 0ca5cbb..0098dc8 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2093,18 +2093,28 @@ 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) - "remaining": amount remaining (json-int) - "total": total (json-int) +- "params": migration capabilites state + - "xbzrle" : on/off (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": {} } +<- { "return": { "params" : { "xbzrle" : "off" } } } 2. Migration is done and has succeeded @@ -2122,6 +2132,7 @@ Examples: <- { "return":{ "status":"active", + "params" : { "xbzrle" : "off" }, "ram":{ "transferred":123, "remaining":123, @@ -2136,6 +2147,7 @@ Examples: <- { "return":{ "status":"active", + "params" : { "xbzrle" : "off" }, "ram":{ "total":1057024, "remaining":1053304, @@ -2149,6 +2161,28 @@ Examples: } } +5. Migration is being performed and XBZRLE is active: + +-> { "execute": "query-migrate" } +<- { + "return":{ + "status":"active", + "params" : { "xbzrle" : "on" }, + "ram":{ + "total":1057024, + "remaining":1053304, + "transferred":3720 + }, + "cache":{ + "cache-size": 1024 + "xbzrle-transferred":20971520, + "xbzrle-pages":2444343, + "xbzrle-cache-miss":2244, + "xbzrle-overflow":34434 + } + } + } + EQMP { -- 1.7.7.6