From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: David Hildenbrand <david@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>,
Juan Quintela <quintela@redhat.com>,
qemu-devel@nongnu.org, Peter Xu <peterx@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: Re: [PATCH v3 08/13] migration/ram: Simplify host page handling in ram_load_postcopy()
Date: Fri, 6 Mar 2020 16:05:38 +0000 [thread overview]
Message-ID: <20200306160538.GE3033@work-vm> (raw)
In-Reply-To: <20200226155304.60219-9-david@redhat.com>
* David Hildenbrand (david@redhat.com) wrote:
> Add two new helper functions. This will in come handy once we want to
> handle ram block resizes while postcopy is active.
>
> 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 d5a4d69e1c..f815f4e532 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -2734,6 +2734,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)
> {
> @@ -3111,13 +3125,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;
> @@ -3143,9 +3156,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;
Could we have an error_report there, at the moment it would trigger
the one below.
Other than that,
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> + 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;
> @@ -3163,21 +3179,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;
> }
>
> /*
> @@ -3257,16 +3270,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.24.1
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
next prev parent reply other threads:[~2020-03-06 16:06 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-26 15:52 [PATCH v3 00/13] migrate/ram: Fix resizing RAM blocks while migrating David Hildenbrand
2020-02-26 15:52 ` [PATCH v3 01/13] util: vfio-helpers: Factor out and fix processing of existing ram blocks David Hildenbrand
2020-02-26 15:52 ` [PATCH v3 02/13] stubs/ram-block: Remove stubs that are no longer needed David Hildenbrand
2020-02-26 15:52 ` [PATCH v3 03/13] numa: Teach ram block notifiers about resizeable ram blocks David Hildenbrand
2020-02-26 15:52 ` [PATCH v3 04/13] numa: Make all callbacks of ram block notifiers optional David Hildenbrand
2020-02-26 15:52 ` [PATCH v3 05/13] migration/ram: Handle RAM block resizes during precopy David Hildenbrand
2020-02-26 15:52 ` [PATCH v3 06/13] exec: Relax range check in ram_block_discard_range() David Hildenbrand
2020-02-26 15:52 ` [PATCH v3 07/13] migration/ram: Discard RAM when growing RAM blocks after ram_postcopy_incoming_init() David Hildenbrand
2020-02-26 15:52 ` [PATCH v3 08/13] migration/ram: Simplify host page handling in ram_load_postcopy() David Hildenbrand
2020-03-06 16:05 ` Dr. David Alan Gilbert [this message]
2020-03-06 16:20 ` David Hildenbrand
2020-03-06 18:47 ` David Hildenbrand
2020-03-06 18:48 ` Dr. David Alan Gilbert
2020-02-26 15:53 ` [PATCH v3 09/13] migration/ram: Consolidate variable reset after placement " David Hildenbrand
2020-03-06 16:30 ` Dr. David Alan Gilbert
2020-03-06 19:09 ` David Hildenbrand
2020-03-06 19:11 ` Dr. David Alan Gilbert
2020-02-26 15:53 ` [PATCH v3 10/13] migration/ram: Handle RAM block resizes during postcopy David Hildenbrand
2020-03-06 16:56 ` Dr. David Alan Gilbert
2020-03-06 18:45 ` David Hildenbrand
2020-03-06 18:51 ` Dr. David Alan Gilbert
2020-02-26 15:53 ` [PATCH v3 11/13] migration/multifd: Print used_length of memory block David Hildenbrand
2020-03-06 16:57 ` Dr. David Alan Gilbert
2020-02-26 15:53 ` [PATCH v3 12/13] migration/ram: Use offset_in_ramblock() in range checks David Hildenbrand
2020-03-06 16:59 ` Dr. David Alan Gilbert
2020-02-26 15:53 ` [PATCH v3 13/13] migration/ram: Tolerate partially changed mappings in postcopy code David Hildenbrand
2020-02-26 16:06 ` Peter Xu
2020-02-26 16:08 ` David Hildenbrand
2020-02-26 16:26 ` Peter Xu
2020-02-26 16:34 ` 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=20200306160538.GE3033@work-vm \
--to=dgilbert@redhat.com \
--cc=david@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).