[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v4 09/13] migration/ram: Consolidate variable reset after pla
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [PATCH v4 09/13] migration/ram: Consolidate variable reset after placement in ram_load_postcopy() |
Date: |
Fri, 24 Apr 2020 11:25:14 +0100 |
User-agent: |
Mutt/1.13.4 (2020-02-15) |
* David Hildenbrand (address@hidden) wrote:
> Let's consolidate resetting the variables.
>
> Cc: "Dr. David Alan Gilbert" <address@hidden>
> Cc: Juan Quintela <address@hidden>
> Cc: Peter Xu <address@hidden>
> Signed-off-by: David Hildenbrand <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
> ---
> 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 / address@hidden / Manchester, UK
- [PATCH v4 00/13] migrate/ram: Fix resizing RAM blocks while migrating, David Hildenbrand, 2020/04/21
- [PATCH v4 01/13] util: vfio-helpers: Factor out and fix processing of existing ram blocks, David Hildenbrand, 2020/04/21
- [PATCH v4 03/13] numa: Teach ram block notifiers about resizeable ram blocks, David Hildenbrand, 2020/04/21
- [PATCH v4 04/13] numa: Make all callbacks of ram block notifiers optional, David Hildenbrand, 2020/04/21
- [PATCH v4 05/13] migration/ram: Handle RAM block resizes during precopy, David Hildenbrand, 2020/04/21
- [PATCH v4 02/13] stubs/ram-block: Remove stubs that are no longer needed, David Hildenbrand, 2020/04/21
- [PATCH v4 06/13] exec: Relax range check in ram_block_discard_range(), David Hildenbrand, 2020/04/21
- [PATCH v4 07/13] migration/ram: Discard RAM when growing RAM blocks after ram_postcopy_incoming_init(), David Hildenbrand, 2020/04/21
- [PATCH v4 08/13] migration/ram: Simplify host page handling in ram_load_postcopy(), David Hildenbrand, 2020/04/21
- [PATCH v4 09/13] migration/ram: Consolidate variable reset after placement in ram_load_postcopy(), David Hildenbrand, 2020/04/21
- Re: [PATCH v4 09/13] migration/ram: Consolidate variable reset after placement in ram_load_postcopy(),
Dr. David Alan Gilbert <=
- [PATCH v4 10/13] migration/ram: Handle RAM block resizes during postcopy, David Hildenbrand, 2020/04/21
- [PATCH v4 11/13] migration/multifd: Print used_length of memory block, David Hildenbrand, 2020/04/21
- [PATCH v4 12/13] migration/ram: Use offset_in_ramblock() in range checks, David Hildenbrand, 2020/04/21
- [PATCH v4 13/13] migration/ram: Tolerate partially changed mappings in postcopy code, David Hildenbrand, 2020/04/21
- Re: [PATCH v4 00/13] migrate/ram: Fix resizing RAM blocks while migrating, David Hildenbrand, 2020/04/30