Migraiton Pull request (20230428 take 2)

Hi
 
 Dropped the compression cleanups to see if we find what is going on.
 
 Please apply.
 
 Later, Juan.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEGJn/jt6/WMzuA0uC9IfvGFhy1yMFAmRSKKQACgkQ9IfvGFhy
 1yN1Tw//ZBExxagVY5Uy7oUp+YBBexK3PkcWrU5xNVIu1SiFr654AWWO6DUoMIde
 pb0EsM1rU/7iSPw3PYOPJDAO2eHmzeeLxGTCbR98R4YSHgr5WBHcRmzKnY5irKIm
 JDn4xxyp8+grCcMTi5nJ6CMVDvtL8CAA1fZfn2zzJimJkuSRkTAYgGw1fIXXut05
 911eOccmA3mUFsU81bOXLvWhmrPCyy5m2vrLhIhwEJGTUdVdQlk72at7aWq1pu9D
 WIZJG6hI/eGZW5DX6Xbj7tfLW2MeqBFpFijuCNsxU4jAGSoBHR7And9YO/i7kDCp
 3RlQyL/sVf6NZ7STEXrLEIh7g7nH05AF3ZuuwBn8TN2Vf9NkVPNFUygdmwukzHTj
 i8/VoC/gSoVfnA4JXVhnVtzHwRpgzP6rlKSeHEW1IMMnKC0xvmss6Mq7+z9dZxx+
 /XbxdjjwmsjnYUxH+BNwUVX2PjPguF5xib8M1QhsQNGOZ2Z+4RuWj4h/ItWsGqVI
 jjI3sVPY6cw8aiSXiSL2AO9Hde9KRIkcITby/zembSkvfsRR3kIWcMNJsteAP4UI
 t6MQSGsFRjMUKeIyArU/ES3iYvnBXi9LSwOR94S9KR1vEPxmhefoGu5wnwJ0is3C
 nAJPaHkQCY4JCCsyNO18hpSStOlNH300fIlMoB+ftcbn+fnpeOo=
 =iGGF
 -----END PGP SIGNATURE-----

Merge tag 'migration-20230428-pull-request' of https://gitlab.com/juan.quintela/qemu into staging

Migraiton Pull request (20230428 take 2)

Hi

Dropped the compression cleanups to see if we find what is going on.

Please apply.

Later, Juan.

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEGJn/jt6/WMzuA0uC9IfvGFhy1yMFAmRSKKQACgkQ9IfvGFhy
# 1yN1Tw//ZBExxagVY5Uy7oUp+YBBexK3PkcWrU5xNVIu1SiFr654AWWO6DUoMIde
# pb0EsM1rU/7iSPw3PYOPJDAO2eHmzeeLxGTCbR98R4YSHgr5WBHcRmzKnY5irKIm
# JDn4xxyp8+grCcMTi5nJ6CMVDvtL8CAA1fZfn2zzJimJkuSRkTAYgGw1fIXXut05
# 911eOccmA3mUFsU81bOXLvWhmrPCyy5m2vrLhIhwEJGTUdVdQlk72at7aWq1pu9D
# WIZJG6hI/eGZW5DX6Xbj7tfLW2MeqBFpFijuCNsxU4jAGSoBHR7And9YO/i7kDCp
# 3RlQyL/sVf6NZ7STEXrLEIh7g7nH05AF3ZuuwBn8TN2Vf9NkVPNFUygdmwukzHTj
# i8/VoC/gSoVfnA4JXVhnVtzHwRpgzP6rlKSeHEW1IMMnKC0xvmss6Mq7+z9dZxx+
# /XbxdjjwmsjnYUxH+BNwUVX2PjPguF5xib8M1QhsQNGOZ2Z+4RuWj4h/ItWsGqVI
# jjI3sVPY6cw8aiSXiSL2AO9Hde9KRIkcITby/zembSkvfsRR3kIWcMNJsteAP4UI
# t6MQSGsFRjMUKeIyArU/ES3iYvnBXi9LSwOR94S9KR1vEPxmhefoGu5wnwJ0is3C
# nAJPaHkQCY4JCCsyNO18hpSStOlNH300fIlMoB+ftcbn+fnpeOo=
# =iGGF
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 03 May 2023 10:25:56 AM BST
# gpg:                using RSA key 1899FF8EDEBF58CCEE034B82F487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>" [undefined]
# gpg:                 aka "Juan Quintela <quintela@trasno.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* tag 'migration-20230428-pull-request' of https://gitlab.com/juan.quintela/qemu:
  migration: Drop unused parameter for migration_tls_client_create()
  migration: Drop unused parameter for migration_tls_get_creds()
  migration/rdma: Unfold last user of acct_update_position()
  migration/rdma: Split the zero page case from acct_update_position
  migration: Rename RAMStats to MigrationAtomicStats
  migration: Rename ram_counters to mig_stats
  migration: Move ram_stats to its own file migration-stats.[ch]
  multifd: We already account for this packet on the multifd thread

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-05-03 10:29:30 +01:00
commit 044f8cf70a
12 changed files with 120 additions and 100 deletions

View File

@ -19,6 +19,7 @@ softmmu_ss.add(files(
'fd.c', 'fd.c',
'global_state.c', 'global_state.c',
'migration-hmp-cmds.c', 'migration-hmp-cmds.c',
'migration-stats.c',
'migration.c', 'migration.c',
'multifd.c', 'multifd.c',
'multifd-zlib.c', 'multifd-zlib.c',

View File

@ -0,0 +1,17 @@
/*
* Migration stats
*
* Copyright (c) 2012-2023 Red Hat Inc
*
* Authors:
* Juan Quintela <quintela@redhat.com>
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
#include "qemu/stats64.h"
#include "migration-stats.h"
MigrationAtomicStats mig_stats;

View File

@ -0,0 +1,41 @@
/*
* Migration stats
*
* Copyright (c) 2012-2023 Red Hat Inc
*
* Authors:
* Juan Quintela <quintela@redhat.com>
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#ifndef QEMU_MIGRATION_STATS_H
#define QEMU_MIGRATION_STATS_H
#include "qemu/stats64.h"
/*
* These are the ram migration statistic counters. It is loosely
* based on MigrationStats. We change to Stat64 any counter that
* needs to be updated using atomic ops (can be accessed by more than
* one thread).
*/
typedef struct {
Stat64 dirty_bytes_last_sync;
Stat64 dirty_pages_rate;
Stat64 dirty_sync_count;
Stat64 dirty_sync_missed_zero_copy;
Stat64 downtime_bytes;
Stat64 zero_pages;
Stat64 multifd_bytes;
Stat64 normal_pages;
Stat64 postcopy_bytes;
Stat64 postcopy_requests;
Stat64 precopy_bytes;
Stat64 transferred;
} MigrationAtomicStats;
extern MigrationAtomicStats mig_stats;
#endif

View File

@ -29,6 +29,7 @@
#include "migration/global_state.h" #include "migration/global_state.h"
#include "migration/misc.h" #include "migration/misc.h"
#include "migration.h" #include "migration.h"
#include "migration-stats.h"
#include "savevm.h" #include "savevm.h"
#include "qemu-file.h" #include "qemu-file.h"
#include "channel.h" #include "channel.h"
@ -908,26 +909,26 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
size_t page_size = qemu_target_page_size(); size_t page_size = qemu_target_page_size();
info->ram = g_malloc0(sizeof(*info->ram)); info->ram = g_malloc0(sizeof(*info->ram));
info->ram->transferred = stat64_get(&ram_counters.transferred); info->ram->transferred = stat64_get(&mig_stats.transferred);
info->ram->total = ram_bytes_total(); info->ram->total = ram_bytes_total();
info->ram->duplicate = stat64_get(&ram_counters.zero_pages); info->ram->duplicate = stat64_get(&mig_stats.zero_pages);
/* legacy value. It is not used anymore */ /* legacy value. It is not used anymore */
info->ram->skipped = 0; info->ram->skipped = 0;
info->ram->normal = stat64_get(&ram_counters.normal_pages); info->ram->normal = stat64_get(&mig_stats.normal_pages);
info->ram->normal_bytes = info->ram->normal * page_size; info->ram->normal_bytes = info->ram->normal * page_size;
info->ram->mbps = s->mbps; info->ram->mbps = s->mbps;
info->ram->dirty_sync_count = info->ram->dirty_sync_count =
stat64_get(&ram_counters.dirty_sync_count); stat64_get(&mig_stats.dirty_sync_count);
info->ram->dirty_sync_missed_zero_copy = info->ram->dirty_sync_missed_zero_copy =
stat64_get(&ram_counters.dirty_sync_missed_zero_copy); stat64_get(&mig_stats.dirty_sync_missed_zero_copy);
info->ram->postcopy_requests = info->ram->postcopy_requests =
stat64_get(&ram_counters.postcopy_requests); stat64_get(&mig_stats.postcopy_requests);
info->ram->page_size = page_size; info->ram->page_size = page_size;
info->ram->multifd_bytes = stat64_get(&ram_counters.multifd_bytes); info->ram->multifd_bytes = stat64_get(&mig_stats.multifd_bytes);
info->ram->pages_per_second = s->pages_per_second; info->ram->pages_per_second = s->pages_per_second;
info->ram->precopy_bytes = stat64_get(&ram_counters.precopy_bytes); info->ram->precopy_bytes = stat64_get(&mig_stats.precopy_bytes);
info->ram->downtime_bytes = stat64_get(&ram_counters.downtime_bytes); info->ram->downtime_bytes = stat64_get(&mig_stats.downtime_bytes);
info->ram->postcopy_bytes = stat64_get(&ram_counters.postcopy_bytes); info->ram->postcopy_bytes = stat64_get(&mig_stats.postcopy_bytes);
if (migrate_xbzrle()) { if (migrate_xbzrle()) {
info->xbzrle_cache = g_malloc0(sizeof(*info->xbzrle_cache)); info->xbzrle_cache = g_malloc0(sizeof(*info->xbzrle_cache));
@ -959,7 +960,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
if (s->state != MIGRATION_STATUS_COMPLETED) { if (s->state != MIGRATION_STATUS_COMPLETED) {
info->ram->remaining = ram_bytes_remaining(); info->ram->remaining = ram_bytes_remaining();
info->ram->dirty_pages_rate = info->ram->dirty_pages_rate =
stat64_get(&ram_counters.dirty_pages_rate); stat64_get(&mig_stats.dirty_pages_rate);
} }
} }
@ -1612,10 +1613,10 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
migrate_init(s); migrate_init(s);
/* /*
* set ram_counters compression_counters memory to zero for a * set mig_stats compression_counters memory to zero for a
* new migration * new migration
*/ */
memset(&ram_counters, 0, sizeof(ram_counters)); memset(&mig_stats, 0, sizeof(mig_stats));
memset(&compression_counters, 0, sizeof(compression_counters)); memset(&compression_counters, 0, sizeof(compression_counters));
return true; return true;
@ -2626,7 +2627,7 @@ static MigThrError migration_detect_error(MigrationState *s)
static uint64_t migration_total_bytes(MigrationState *s) static uint64_t migration_total_bytes(MigrationState *s)
{ {
return qemu_file_total_transferred(s->to_dst_file) + return qemu_file_total_transferred(s->to_dst_file) +
stat64_get(&ram_counters.multifd_bytes); stat64_get(&mig_stats.multifd_bytes);
} }
static void migration_calculate_complete(MigrationState *s) static void migration_calculate_complete(MigrationState *s)
@ -2690,10 +2691,10 @@ static void migration_update_counters(MigrationState *s,
* if we haven't sent anything, we don't want to * if we haven't sent anything, we don't want to
* recalculate. 10000 is a small enough number for our purposes * recalculate. 10000 is a small enough number for our purposes
*/ */
if (stat64_get(&ram_counters.dirty_pages_rate) && if (stat64_get(&mig_stats.dirty_pages_rate) &&
transferred > 10000) { transferred > 10000) {
s->expected_downtime = s->expected_downtime =
stat64_get(&ram_counters.dirty_bytes_last_sync) / bandwidth; stat64_get(&mig_stats.dirty_bytes_last_sync) / bandwidth;
} }
qemu_file_reset_rate_limit(s->to_dst_file); qemu_file_reset_rate_limit(s->to_dst_file);

View File

@ -19,6 +19,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "ram.h" #include "ram.h"
#include "migration.h" #include "migration.h"
#include "migration-stats.h"
#include "socket.h" #include "socket.h"
#include "tls.h" #include "tls.h"
#include "qemu-file.h" #include "qemu-file.h"
@ -433,8 +434,8 @@ static int multifd_send_pages(QEMUFile *f)
transferred = ((uint64_t) pages->num) * p->page_size + p->packet_len; transferred = ((uint64_t) pages->num) * p->page_size + p->packet_len;
qemu_file_acct_rate_limit(f, transferred); qemu_file_acct_rate_limit(f, transferred);
qemu_mutex_unlock(&p->mutex); qemu_mutex_unlock(&p->mutex);
stat64_add(&ram_counters.transferred, transferred); stat64_add(&mig_stats.transferred, transferred);
stat64_add(&ram_counters.multifd_bytes, transferred); stat64_add(&mig_stats.multifd_bytes, transferred);
qemu_sem_post(&p->sem); qemu_sem_post(&p->sem);
return 1; return 1;
@ -576,7 +577,7 @@ static int multifd_zero_copy_flush(QIOChannel *c)
return -1; return -1;
} }
if (ret == 1) { if (ret == 1) {
stat64_add(&ram_counters.dirty_sync_missed_zero_copy, 1); stat64_add(&mig_stats.dirty_sync_missed_zero_copy, 1);
} }
return ret; return ret;
@ -626,10 +627,7 @@ int multifd_send_sync_main(QEMUFile *f)
p->packet_num = multifd_send_state->packet_num++; p->packet_num = multifd_send_state->packet_num++;
p->flags |= MULTIFD_FLAG_SYNC; p->flags |= MULTIFD_FLAG_SYNC;
p->pending_job++; p->pending_job++;
qemu_file_acct_rate_limit(f, p->packet_len);
qemu_mutex_unlock(&p->mutex); qemu_mutex_unlock(&p->mutex);
stat64_add(&ram_counters.transferred, p->packet_len);
stat64_add(&ram_counters.multifd_bytes, p->packet_len);
qemu_sem_post(&p->sem); qemu_sem_post(&p->sem);
} }
for (i = 0; i < migrate_multifd_channels(); i++) { for (i = 0; i < migrate_multifd_channels(); i++) {
@ -823,7 +821,7 @@ static void multifd_tls_channel_connect(MultiFDSendParams *p,
const char *hostname = s->hostname; const char *hostname = s->hostname;
QIOChannelTLS *tioc; QIOChannelTLS *tioc;
tioc = migration_tls_client_create(s, ioc, hostname, errp); tioc = migration_tls_client_create(ioc, hostname, errp);
if (!tioc) { if (!tioc) {
return; return;
} }

View File

@ -1632,7 +1632,7 @@ postcopy_preempt_send_channel_new(QIOTask *task, gpointer opaque)
} }
if (migrate_channel_requires_tls_upgrade(ioc)) { if (migrate_channel_requires_tls_upgrade(ioc)) {
tioc = migration_tls_client_create(s, ioc, s->hostname, &local_err); tioc = migration_tls_client_create(ioc, s->hostname, &local_err);
if (!tioc) { if (!tioc) {
goto out; goto out;
} }

View File

@ -36,6 +36,7 @@
#include "xbzrle.h" #include "xbzrle.h"
#include "ram.h" #include "ram.h"
#include "migration.h" #include "migration.h"
#include "migration-stats.h"
#include "migration/register.h" #include "migration/register.h"
#include "migration/misc.h" #include "migration/misc.h"
#include "qemu-file.h" #include "qemu-file.h"
@ -460,18 +461,16 @@ uint64_t ram_bytes_remaining(void)
0; 0;
} }
RAMStats ram_counters;
void ram_transferred_add(uint64_t bytes) void ram_transferred_add(uint64_t bytes)
{ {
if (runstate_is_running()) { if (runstate_is_running()) {
stat64_add(&ram_counters.precopy_bytes, bytes); stat64_add(&mig_stats.precopy_bytes, bytes);
} else if (migration_in_postcopy()) { } else if (migration_in_postcopy()) {
stat64_add(&ram_counters.postcopy_bytes, bytes); stat64_add(&mig_stats.postcopy_bytes, bytes);
} else { } else {
stat64_add(&ram_counters.downtime_bytes, bytes); stat64_add(&mig_stats.downtime_bytes, bytes);
} }
stat64_add(&ram_counters.transferred, bytes); stat64_add(&mig_stats.transferred, bytes);
} }
struct MigrationOps { struct MigrationOps {
@ -745,7 +744,7 @@ void mig_throttle_counter_reset(void)
rs->time_last_bitmap_sync = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); rs->time_last_bitmap_sync = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
rs->num_dirty_pages_period = 0; rs->num_dirty_pages_period = 0;
rs->bytes_xfer_prev = stat64_get(&ram_counters.transferred); rs->bytes_xfer_prev = stat64_get(&mig_stats.transferred);
} }
/** /**
@ -765,7 +764,7 @@ static void xbzrle_cache_zero_page(RAMState *rs, ram_addr_t current_addr)
/* We don't care if this fails to allocate a new cache page /* We don't care if this fails to allocate a new cache page
* as long as it updated an old one */ * as long as it updated an old one */
cache_insert(XBZRLE.cache, current_addr, XBZRLE.zero_target_page, cache_insert(XBZRLE.cache, current_addr, XBZRLE.zero_target_page,
stat64_get(&ram_counters.dirty_sync_count)); stat64_get(&mig_stats.dirty_sync_count));
} }
#define ENCODING_FLAG_XBZRLE 0x1 #define ENCODING_FLAG_XBZRLE 0x1
@ -791,7 +790,7 @@ static int save_xbzrle_page(RAMState *rs, PageSearchStatus *pss,
int encoded_len = 0, bytes_xbzrle; int encoded_len = 0, bytes_xbzrle;
uint8_t *prev_cached_page; uint8_t *prev_cached_page;
QEMUFile *file = pss->pss_channel; QEMUFile *file = pss->pss_channel;
uint64_t generation = stat64_get(&ram_counters.dirty_sync_count); uint64_t generation = stat64_get(&mig_stats.dirty_sync_count);
if (!cache_is_cached(XBZRLE.cache, current_addr, generation)) { if (!cache_is_cached(XBZRLE.cache, current_addr, generation)) {
xbzrle_counters.cache_miss++; xbzrle_counters.cache_miss++;
@ -1119,8 +1118,8 @@ uint64_t ram_pagesize_summary(void)
uint64_t ram_get_total_transferred_pages(void) uint64_t ram_get_total_transferred_pages(void)
{ {
return stat64_get(&ram_counters.normal_pages) + return stat64_get(&mig_stats.normal_pages) +
stat64_get(&ram_counters.zero_pages) + stat64_get(&mig_stats.zero_pages) +
compression_counters.pages + xbzrle_counters.pages; compression_counters.pages + xbzrle_counters.pages;
} }
@ -1130,7 +1129,7 @@ static void migration_update_rates(RAMState *rs, int64_t end_time)
double compressed_size; double compressed_size;
/* calculate period counters */ /* calculate period counters */
stat64_set(&ram_counters.dirty_pages_rate, stat64_set(&mig_stats.dirty_pages_rate,
rs->num_dirty_pages_period * 1000 / rs->num_dirty_pages_period * 1000 /
(end_time - rs->time_last_bitmap_sync)); (end_time - rs->time_last_bitmap_sync));
@ -1181,7 +1180,7 @@ static void migration_trigger_throttle(RAMState *rs)
{ {
uint64_t threshold = migrate_throttle_trigger_threshold(); uint64_t threshold = migrate_throttle_trigger_threshold();
uint64_t bytes_xfer_period = uint64_t bytes_xfer_period =
stat64_get(&ram_counters.transferred) - rs->bytes_xfer_prev; stat64_get(&mig_stats.transferred) - rs->bytes_xfer_prev;
uint64_t bytes_dirty_period = rs->num_dirty_pages_period * TARGET_PAGE_SIZE; uint64_t bytes_dirty_period = rs->num_dirty_pages_period * TARGET_PAGE_SIZE;
uint64_t bytes_dirty_threshold = bytes_xfer_period * threshold / 100; uint64_t bytes_dirty_threshold = bytes_xfer_period * threshold / 100;
@ -1210,7 +1209,7 @@ static void migration_bitmap_sync(RAMState *rs)
RAMBlock *block; RAMBlock *block;
int64_t end_time; int64_t end_time;
stat64_add(&ram_counters.dirty_sync_count, 1); stat64_add(&mig_stats.dirty_sync_count, 1);
if (!rs->time_last_bitmap_sync) { if (!rs->time_last_bitmap_sync) {
rs->time_last_bitmap_sync = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); rs->time_last_bitmap_sync = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
@ -1224,7 +1223,7 @@ static void migration_bitmap_sync(RAMState *rs)
RAMBLOCK_FOREACH_NOT_IGNORED(block) { RAMBLOCK_FOREACH_NOT_IGNORED(block) {
ramblock_sync_dirty_bitmap(rs, block); ramblock_sync_dirty_bitmap(rs, block);
} }
stat64_set(&ram_counters.dirty_bytes_last_sync, ram_bytes_remaining()); stat64_set(&mig_stats.dirty_bytes_last_sync, ram_bytes_remaining());
} }
qemu_mutex_unlock(&rs->bitmap_mutex); qemu_mutex_unlock(&rs->bitmap_mutex);
@ -1244,10 +1243,10 @@ static void migration_bitmap_sync(RAMState *rs)
/* reset period counters */ /* reset period counters */
rs->time_last_bitmap_sync = end_time; rs->time_last_bitmap_sync = end_time;
rs->num_dirty_pages_period = 0; rs->num_dirty_pages_period = 0;
rs->bytes_xfer_prev = stat64_get(&ram_counters.transferred); rs->bytes_xfer_prev = stat64_get(&mig_stats.transferred);
} }
if (migrate_events()) { if (migrate_events()) {
uint64_t generation = stat64_get(&ram_counters.dirty_sync_count); uint64_t generation = stat64_get(&mig_stats.dirty_sync_count);
qapi_event_send_migration_pass(generation); qapi_event_send_migration_pass(generation);
} }
} }
@ -1321,7 +1320,7 @@ static int save_zero_page(PageSearchStatus *pss, QEMUFile *f, RAMBlock *block,
int len = save_zero_page_to_file(pss, f, block, offset); int len = save_zero_page_to_file(pss, f, block, offset);
if (len) { if (len) {
stat64_add(&ram_counters.zero_pages, 1); stat64_add(&mig_stats.zero_pages, 1);
ram_transferred_add(len); ram_transferred_add(len);
return 1; return 1;
} }
@ -1358,9 +1357,9 @@ static bool control_save_page(PageSearchStatus *pss, RAMBlock *block,
} }
if (bytes_xmit > 0) { if (bytes_xmit > 0) {
stat64_add(&ram_counters.normal_pages, 1); stat64_add(&mig_stats.normal_pages, 1);
} else if (bytes_xmit == 0) { } else if (bytes_xmit == 0) {
stat64_add(&ram_counters.zero_pages, 1); stat64_add(&mig_stats.zero_pages, 1);
} }
return true; return true;
@ -1392,7 +1391,7 @@ static int save_normal_page(PageSearchStatus *pss, RAMBlock *block,
qemu_put_buffer(file, buf, TARGET_PAGE_SIZE); qemu_put_buffer(file, buf, TARGET_PAGE_SIZE);
} }
ram_transferred_add(TARGET_PAGE_SIZE); ram_transferred_add(TARGET_PAGE_SIZE);
stat64_add(&ram_counters.normal_pages, 1); stat64_add(&mig_stats.normal_pages, 1);
return 1; return 1;
} }
@ -1448,7 +1447,7 @@ static int ram_save_multifd_page(QEMUFile *file, RAMBlock *block,
if (multifd_queue_page(file, block, offset) < 0) { if (multifd_queue_page(file, block, offset) < 0) {
return -1; return -1;
} }
stat64_add(&ram_counters.normal_pages, 1); stat64_add(&mig_stats.normal_pages, 1);
return 1; return 1;
} }
@ -1487,7 +1486,7 @@ update_compress_thread_counts(const CompressParam *param, int bytes_xmit)
ram_transferred_add(bytes_xmit); ram_transferred_add(bytes_xmit);
if (param->zero_page) { if (param->zero_page) {
stat64_add(&ram_counters.zero_pages, 1); stat64_add(&mig_stats.zero_pages, 1);
return; return;
} }
@ -2180,7 +2179,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len)
RAMBlock *ramblock; RAMBlock *ramblock;
RAMState *rs = ram_state; RAMState *rs = ram_state;
stat64_add(&ram_counters.postcopy_requests, 1); stat64_add(&mig_stats.postcopy_requests, 1);
RCU_READ_LOCK_GUARD(); RCU_READ_LOCK_GUARD();
if (!rbname) { if (!rbname) {
@ -2630,19 +2629,6 @@ static int ram_find_and_save_block(RAMState *rs)
return pages; return pages;
} }
void acct_update_position(QEMUFile *f, size_t size, bool zero)
{
uint64_t pages = size / TARGET_PAGE_SIZE;
if (zero) {
stat64_add(&ram_counters.zero_pages, pages);
} else {
stat64_add(&ram_counters.normal_pages, pages);
ram_transferred_add(size);
qemu_file_credit_transfer(f, size);
}
}
static uint64_t ram_bytes_total_with_ignored(void) static uint64_t ram_bytes_total_with_ignored(void)
{ {
RAMBlock *block; RAMBlock *block;

View File

@ -32,30 +32,7 @@
#include "qapi/qapi-types-migration.h" #include "qapi/qapi-types-migration.h"
#include "exec/cpu-common.h" #include "exec/cpu-common.h"
#include "io/channel.h" #include "io/channel.h"
#include "qemu/stats64.h"
/*
* These are the ram migration statistic counters. It is loosely
* based on MigrationStats. We change to Stat64 any counter that
* needs to be updated using atomic ops (can be accessed by more than
* one thread).
*/
typedef struct {
Stat64 dirty_bytes_last_sync;
Stat64 dirty_pages_rate;
Stat64 dirty_sync_count;
Stat64 dirty_sync_missed_zero_copy;
Stat64 downtime_bytes;
Stat64 zero_pages;
Stat64 multifd_bytes;
Stat64 normal_pages;
Stat64 postcopy_bytes;
Stat64 postcopy_requests;
Stat64 precopy_bytes;
Stat64 transferred;
} RAMStats;
extern RAMStats ram_counters;
extern XBZRLECacheStats xbzrle_counters; extern XBZRLECacheStats xbzrle_counters;
extern CompressionStats compression_counters; extern CompressionStats compression_counters;
@ -76,7 +53,6 @@ void mig_throttle_counter_reset(void);
uint64_t ram_pagesize_summary(void); uint64_t ram_pagesize_summary(void);
int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len); int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len);
void acct_update_position(QEMUFile *f, size_t size, bool zero);
void ram_postcopy_migrated_memory_release(MigrationState *ms); void ram_postcopy_migrated_memory_release(MigrationState *ms);
/* For outgoing discard bitmap */ /* For outgoing discard bitmap */
void ram_postcopy_send_discard_bitmap(MigrationState *ms); void ram_postcopy_send_discard_bitmap(MigrationState *ms);

View File

@ -17,8 +17,10 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "exec/target_page.h"
#include "rdma.h" #include "rdma.h"
#include "migration.h" #include "migration.h"
#include "migration-stats.h"
#include "qemu-file.h" #include "qemu-file.h"
#include "ram.h" #include "ram.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
@ -2120,7 +2122,8 @@ retry:
return -EIO; return -EIO;
} }
acct_update_position(f, sge.length, true); stat64_add(&mig_stats.zero_pages,
sge.length / qemu_target_page_size());
return 1; return 1;
} }
@ -2228,7 +2231,9 @@ retry:
} }
set_bit(chunk, block->transit_bitmap); set_bit(chunk, block->transit_bitmap);
acct_update_position(f, sge.length, false); stat64_add(&mig_stats.normal_pages, sge.length / qemu_target_page_size());
ram_transferred_add(sge.length);
qemu_file_credit_transfer(f, sge.length);
rdma->total_writes++; rdma->total_writes++;
return 0; return 0;

View File

@ -31,6 +31,7 @@
#include "net/net.h" #include "net/net.h"
#include "migration.h" #include "migration.h"
#include "migration/snapshot.h" #include "migration/snapshot.h"
#include "migration-stats.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "migration/misc.h" #include "migration/misc.h"
#include "migration/register.h" #include "migration/register.h"
@ -1621,7 +1622,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
} }
migrate_init(ms); migrate_init(ms);
memset(&ram_counters, 0, sizeof(ram_counters)); memset(&mig_stats, 0, sizeof(mig_stats));
memset(&compression_counters, 0, sizeof(compression_counters)); memset(&compression_counters, 0, sizeof(compression_counters));
ms->to_dst_file = f; ms->to_dst_file = f;

View File

@ -29,9 +29,7 @@
#include "trace.h" #include "trace.h"
static QCryptoTLSCreds * static QCryptoTLSCreds *
migration_tls_get_creds(MigrationState *s, migration_tls_get_creds(QCryptoTLSCredsEndpoint endpoint, Error **errp)
QCryptoTLSCredsEndpoint endpoint,
Error **errp)
{ {
Object *creds; Object *creds;
const char *tls_creds = migrate_tls_creds(); const char *tls_creds = migrate_tls_creds();
@ -80,8 +78,7 @@ void migration_tls_channel_process_incoming(MigrationState *s,
QCryptoTLSCreds *creds; QCryptoTLSCreds *creds;
QIOChannelTLS *tioc; QIOChannelTLS *tioc;
creds = migration_tls_get_creds( creds = migration_tls_get_creds(QCRYPTO_TLS_CREDS_ENDPOINT_SERVER, errp);
s, QCRYPTO_TLS_CREDS_ENDPOINT_SERVER, errp);
if (!creds) { if (!creds) {
return; return;
} }
@ -117,15 +114,13 @@ static void migration_tls_outgoing_handshake(QIOTask *task,
object_unref(OBJECT(ioc)); object_unref(OBJECT(ioc));
} }
QIOChannelTLS *migration_tls_client_create(MigrationState *s, QIOChannelTLS *migration_tls_client_create(QIOChannel *ioc,
QIOChannel *ioc,
const char *hostname, const char *hostname,
Error **errp) Error **errp)
{ {
QCryptoTLSCreds *creds; QCryptoTLSCreds *creds;
creds = migration_tls_get_creds( creds = migration_tls_get_creds(QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT, errp);
s, QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT, errp);
if (!creds) { if (!creds) {
return NULL; return NULL;
} }
@ -145,7 +140,7 @@ void migration_tls_channel_connect(MigrationState *s,
{ {
QIOChannelTLS *tioc; QIOChannelTLS *tioc;
tioc = migration_tls_client_create(s, ioc, hostname, errp); tioc = migration_tls_client_create(ioc, hostname, errp);
if (!tioc) { if (!tioc) {
return; return;
} }

View File

@ -28,8 +28,7 @@ void migration_tls_channel_process_incoming(MigrationState *s,
QIOChannel *ioc, QIOChannel *ioc,
Error **errp); Error **errp);
QIOChannelTLS *migration_tls_client_create(MigrationState *s, QIOChannelTLS *migration_tls_client_create(QIOChannel *ioc,
QIOChannel *ioc,
const char *hostname, const char *hostname,
Error **errp); Error **errp);