motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ram/colo: only record bitmap of dirty pages in COLO stage

Browse source 
It is only need to record bitmap of dirty pages while goes
into COLO stage.

Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Message-Id: <20200224065414.36524-6-zhang.zhanghailiang@huawei.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
zhanghailiang 2020-02-24 14:54:11 +08:00 • committed by Dr. David Alan Gilbert
parent 0393031a16
commit 8af66371ed
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
migration/ram.c
View file

@ -2742,7 +2742,7 @@ static inline void *host_from_ram_block_offset(RAMBlock *block,
} }
static inline void *colo_cache_from_block_offset(RAMBlock *block, static inline void *colo_cache_from_block_offset(RAMBlock *block,
ram_addr_t offset) ram_addr_t offset, bool record_bitmap)
{ {
if (!offset_in_ramblock(block, offset)) { if (!offset_in_ramblock(block, offset)) {
return NULL; return NULL;
@ -2758,7 +2758,8 @@ static inline void *colo_cache_from_block_offset(RAMBlock *block,
* It help us to decide which pages in ram cache should be flushed * It help us to decide which pages in ram cache should be flushed
* into VM's RAM later. * into VM's RAM later.
*/ */
if (!test_and_set_bit(offset >> TARGET_PAGE_BITS, block->bmap)) { if (record_bitmap &&
!test_and_set_bit(offset >> TARGET_PAGE_BITS, block->bmap)) {
ram_state->migration_dirty_pages++; ram_state->migration_dirty_pages++;
} }
return block->colo_cache + offset; return block->colo_cache + offset;
@ -3416,13 +3417,13 @@ static int ram_load_precopy(QEMUFile *f)
if (migration_incoming_colo_enabled()) { if (migration_incoming_colo_enabled()) {
if (migration_incoming_in_colo_state()) { if (migration_incoming_in_colo_state()) {
/* In COLO stage, put all pages into cache temporarily */ /* In COLO stage, put all pages into cache temporarily */
host = colo_cache_from_block_offset(block, addr); host = colo_cache_from_block_offset(block, addr, true);
} else { } else {
/* /*
* In migration stage but before COLO stage, * In migration stage but before COLO stage,
* Put all pages into both cache and SVM's memory. * Put all pages into both cache and SVM's memory.
*/ */
host_bak = colo_cache_from_block_offset(block, addr); host_bak = colo_cache_from_block_offset(block, addr, false);
} }
} }
if (!host) { if (!host) {