From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: kvm@vger.kernel.org, "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Juan Quintela" <quintela@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Cornelia Huck" <cohuck@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PULL 09/17] migration: Calculate ram size once
Date: Fri, 10 Feb 2023 00:34:18 +0100 [thread overview]
Message-ID: <20230209233426.37811-10-quintela@redhat.com> (raw)
In-Reply-To: <20230209233426.37811-1-quintela@redhat.com>
We are recalculating ram size continously, when we know that it don't
change during migration. Create a field in RAMState to track it.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
migration/ram.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 4dd9cf87ea..d108bf6951 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -330,6 +330,8 @@ struct RAMState {
PageSearchStatus pss[RAM_CHANNEL_MAX];
/* UFFD file descriptor, used in 'write-tracking' migration */
int uffdio_fd;
+ /* total ram size in bytes */
+ uint64_t ram_bytes_total;
/* Last block that we have visited searching for dirty pages */
RAMBlock *last_seen_block;
/* Last dirty target page we have sent */
@@ -2546,7 +2548,7 @@ static int ram_find_and_save_block(RAMState *rs)
int pages = 0;
/* No dirty page as there is zero RAM */
- if (!ram_bytes_total()) {
+ if (!rs->ram_bytes_total) {
return pages;
}
@@ -3009,13 +3011,14 @@ static int ram_state_init(RAMState **rsp)
qemu_mutex_init(&(*rsp)->bitmap_mutex);
qemu_mutex_init(&(*rsp)->src_page_req_mutex);
QSIMPLEQ_INIT(&(*rsp)->src_page_requests);
+ (*rsp)->ram_bytes_total = ram_bytes_total();
/*
* Count the total number of pages used by ram blocks not including any
* gaps due to alignment or unplugs.
* This must match with the initial values of dirty bitmap.
*/
- (*rsp)->migration_dirty_pages = ram_bytes_total() >> TARGET_PAGE_BITS;
+ (*rsp)->migration_dirty_pages = (*rsp)->ram_bytes_total >> TARGET_PAGE_BITS;
ram_state_reset(*rsp);
return 0;
--
2.39.1
next prev parent reply other threads:[~2023-02-09 23:35 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-09 23:34 [PULL 00/17] Migration 20230209 patches Juan Quintela
2023-02-09 23:34 ` [PULL 01/17] migration: Remove spurious files Juan Quintela
2023-02-09 23:34 ` [PULL 02/17] multifd: cleanup the function multifd_channel_connect Juan Quintela
2023-02-09 23:34 ` [PULL 03/17] multifd: Remove some redundant code Juan Quintela
2023-02-09 23:34 ` [PULL 04/17] linux-headers: Update to v6.1 Juan Quintela
2023-02-09 23:34 ` [PULL 05/17] util/userfaultfd: Support /dev/userfaultfd Juan Quintela
2023-02-09 23:34 ` [PULL 06/17] migration: Simplify ram_find_and_save_block() Juan Quintela
2023-02-09 23:34 ` [PULL 07/17] migration: Make find_dirty_block() return a single parameter Juan Quintela
2023-02-09 23:34 ` [PULL 08/17] migration: Split ram_bytes_total_common() in two functions Juan Quintela
2023-02-09 23:34 ` Juan Quintela [this message]
2023-02-09 23:34 ` [PULL 10/17] migration: Make ram_save_target_page() a pointer Juan Quintela
2023-02-09 23:34 ` [PULL 11/17] migration: I messed state_pending_exact/estimate Juan Quintela
2023-02-09 23:34 ` [PULL 12/17] AVX512 support for xbzrle_encode_buffer Juan Quintela
2023-02-10 7:43 ` Thomas Huth
2023-02-09 23:34 ` [PULL 13/17] Update bench-code for addressing CI problem Juan Quintela
2023-02-09 23:34 ` [PULL 14/17] migration: Rework multi-channel checks on URI Juan Quintela
2023-02-09 23:34 ` [PULL 15/17] migration: Cleanup postcopy_preempt_setup() Juan Quintela
2023-02-09 23:34 ` [PULL 16/17] migration: Add a semaphore to count PONGs Juan Quintela
2023-02-09 23:34 ` [PULL 17/17] migration: Postpone postcopy preempt channel to be after main Juan Quintela
2023-02-10 13:36 ` [PULL 00/17] Migration 20230209 patches Peter Maydell
2023-02-10 14:21 ` Juan Quintela
2023-02-10 14:33 ` Peter Maydell
2023-02-10 16:13 ` Juan Quintela
2023-02-10 16:17 ` Peter Maydell
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=20230209233426.37811-10-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=berrange@redhat.com \
--cc=cohuck@redhat.com \
--cc=dgilbert@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.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).