From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Eric Blake" <eblake@redhat.com>,
"Juan Quintela" <quintela@redhat.com>,
"Peter Xu" <peterx@redhat.com>, "John Snow" <jsnow@redhat.com>,
"Yanan Wang" <wangyanan55@huawei.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Leonardo Bras" <leobras@redhat.com>,
"Fam Zheng" <fam@euphon.net>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
"Richard Henderson" <richard.henderson@linaro.org>
Subject: [PULL 18/18] migration: Make dirty_bytes_last_sync atomic
Date: Thu, 27 Apr 2023 17:22:34 +0200 [thread overview]
Message-ID: <20230427152234.25400-19-quintela@redhat.com> (raw)
In-Reply-To: <20230427152234.25400-1-quintela@redhat.com>
As we set its value, it needs to be operated with atomics.
We rename it from remaining to better reflect its meaning.
Statistics always return the real reamaining bytes. This was used to
store how much pages where dirty on the previous generation, so we can
calculate the expected downtime as: dirty_bytes_last_sync /
current_bandwith.
If we use the actual remaining bytes, we would see a very small value
at the end of the iteration.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
I am open to use ram_bytes_remaining() in its only use and be more
"optimistic" about the downtime.
Don't use __nocheck() functions.
Use stat64_get() now that it exists.
---
migration/migration.c | 3 ++-
migration/ram.c | 2 +-
migration/ram.h | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 9367bb2afc..abcadbb619 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2692,7 +2692,8 @@ static void migration_update_counters(MigrationState *s,
*/
if (stat64_get(&ram_counters.dirty_pages_rate) &&
transferred > 10000) {
- s->expected_downtime = ram_counters.remaining / bandwidth;
+ s->expected_downtime =
+ stat64_get(&ram_counters.dirty_bytes_last_sync) / bandwidth;
}
qemu_file_reset_rate_limit(s->to_dst_file);
diff --git a/migration/ram.c b/migration/ram.c
index 5846f6e27f..89be3e3320 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1224,7 +1224,7 @@ static void migration_bitmap_sync(RAMState *rs)
RAMBLOCK_FOREACH_NOT_IGNORED(block) {
ramblock_sync_dirty_bitmap(rs, block);
}
- ram_counters.remaining = ram_bytes_remaining();
+ stat64_set(&ram_counters.dirty_bytes_last_sync, ram_bytes_remaining());
}
qemu_mutex_unlock(&rs->bitmap_mutex);
diff --git a/migration/ram.h b/migration/ram.h
index f189cc79f8..04b05e1b2c 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -41,6 +41,7 @@
* one thread).
*/
typedef struct {
+ Stat64 dirty_bytes_last_sync;
Stat64 dirty_pages_rate;
Stat64 dirty_sync_count;
Stat64 dirty_sync_missed_zero_copy;
@@ -51,7 +52,6 @@ typedef struct {
Stat64 postcopy_bytes;
Stat64 postcopy_requests;
Stat64 precopy_bytes;
- int64_t remaining;
Stat64 transferred;
} RAMStats;
--
2.40.0
next prev parent reply other threads:[~2023-04-27 15:26 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-27 15:22 [PULL 00/18] Migration 20230427 patches Juan Quintela
2023-04-27 15:22 ` [PULL 01/18] multifd: Fix the number of channels ready Juan Quintela
2023-04-27 15:22 ` [PULL 02/18] migration: Create migrate_params_init() function Juan Quintela
2023-04-27 15:22 ` [PULL 03/18] migration: Make all functions check have the same format Juan Quintela
2023-04-27 15:22 ` [PULL 04/18] migration: Create migrate_downtime_limit() function Juan Quintela
2023-04-27 15:22 ` [PULL 05/18] migration: Move migrate_set_block_incremental() to options.c Juan Quintela
2023-04-27 15:22 ` [PULL 06/18] migration: Move block_cleanup_parameters() " Juan Quintela
2023-04-27 15:22 ` [PULL 07/18] migration: Remove MigrationState from block_cleanup_parameters() Juan Quintela
2023-04-27 15:22 ` [PULL 08/18] migration: Create migrate_tls_creds() function Juan Quintela
2023-04-27 15:22 ` [PULL 09/18] migration: Create migrate_tls_authz() function Juan Quintela
2023-04-27 15:22 ` [PULL 10/18] migration: Create migrate_tls_hostname() function Juan Quintela
2023-04-27 15:22 ` [PULL 11/18] migration: Create migrate_block_bitmap_mapping() function Juan Quintela
2023-05-03 14:33 ` Kevin Wolf
2023-05-03 14:53 ` Juan Quintela
2023-05-03 17:10 ` Kevin Wolf
2023-05-03 17:17 ` Juan Quintela
2023-05-03 17:15 ` Juan Quintela
2023-05-03 19:00 ` Vladimir Sementsov-Ogievskiy
2023-05-04 8:38 ` Kevin Wolf
2023-05-04 10:02 ` Juan Quintela
2023-04-27 15:22 ` [PULL 12/18] migration: Move migration_properties to options.c Juan Quintela
2023-04-27 15:22 ` [PULL 13/18] multifd: Create property multifd-flush-after-each-section Juan Quintela
2023-04-27 15:22 ` [PULL 14/18] multifd: Protect multifd_send_sync_main() calls Juan Quintela
2023-04-27 15:22 ` [PULL 15/18] multifd: Only flush once each full round of memory Juan Quintela
2023-04-27 15:22 ` [PULL 16/18] stat64: Add stat64_set() operation Juan Quintela
2023-04-27 15:22 ` [PULL 17/18] migration: Make dirty_pages_rate atomic Juan Quintela
2023-04-27 15:22 ` Juan Quintela [this message]
2023-04-28 9:55 ` [PULL 00/18] Migration 20230427 patches Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230427152234.25400-19-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=fam@euphon.net \
--cc=jsnow@redhat.com \
--cc=leobras@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=stefanha@redhat.com \
--cc=vsementsov@yandex-team.ru \
--cc=wangyanan55@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).