[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/36] migration: Move ram_release_pages() call to save_zero_page_
From: |
Juan Quintela |
Subject: |
[PULL 06/36] migration: Move ram_release_pages() call to save_zero_page_to_file() |
Date: |
Fri, 28 Jan 2022 19:30:03 +0100 |
We always need to call it when we find a zero page, so put it in a
single place.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
---
migration/ram.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 422c6bce28..e9dcd3ca4e 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1158,6 +1158,15 @@ static void migration_bitmap_sync_precopy(RAMState *rs)
}
}
+static void ram_release_page(const char *rbname, uint64_t offset)
+{
+ if (!migrate_release_ram() || !migration_in_postcopy()) {
+ return;
+ }
+
+ ram_discard_range(rbname, offset, TARGET_PAGE_SIZE);
+}
+
/**
* save_zero_page_to_file: send the zero page to the file
*
@@ -1179,6 +1188,7 @@ static int save_zero_page_to_file(RAMState *rs, QEMUFile
*file,
len += save_page_header(rs, file, block, offset | RAM_SAVE_FLAG_ZERO);
qemu_put_byte(file, 0);
len += 1;
+ ram_release_page(block->idstr, offset);
}
return len;
}
@@ -1204,15 +1214,6 @@ static int save_zero_page(RAMState *rs, RAMBlock *block,
ram_addr_t offset)
return -1;
}
-static void ram_release_page(const char *rbname, uint64_t offset)
-{
- if (!migrate_release_ram() || !migration_in_postcopy()) {
- return;
- }
-
- ram_discard_range(rbname, offset, TARGET_PAGE_SIZE);
-}
-
/*
* @pages: the number of pages written by the control path,
* < 0 - error
@@ -1344,7 +1345,6 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream
*stream, RAMBlock *block,
int ret;
if (save_zero_page_to_file(rs, f, block, offset)) {
- ram_release_page(block->idstr, offset);
return true;
}
@@ -2148,7 +2148,6 @@ static int ram_save_target_page(RAMState *rs,
PageSearchStatus *pss)
xbzrle_cache_zero_page(rs, block->offset + offset);
XBZRLE_cache_unlock();
}
- ram_release_page(block->idstr, offset);
return res;
}
--
2.34.1
- [PULL 00/36] Migration 20220128 patches, Juan Quintela, 2022/01/28
- [PULL 01/36] migration: All this fields are unsigned, Juan Quintela, 2022/01/28
- [PULL 02/36] migration: We only need last_stage in two places, Juan Quintela, 2022/01/28
- [PULL 03/36] migration: ram_release_pages() always receive 1 page as argument, Juan Quintela, 2022/01/28
- [PULL 04/36] migration: Remove masking for compression, Juan Quintela, 2022/01/28
- [PULL 05/36] migration: simplify do_compress_ram_page, Juan Quintela, 2022/01/28
- [PULL 06/36] migration: Move ram_release_pages() call to save_zero_page_to_file(),
Juan Quintela <=
- [PULL 07/36] multifd: Use proper maximum compression values, Juan Quintela, 2022/01/28
- [PULL 08/36] multifd: Move iov from pages to params, Juan Quintela, 2022/01/28
- [PULL 09/36] multifd: Make zlib use iov's, Juan Quintela, 2022/01/28
- [PULL 10/36] multifd: Make zstd use iov's, Juan Quintela, 2022/01/28
- [PULL 12/36] multifd: Use a single writev on the send side, Juan Quintela, 2022/01/28
- [PULL 11/36] multifd: Remove send_write() method, Juan Quintela, 2022/01/28
- [PULL 13/36] multifd: Unfold "used" variable by its value, Juan Quintela, 2022/01/28
- [PULL 14/36] multifd: Use normal pages array on the send side, Juan Quintela, 2022/01/28
- [PULL 15/36] multifd: Use normal pages array on the recv side, Juan Quintela, 2022/01/28
- [PULL 16/36] multifd: recv side only needs the RAMBlock host address, Juan Quintela, 2022/01/28