From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: Eduardo Habkost <ehabkost@redhat.com>,
Juan Quintela <quintela@redhat.com>,
David Hildenbrand <david@redhat.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
Peter Xu <peterx@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: [PATCH v1 06/13] migrate/ram: Discard new RAM when growing RAM blocks and the VM is stopped
Date: Wed, 19 Feb 2020 17:17:18 +0100 [thread overview]
Message-ID: <20200219161725.115218-7-david@redhat.com> (raw)
In-Reply-To: <20200219161725.115218-1-david@redhat.com>
In case we grow our RAM after ram_postcopy_incoming_init() (e.g., when
synchronizing the RAM block state with the migration source), the resized
part would not get discarded. Let's perform that when being notified
about a resize while postcopy has been advised and the guest is not
running yet.
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: Juan Quintela <quintela@redhat.com>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
migration/ram.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/migration/ram.c b/migration/ram.c
index 57f32011a3..cbd54947fb 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3722,6 +3722,25 @@ static void ram_mig_ram_block_resized(RAMBlockNotifier *n, void *host,
return;
}
+ /*
+ * Especially at the start of precopy on the migration target, before
+ * starting postcopy, we synchronize the RAM block sizes. Let's make sure
+ * that any resizes before starting the guest are properly handled by
+ * postcopy. Note: All other postcopy handling (e.g., registering handlers,
+ * disabling THP) happens after all resizes (e.g., during precopy) were
+ * performed.
+ */
+ if (postcopy_is_advised() && !runstate_is_running()) {
+ /* Update what ram_postcopy_incoming_init()->init_range() does. */
+ if (old_size < new_size) {
+ if (ram_discard_range(rb->idstr, old_size, new_size - old_size)) {
+ error_report("RAM block '%s' discard of resized RAM failed",
+ rb->idstr);
+ }
+ }
+ return;
+ }
+
/*
* Some resizes are triggered on the migration target by precopy code,
* when synchronizing RAM block sizes. In these cases, the VM is not
--
2.24.1
next prev parent reply other threads:[~2020-02-19 16:43 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-19 16:17 [PATCH v1 00/13] migrate/ram: Fix resizing RAM blocks while migrating David Hildenbrand
2020-02-19 16:17 ` [PATCH v1 01/13] util: vfio-helpers: Factor out and fix processing of existing ram blocks David Hildenbrand
2020-02-19 20:48 ` Peter Xu
2020-02-19 16:17 ` [PATCH v1 02/13] stubs/ram-block: Remove stubs that are no longer needed David Hildenbrand
2020-02-19 20:48 ` Peter Xu
2020-02-19 16:17 ` [PATCH v1 03/13] numa: Teach ram block notifiers about resizeable ram blocks David Hildenbrand
2020-02-19 20:48 ` Peter Xu
2020-02-19 16:17 ` [PATCH v1 04/13] numa: Make all callbacks of ram block notifiers optional David Hildenbrand
2020-02-19 20:49 ` Peter Xu
2020-02-19 16:17 ` [PATCH v1 05/13] migrate/ram: Handle RAM block resizes during precopy David Hildenbrand
2020-02-20 15:16 ` David Hildenbrand
2020-02-20 20:17 ` Peter Xu
2020-02-21 9:18 ` David Hildenbrand
2020-02-21 10:10 ` David Hildenbrand
2020-02-21 10:19 ` David Hildenbrand
2020-02-21 16:35 ` Peter Xu
2020-02-21 15:14 ` Dr. David Alan Gilbert
2020-02-21 15:18 ` David Hildenbrand
2020-02-21 15:40 ` Dr. David Alan Gilbert
2020-02-21 15:46 ` David Hildenbrand
2020-02-19 16:17 ` David Hildenbrand [this message]
2020-02-21 9:08 ` [PATCH v1 06/13] migrate/ram: Discard new RAM when growing RAM blocks and the VM is stopped David Hildenbrand
2020-02-21 15:51 ` Dr. David Alan Gilbert
2020-02-21 15:53 ` David Hildenbrand
2020-02-19 16:17 ` [PATCH v1 07/13] migrate/ram: Get rid of "place_source" in ram_load_postcopy() David Hildenbrand
2020-02-19 20:47 ` Peter Xu
2020-02-19 20:55 ` Peter Xu
2020-02-20 13:22 ` David Hildenbrand
2020-02-20 13:48 ` Peter Xu
2020-02-20 9:24 ` David Hildenbrand
2020-02-20 18:58 ` Dr. David Alan Gilbert
2020-02-19 16:17 ` [PATCH v1 08/13] migrate/ram: Simplify host page handling " David Hildenbrand
2020-02-19 16:17 ` [PATCH v1 09/13] migrate/ram: Consolidate variable reset after placement " David Hildenbrand
2020-02-19 16:17 ` [PATCH v1 10/13] migrate/ram: Handle RAM block resizes during postcopy David Hildenbrand
2020-02-20 20:54 ` Peter Xu
2020-02-21 8:35 ` David Hildenbrand
2020-02-21 8:41 ` David Hildenbrand
2020-02-19 16:17 ` [PATCH v1 11/13] migrate/multifd: Print used_length of memory block David Hildenbrand
2020-02-19 16:17 ` [PATCH v1 12/13] migrate/ram: Use offset_in_ramblock() in range checks David Hildenbrand
2020-02-19 16:17 ` [PATCH v1 13/13] migrate/ram: Tolerate partially changed mappings in postcopy code David Hildenbrand
2020-02-20 11:24 ` David Hildenbrand
2020-02-20 21:07 ` Peter Xu
2020-02-21 8:48 ` David Hildenbrand
2020-02-21 12:13 ` [PATCH v1 00/13] migrate/ram: Fix resizing RAM blocks while migrating David Hildenbrand
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=20200219161725.115218-7-david@redhat.com \
--to=david@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=rth@twiddle.net \
/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).