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>,
"Michael S . Tsirkin" <mst@redhat.com>,
qemu-devel@nongnu.org, "Peter Xu" <peterx@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Richard Henderson" <rth@twiddle.net>
Subject: Re: [PATCH v4 09/13] migration/ram: Consolidate variable reset after placement in ram_load_postcopy()
Date: Thu, 7 May 2020 16:42:45 +0100 [thread overview]
Message-ID: <20200507154245.GF17348@work-vm> (raw)
In-Reply-To: <20200424102514.GD3106@work-vm>
* Dr. David Alan Gilbert (dgilbert@redhat.com) wrote:
> * David Hildenbrand (david@redhat.com) wrote:
> > Let's consolidate resetting the variables.
> >
> > 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>
>
> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Queued this one only; I had to do manual patch application due to some
renaming in 91ba442; but I think it's still OK.
> > ---
> > migration/ram.c | 10 +++++-----
> > 1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/migration/ram.c b/migration/ram.c
> > index 2a2165b478..7eca3165c8 100644
> > --- a/migration/ram.c
> > +++ b/migration/ram.c
> > @@ -3150,7 +3150,7 @@ static int ram_load_postcopy(QEMUFile *f)
> > /* Temporary page that is later 'placed' */
> > void *postcopy_host_page = mis->postcopy_tmp_page;
> > void *host_page = NULL;
> > - bool all_zero = false;
> > + bool all_zero = true;
> > int target_pages = 0;
> >
> > while (!ret && !(flags & RAM_SAVE_FLAG_EOS)) {
> > @@ -3176,7 +3176,6 @@ static int ram_load_postcopy(QEMUFile *f)
> > addr &= TARGET_PAGE_MASK;
> >
> > trace_ram_load_postcopy_loop((uint64_t)addr, flags);
> > - place_needed = false;
> > if (flags & (RAM_SAVE_FLAG_ZERO | RAM_SAVE_FLAG_PAGE |
> > RAM_SAVE_FLAG_COMPRESS_PAGE)) {
> > block = ram_block_from_stream(f, flags);
> > @@ -3204,9 +3203,7 @@ static int ram_load_postcopy(QEMUFile *f)
> > */
> > page_buffer = postcopy_host_page +
> > 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;
> > host_page = host_page_from_ram_block_offset(block, addr);
> > } else if (host_page != host_page_from_ram_block_offset(block,
> > addr)) {
> > @@ -3223,7 +3220,6 @@ static int ram_load_postcopy(QEMUFile *f)
> > */
> > if (target_pages == (block->page_size / TARGET_PAGE_SIZE)) {
> > place_needed = true;
> > - target_pages = 0;
> > }
> > place_source = postcopy_host_page;
> > }
> > @@ -3300,6 +3296,10 @@ static int ram_load_postcopy(QEMUFile *f)
> > ret = postcopy_place_page(mis, host_page, place_source,
> > block);
> > }
> > + place_needed = false;
> > + target_pages = 0;
> > + /* Assume we have a zero page until we detect something different */
> > + all_zero = true;
> > }
> > }
> >
> > --
> > 2.25.1
> >
> --
> Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
>
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
next prev parent reply other threads:[~2020-05-07 15:43 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 ` [PATCH v4 08/13] migration/ram: Simplify host page handling in ram_load_postcopy() David Hildenbrand
2020-04-21 8:52 ` [PATCH v4 09/13] migration/ram: Consolidate variable reset after placement " David Hildenbrand
2020-04-24 10:25 ` Dr. David Alan Gilbert
2020-05-07 15:42 ` Dr. David Alan Gilbert [this message]
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=20200507154245.GF17348@work-vm \
--to=dgilbert@redhat.com \
--cc=david@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).