Commit 76e03000 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Dr. David Alan Gilbert
Browse files

migration: show the statistics of compression 



Currently, it includes:
pages: amount of pages compressed and transferred to the target VM
busy: amount of count that no free thread to compress data
busy-rate: rate of thread busy
compressed-size: amount of bytes after compression
compression-rate: rate of compressed size

Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@tencent.com>
Message-Id: <20180906070101.27280-3-xiaoguangrong@tencent.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 48df9d80

hmp.c

+13 −0
Original line number Diff line number Diff line
@@ -271,6 +271,19 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) 
                       info->xbzrle_cache->overflow);

    }



    if (info->has_compression) {

        monitor_printf(mon, "compression pages: %" PRIu64 " pages\n",

                       info->compression->pages);

        monitor_printf(mon, "compression busy: %" PRIu64 "\n",

                       info->compression->busy);

        monitor_printf(mon, "compression busy rate: %0.2f\n",

                       info->compression->busy_rate);

        monitor_printf(mon, "compressed size: %" PRIu64 "\n",

                       info->compression->compressed_size);

        monitor_printf(mon, "compression rate: %0.2f\n",

                       info->compression->compression_rate);

    }



    if (info->has_cpu_throttle_percentage) {

        monitor_printf(mon, "cpu throttle percentage: %" PRIu64 "\n",

                       info->cpu_throttle_percentage);

migration/migration.c

+12 −0
Original line number Diff line number Diff line
@@ -758,6 +758,18 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) 
        info->xbzrle_cache->overflow = xbzrle_counters.overflow;

    }



    if (migrate_use_compression()) {

        info->has_compression = true;

        info->compression = g_malloc0(sizeof(*info->compression));

        info->compression->pages = compression_counters.pages;

        info->compression->busy = compression_counters.busy;

        info->compression->busy_rate = compression_counters.busy_rate;

        info->compression->compressed_size =

                                    compression_counters.compressed_size;

        info->compression->compression_rate =

                                    compression_counters.compression_rate;

    }



    if (cpu_throttle_active()) {

        info->has_cpu_throttle_percentage = true;

        info->cpu_throttle_percentage = cpu_throttle_get_percentage();

migration/ram.c

+40 −1
Original line number Diff line number Diff line
@@ -301,6 +301,15 @@ struct RAMState { 
    uint64_t num_dirty_pages_period;

    /* xbzrle misses since the beginning of the period */

    uint64_t xbzrle_cache_miss_prev;



    /* compression statistics since the beginning of the period */

    /* amount of count that no free thread to compress data */

    uint64_t compress_thread_busy_prev;

    /* amount bytes after compression */

    uint64_t compressed_size_prev;

    /* amount of compressed pages */

    uint64_t compress_pages_prev;



    /* total handled target pages at the beginning of period */

    uint64_t target_page_count_prev;

    /* total handled target pages since start */
@@ -338,6 +347,8 @@ struct PageSearchStatus { 
};

typedef struct PageSearchStatus PageSearchStatus;



CompressionStats compression_counters;



struct CompressParam {

    bool done;

    bool quit;
@@ -1593,6 +1604,7 @@ uint64_t ram_pagesize_summary(void) 
static void migration_update_rates(RAMState *rs, int64_t end_time)

{

    uint64_t page_count = rs->target_page_count - rs->target_page_count_prev;

    double compressed_size;



    /* calculate period counters */

    ram_counters.dirty_pages_rate = rs->num_dirty_pages_period * 1000
@@ -1607,6 +1619,26 @@ static void migration_update_rates(RAMState *rs, int64_t end_time) 
            rs->xbzrle_cache_miss_prev) / page_count;

        rs->xbzrle_cache_miss_prev = xbzrle_counters.cache_miss;

    }



    if (migrate_use_compression()) {

        compression_counters.busy_rate = (double)(compression_counters.busy -

            rs->compress_thread_busy_prev) / page_count;

        rs->compress_thread_busy_prev = compression_counters.busy;



        compressed_size = compression_counters.compressed_size -

                          rs->compressed_size_prev;

        if (compressed_size) {

            double uncompressed_size = (compression_counters.pages -

                                    rs->compress_pages_prev) * TARGET_PAGE_SIZE;



            /* Compression-Ratio = Uncompressed-size / Compressed-size */

            compression_counters.compression_rate =

                                        uncompressed_size / compressed_size;



            rs->compress_pages_prev = compression_counters.pages;

            rs->compressed_size_prev = compression_counters.compressed_size;

        }

    }

}



static void migration_bitmap_sync(RAMState *rs)
@@ -1888,10 +1920,16 @@ exit: 
static void

update_compress_thread_counts(const CompressParam *param, int bytes_xmit)

{

    ram_counters.transferred += bytes_xmit;



    if (param->zero_page) {

        ram_counters.duplicate++;

        return;

    }

    ram_counters.transferred += bytes_xmit;



    /* 8 means a header with RAM_SAVE_FLAG_CONTINUE. */

    compression_counters.compressed_size += bytes_xmit - 8;

    compression_counters.pages++;

}



static void flush_compressed_data(RAMState *rs)
@@ -2264,6 +2302,7 @@ static bool save_compress_page(RAMState *rs, RAMBlock *block, ram_addr_t offset) 
        return true;

    }



    compression_counters.busy++;

    return false;

}

migration/ram.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 


extern MigrationStats ram_counters;

extern XBZRLECacheStats xbzrle_counters;

extern CompressionStats compression_counters;



int xbzrle_cache_resize(int64_t new_size, Error **errp);

uint64_t ram_bytes_remaining(void);

qapi/migration.json

+25 −1
Original line number Diff line number Diff line
@@ -75,6 +75,27 @@ 
           'cache-miss': 'int', 'cache-miss-rate': 'number',

           'overflow': 'int' } }



##

# @CompressionStats:

#

# Detailed migration compression statistics

#

# @pages: amount of pages compressed and transferred to the target VM

#

# @busy: count of times that no free thread was available to compress data

#

# @busy-rate: rate of thread busy

#

# @compressed-size: amount of bytes after compression

#

# @compression-rate: rate of compressed size

#

# Since: 3.1

##

{ 'struct': 'CompressionStats',

  'data': {'pages': 'int', 'busy': 'int', 'busy-rate': 'number',

	   'compressed-size': 'int', 'compression-rate': 'number' } }



##

# @MigrationStatus:

#
@@ -172,6 +193,8 @@ 
#           only present when the postcopy-blocktime migration capability

#           is enabled. (Since 3.0)

#

# @compression: migration compression statistics, only returned if compression

#           feature is on and status is 'active' or 'completed' (Since 3.1)

#

# Since: 0.14.0

##
@@ -186,7 +209,8 @@ 
           '*cpu-throttle-percentage': 'int',

           '*error-desc': 'str',

           '*postcopy-blocktime' : 'uint32',

           '*postcopy-vcpu-blocktime': ['uint32']} }

           '*postcopy-vcpu-blocktime': ['uint32'],

           '*compression': 'CompressionStats'} }



##

# @query-migrate: