From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Eduardo Habkost" <ehabkost@redhat.com>,
"Juan Quintela" <quintela@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
"Peter Xu" <peterx@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Richard Henderson" <rth@twiddle.net>
Subject: [PATCH v4 08/13] migration/ram: Simplify host page handling in ram_load_postcopy()
Date: Tue, 21 Apr 2020 10:52:55 +0200 [thread overview]
Message-ID: <20200421085300.7734-9-david@redhat.com> (raw)
In-Reply-To: <20200421085300.7734-1-david@redhat.com>
Add two new helper functions. This will in come handy once we want to
handle ram block resizes while postcopy is active.
Note that ram_block_from_stream() will already print proper errors.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
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 | 54 ++++++++++++++++++++++++++++---------------------
1 file changed, 31 insertions(+), 23 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 2704d32def..2a2165b478 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2743,6 +2743,20 @@ static inline void *host_from_ram_block_offset(RAMBlock *block,
return block->host + offset;
}
+static void *host_page_from_ram_block_offset(RAMBlock *block,
+ ram_addr_t offset)
+{
+ /* Note: Explicitly no check against offset_in_ramblock(). */
+ return (void *)QEMU_ALIGN_DOWN((uintptr_t)block->host + offset,
+ block->page_size);
+}
+
+static ram_addr_t host_page_offset_from_ram_block_offset(RAMBlock *block,
+ ram_addr_t offset)
+{
+ return ((uintptr_t)block->host + offset) & (block->page_size - 1);
+}
+
static inline void *colo_cache_from_block_offset(RAMBlock *block,
ram_addr_t offset, bool record_bitmap)
{
@@ -3135,13 +3149,12 @@ static int ram_load_postcopy(QEMUFile *f)
MigrationIncomingState *mis = migration_incoming_get_current();
/* Temporary page that is later 'placed' */
void *postcopy_host_page = mis->postcopy_tmp_page;
- void *this_host = NULL;
+ void *host_page = NULL;
bool all_zero = false;
int target_pages = 0;
while (!ret && !(flags & RAM_SAVE_FLAG_EOS)) {
ram_addr_t addr;
- void *host = NULL;
void *page_buffer = NULL;
void *place_source = NULL;
RAMBlock *block = NULL;
@@ -3167,9 +3180,12 @@ static int ram_load_postcopy(QEMUFile *f)
if (flags & (RAM_SAVE_FLAG_ZERO | RAM_SAVE_FLAG_PAGE |
RAM_SAVE_FLAG_COMPRESS_PAGE)) {
block = ram_block_from_stream(f, flags);
+ if (!block) {
+ ret = -EINVAL;
+ break;
+ }
- host = host_from_ram_block_offset(block, addr);
- if (!host) {
+ if (!offset_in_ramblock(block, addr)) {
error_report("Illegal RAM offset " RAM_ADDR_FMT, addr);
ret = -EINVAL;
break;
@@ -3187,21 +3203,18 @@ static int ram_load_postcopy(QEMUFile *f)
* of a host page in one chunk.
*/
page_buffer = postcopy_host_page +
- ((uintptr_t)host & (block->page_size - 1));
+ host_page_offset_from_ram_block_offset(block, addr);
/* If all TP are zero then we can optimise the place */
if (target_pages == 1) {
all_zero = true;
- this_host = (void *)QEMU_ALIGN_DOWN((uintptr_t)host,
- block->page_size);
- } else {
+ host_page = host_page_from_ram_block_offset(block, addr);
+ } else if (host_page != host_page_from_ram_block_offset(block,
+ addr)) {
/* not the 1st TP within the HP */
- if (QEMU_ALIGN_DOWN((uintptr_t)host, block->page_size) !=
- (uintptr_t)this_host) {
- error_report("Non-same host page %p/%p",
- host, this_host);
- ret = -EINVAL;
- break;
- }
+ error_report("Non-same host page %p/%p", host_page,
+ host_page_from_ram_block_offset(block, addr));
+ ret = -EINVAL;
+ break;
}
/*
@@ -3281,16 +3294,11 @@ static int ram_load_postcopy(QEMUFile *f)
}
if (!ret && place_needed) {
- /* This gets called at the last target page in the host page */
- void *place_dest = (void *)QEMU_ALIGN_DOWN((uintptr_t)host,
- block->page_size);
-
if (all_zero) {
- ret = postcopy_place_page_zero(mis, place_dest,
- block);
+ ret = postcopy_place_page_zero(mis, host_page, block);
} else {
- ret = postcopy_place_page(mis, place_dest,
- place_source, block);
+ ret = postcopy_place_page(mis, host_page, place_source,
+ block);
}
}
}
--
2.25.1
next prev parent reply other threads:[~2020-04-21 9:01 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-21 8:52 [PATCH v4 00/13] migrate/ram: Fix resizing RAM blocks while migrating David Hildenbrand
2020-04-21 8:52 ` [PATCH v4 01/13] util: vfio-helpers: Factor out and fix processing of existing ram blocks David Hildenbrand
2020-04-21 8:52 ` [PATCH v4 02/13] stubs/ram-block: Remove stubs that are no longer needed David Hildenbrand
2020-04-21 8:52 ` [PATCH v4 03/13] numa: Teach ram block notifiers about resizeable ram blocks David Hildenbrand
2020-04-21 8:52 ` [PATCH v4 04/13] numa: Make all callbacks of ram block notifiers optional David Hildenbrand
2020-04-21 8:52 ` [PATCH v4 05/13] migration/ram: Handle RAM block resizes during precopy David Hildenbrand
2020-04-21 8:52 ` [PATCH v4 06/13] exec: Relax range check in ram_block_discard_range() David Hildenbrand
2020-04-21 8:52 ` [PATCH v4 07/13] migration/ram: Discard RAM when growing RAM blocks after ram_postcopy_incoming_init() David Hildenbrand
2020-04-21 8:52 ` David Hildenbrand [this message]
2020-04-21 8:52 ` [PATCH v4 09/13] migration/ram: Consolidate variable reset after placement in ram_load_postcopy() David Hildenbrand
2020-04-24 10:25 ` Dr. David Alan Gilbert
2020-05-07 15:42 ` Dr. David Alan Gilbert
2020-05-07 15:57 ` David Hildenbrand
2020-05-07 19:00 ` Dr. David Alan Gilbert
2020-05-08 7:17 ` David Hildenbrand
2020-04-21 8:52 ` [PATCH v4 10/13] migration/ram: Handle RAM block resizes during postcopy David Hildenbrand
2020-04-21 8:52 ` [PATCH v4 11/13] migration/multifd: Print used_length of memory block David Hildenbrand
2020-04-21 8:52 ` [PATCH v4 12/13] migration/ram: Use offset_in_ramblock() in range checks David Hildenbrand
2020-04-21 8:53 ` [PATCH v4 13/13] migration/ram: Tolerate partially changed mappings in postcopy code David Hildenbrand
2020-04-30 14:43 ` [PATCH v4 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=20200421085300.7734-9-david@redhat.com \
--to=david@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=philmd@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).