migration: introduce control_save_page()
Abstract the common function control_save_page() to cleanup the code, no logic is changed Reviewed-by: Peter Xu <peterx@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Xiao Guangrong <xiaoguangrong@tencent.com> Message-Id: <20180330075128.26919-6-xiaoguangrong@tencent.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Xiao Guangrong
Dr. David Alan Gilbert
parent
34ab9e9743
commit
059ff0fb29
174
migration/ram.c
174
migration/ram.c
@ -974,6 +974,44 @@ static void ram_release_pages(const char *rbname, uint64_t offset, int pages)
|
|||||||
ram_discard_range(rbname, offset, pages << TARGET_PAGE_BITS);
|
ram_discard_range(rbname, offset, pages << TARGET_PAGE_BITS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @pages: the number of pages written by the control path,
|
||||||
|
* < 0 - error
|
||||||
|
* > 0 - number of pages written
|
||||||
|
*
|
||||||
|
* Return true if the pages has been saved, otherwise false is returned.
|
||||||
|
*/
|
||||||
|
static bool control_save_page(RAMState *rs, RAMBlock *block, ram_addr_t offset,
|
||||||
|
int *pages)
|
||||||
|
{
|
||||||
|
uint64_t bytes_xmit = 0;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
*pages = -1;
|
||||||
|
ret = ram_control_save_page(rs->f, block->offset, offset, TARGET_PAGE_SIZE,
|
||||||
|
&bytes_xmit);
|
||||||
|
if (ret == RAM_SAVE_CONTROL_NOT_SUPP) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bytes_xmit) {
|
||||||
|
ram_counters.transferred += bytes_xmit;
|
||||||
|
*pages = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ret == RAM_SAVE_CONTROL_DELAYED) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bytes_xmit > 0) {
|
||||||
|
ram_counters.normal++;
|
||||||
|
} else if (bytes_xmit == 0) {
|
||||||
|
ram_counters.duplicate++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ram_save_page: send the given page to the stream
|
* ram_save_page: send the given page to the stream
|
||||||
*
|
*
|
||||||
@ -990,56 +1028,36 @@ static void ram_release_pages(const char *rbname, uint64_t offset, int pages)
|
|||||||
static int ram_save_page(RAMState *rs, PageSearchStatus *pss, bool last_stage)
|
static int ram_save_page(RAMState *rs, PageSearchStatus *pss, bool last_stage)
|
||||||
{
|
{
|
||||||
int pages = -1;
|
int pages = -1;
|
||||||
uint64_t bytes_xmit;
|
|
||||||
ram_addr_t current_addr;
|
|
||||||
uint8_t *p;
|
uint8_t *p;
|
||||||
int ret;
|
|
||||||
bool send_async = true;
|
bool send_async = true;
|
||||||
RAMBlock *block = pss->block;
|
RAMBlock *block = pss->block;
|
||||||
ram_addr_t offset = pss->page << TARGET_PAGE_BITS;
|
ram_addr_t offset = pss->page << TARGET_PAGE_BITS;
|
||||||
|
ram_addr_t current_addr = block->offset + offset;
|
||||||
|
|
||||||
p = block->host + offset;
|
p = block->host + offset;
|
||||||
trace_ram_save_page(block->idstr, (uint64_t)offset, p);
|
trace_ram_save_page(block->idstr, (uint64_t)offset, p);
|
||||||
|
|
||||||
/* In doubt sent page as normal */
|
if (control_save_page(rs, block, offset, &pages)) {
|
||||||
bytes_xmit = 0;
|
return pages;
|
||||||
ret = ram_control_save_page(rs->f, block->offset,
|
|
||||||
offset, TARGET_PAGE_SIZE, &bytes_xmit);
|
|
||||||
if (bytes_xmit) {
|
|
||||||
ram_counters.transferred += bytes_xmit;
|
|
||||||
pages = 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
XBZRLE_cache_lock();
|
XBZRLE_cache_lock();
|
||||||
|
pages = save_zero_page(rs, block, offset);
|
||||||
current_addr = block->offset + offset;
|
if (pages > 0) {
|
||||||
|
/* Must let xbzrle know, otherwise a previous (now 0'd) cached
|
||||||
if (ret != RAM_SAVE_CONTROL_NOT_SUPP) {
|
* page would be stale
|
||||||
if (ret != RAM_SAVE_CONTROL_DELAYED) {
|
*/
|
||||||
if (bytes_xmit > 0) {
|
xbzrle_cache_zero_page(rs, current_addr);
|
||||||
ram_counters.normal++;
|
ram_release_pages(block->idstr, offset, pages);
|
||||||
} else if (bytes_xmit == 0) {
|
} else if (!rs->ram_bulk_stage &&
|
||||||
ram_counters.duplicate++;
|
!migration_in_postcopy() && migrate_use_xbzrle()) {
|
||||||
}
|
pages = save_xbzrle_page(rs, &p, current_addr, block,
|
||||||
}
|
offset, last_stage);
|
||||||
} else {
|
if (!last_stage) {
|
||||||
pages = save_zero_page(rs, block, offset);
|
/* Can't send this cached data async, since the cache page
|
||||||
if (pages > 0) {
|
* might get updated before it gets to the wire
|
||||||
/* Must let xbzrle know, otherwise a previous (now 0'd) cached
|
|
||||||
* page would be stale
|
|
||||||
*/
|
*/
|
||||||
xbzrle_cache_zero_page(rs, current_addr);
|
send_async = false;
|
||||||
ram_release_pages(block->idstr, offset, pages);
|
|
||||||
} else if (!rs->ram_bulk_stage &&
|
|
||||||
!migration_in_postcopy() && migrate_use_xbzrle()) {
|
|
||||||
pages = save_xbzrle_page(rs, &p, current_addr, block,
|
|
||||||
offset, last_stage);
|
|
||||||
if (!last_stage) {
|
|
||||||
/* Can't send this cached data async, since the cache page
|
|
||||||
* might get updated before it gets to the wire
|
|
||||||
*/
|
|
||||||
send_async = false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1174,63 +1192,49 @@ static int ram_save_compressed_page(RAMState *rs, PageSearchStatus *pss,
|
|||||||
bool last_stage)
|
bool last_stage)
|
||||||
{
|
{
|
||||||
int pages = -1;
|
int pages = -1;
|
||||||
uint64_t bytes_xmit = 0;
|
|
||||||
uint8_t *p;
|
uint8_t *p;
|
||||||
int ret;
|
|
||||||
RAMBlock *block = pss->block;
|
RAMBlock *block = pss->block;
|
||||||
ram_addr_t offset = pss->page << TARGET_PAGE_BITS;
|
ram_addr_t offset = pss->page << TARGET_PAGE_BITS;
|
||||||
|
|
||||||
p = block->host + offset;
|
p = block->host + offset;
|
||||||
|
|
||||||
ret = ram_control_save_page(rs->f, block->offset,
|
if (control_save_page(rs, block, offset, &pages)) {
|
||||||
offset, TARGET_PAGE_SIZE, &bytes_xmit);
|
return pages;
|
||||||
if (bytes_xmit) {
|
|
||||||
ram_counters.transferred += bytes_xmit;
|
|
||||||
pages = 1;
|
|
||||||
}
|
}
|
||||||
if (ret != RAM_SAVE_CONTROL_NOT_SUPP) {
|
|
||||||
if (ret != RAM_SAVE_CONTROL_DELAYED) {
|
/* When starting the process of a new block, the first page of
|
||||||
if (bytes_xmit > 0) {
|
* the block should be sent out before other pages in the same
|
||||||
ram_counters.normal++;
|
* block, and all the pages in last block should have been sent
|
||||||
} else if (bytes_xmit == 0) {
|
* out, keeping this order is important, because the 'cont' flag
|
||||||
ram_counters.duplicate++;
|
* is used to avoid resending the block name.
|
||||||
}
|
*/
|
||||||
|
if (block != rs->last_sent_block) {
|
||||||
|
flush_compressed_data(rs);
|
||||||
|
pages = save_zero_page(rs, block, offset);
|
||||||
|
if (pages > 0) {
|
||||||
|
ram_release_pages(block->idstr, offset, pages);
|
||||||
|
} else {
|
||||||
|
/*
|
||||||
|
* Make sure the first page is sent out before other pages.
|
||||||
|
*
|
||||||
|
* we post it as normal page as compression will take much
|
||||||
|
* CPU resource.
|
||||||
|
*/
|
||||||
|
ram_counters.transferred += save_page_header(rs, rs->f, block,
|
||||||
|
offset | RAM_SAVE_FLAG_PAGE);
|
||||||
|
qemu_put_buffer_async(rs->f, p, TARGET_PAGE_SIZE,
|
||||||
|
migrate_release_ram() &
|
||||||
|
migration_in_postcopy());
|
||||||
|
ram_counters.transferred += TARGET_PAGE_SIZE;
|
||||||
|
ram_counters.normal++;
|
||||||
|
pages = 1;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/* When starting the process of a new block, the first page of
|
pages = save_zero_page(rs, block, offset);
|
||||||
* the block should be sent out before other pages in the same
|
if (pages == -1) {
|
||||||
* block, and all the pages in last block should have been sent
|
pages = compress_page_with_multi_thread(rs, block, offset);
|
||||||
* out, keeping this order is important, because the 'cont' flag
|
|
||||||
* is used to avoid resending the block name.
|
|
||||||
*/
|
|
||||||
if (block != rs->last_sent_block) {
|
|
||||||
flush_compressed_data(rs);
|
|
||||||
pages = save_zero_page(rs, block, offset);
|
|
||||||
if (pages > 0) {
|
|
||||||
ram_release_pages(block->idstr, offset, pages);
|
|
||||||
} else {
|
|
||||||
/*
|
|
||||||
* Make sure the first page is sent out before other pages.
|
|
||||||
*
|
|
||||||
* we post it as normal page as compression will take much
|
|
||||||
* CPU resource.
|
|
||||||
*/
|
|
||||||
ram_counters.transferred += save_page_header(rs, rs->f, block,
|
|
||||||
offset | RAM_SAVE_FLAG_PAGE);
|
|
||||||
qemu_put_buffer_async(rs->f, p, TARGET_PAGE_SIZE,
|
|
||||||
migrate_release_ram() &
|
|
||||||
migration_in_postcopy());
|
|
||||||
ram_counters.transferred += TARGET_PAGE_SIZE;
|
|
||||||
ram_counters.normal++;
|
|
||||||
pages = 1;
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
pages = save_zero_page(rs, block, offset);
|
ram_release_pages(block->idstr, offset, pages);
|
||||||
if (pages == -1) {
|
|
||||||
pages = compress_page_with_multi_thread(rs, block, offset);
|
|
||||||
} else {
|
|
||||||
ram_release_pages(block->idstr, offset, pages);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user