Postcopy: Add stats on page requests

On the source, add a count of page requests received from the
destination.

Signed-off-by: Dr. David Alan Gilbert <[email protected]>
Reviewed-by: Eric Blake <[email protected]>
Reviewed-by: Denis V. Lunev <[email protected]>
Message-id: 1465816605[email protected]
Message-Id: <1465816605[email protected]>
Signed-off-by: Amit Shah <[email protected]>

diff --git a/hmp.c b/hmp.c
index a4b1d3d220840536a07b0edc70149395ffc14464..4b8e9878b17c45f4ce1fbb26e3cc6c5b1d17b0a4 100644 (file)
--- a/hmp.c
+++ b/hmp.c
@@ -217,6 +217,10 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
             monitor_printf(mon, "dirty pages rate: %" PRIu64 " pages\n",
                            info->ram->dirty_pages_rate);
         }
+        if (info->ram->postcopy_requests) {
+            monitor_printf(mon, "postcopy request count: %" PRIu64 "\n",
+                           info->ram->postcopy_requests);
+        }
     }
 
     if (info->has_disk) {

diff --git a/include/migration/migration.h b/include/migration/migration.h
index 13b12b7e87530f3b86122c992356af8e67996e8c..836c4e3500b49313f6c54bd82a8965ca1d4714d7 100644 (file)
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -160,6 +160,8 @@ struct MigrationState
     int64_t xbzrle_cache_size;
     int64_t setup_time;
     int64_t dirty_sync_count;
+    /* Count of requests incoming from destination */
+    int64_t postcopy_requests;
 
     /* Flag set once the migration has been asked to enter postcopy */
     bool start_postcopy;

diff --git a/migration/migration.c b/migration/migration.c
index 19549871987cd96fadb1d422b67d74e340ced463..7bc406a870569566fcdb6cf9b493d7452b11391f 100644 (file)
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -614,6 +614,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
     info->ram->normal_bytes = norm_mig_bytes_transferred();
     info->ram->mbps = s->mbps;
     info->ram->dirty_sync_count = s->dirty_sync_count;
+    info->ram->postcopy_requests = s->postcopy_requests;
 
     if (s->state != MIGRATION_STATUS_COMPLETED) {
         info->ram->remaining = ram_bytes_remaining();
@@ -991,6 +992,7 @@ MigrationState *migrate_init(const MigrationParams *params)
     s->dirty_sync_count = 0;
     s->start_postcopy = false;
     s->postcopy_after_devices = false;
+    s->postcopy_requests = 0;
     s->migration_thread_running = false;
     s->last_req_rb = NULL;
     error_free(s->error);

diff --git a/migration/ram.c b/migration/ram.c
index 5f929d6195d3a852f10be3918903901a44b9f99c..42fb8ac6d6b663a0d918ff0290aceae37405a48b 100644 (file)
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1169,6 +1169,7 @@ int ram_save_queue_pages(MigrationState *ms, const char *rbname,
 {
     RAMBlock *ramblock;
 
+    ms->postcopy_requests++;
     rcu_read_lock();
     if (!rbname) {
         /* Reuse last RAMBlock */

diff --git a/qapi-schema.json b/qapi-schema.json
index 48c3a6f5cd8c44a6b01a047274c1247fbd6dce74..af0129a8d2c95f669cf6cdd6fccd6136f007703f 100644 (file)
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -382,13 +382,17 @@
 #
 # @dirty-sync-count: number of times that dirty ram was synchronized (since 2.1)
 #
+# @postcopy-requests: The number of page requests received from the destination
+#        (since 2.7)
+#
 # Since: 0.14.0
 ##
 { 'struct': 'MigrationStats',
   'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' ,
            'duplicate': 'int', 'skipped': 'int', 'normal': 'int',
            'normal-bytes': 'int', 'dirty-pages-rate' : 'int',
-           'mbps' : 'number', 'dirty-sync-count' : 'int' } }
+           'mbps' : 'number', 'dirty-sync-count' : 'int',
+           'postcopy-requests' : 'int' } }
 
 ##
 # @XBZRLECacheStats