[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/8] migration: stop compressing page in migration t
From: |
guangrong . xiao |
Subject: |
[Qemu-devel] [PATCH 1/8] migration: stop compressing page in migration thread |
Date: |
Tue, 13 Mar 2018 15:57:32 +0800 |
From: Xiao Guangrong <address@hidden>
As compression is a heavy work, do not do it in migration thread,
instead, we post it out as a normal page
Signed-off-by: Xiao Guangrong <address@hidden>
---
migration/ram.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 7266351fd0..615693f180 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1132,7 +1132,7 @@ static int ram_save_compressed_page(RAMState *rs,
PageSearchStatus *pss,
int pages = -1;
uint64_t bytes_xmit = 0;
uint8_t *p;
- int ret, blen;
+ int ret;
RAMBlock *block = pss->block;
ram_addr_t offset = pss->page << TARGET_PAGE_BITS;
@@ -1162,23 +1162,23 @@ static int ram_save_compressed_page(RAMState *rs,
PageSearchStatus *pss,
if (block != rs->last_sent_block) {
flush_compressed_data(rs);
pages = save_zero_page(rs, block, offset);
- if (pages == -1) {
- /* Make sure the first page is sent out before other pages */
- bytes_xmit = save_page_header(rs, rs->f, block, offset |
- RAM_SAVE_FLAG_COMPRESS_PAGE);
- blen = qemu_put_compression_data(rs->f, p, TARGET_PAGE_SIZE,
- migrate_compress_level());
- if (blen > 0) {
- ram_counters.transferred += bytes_xmit + blen;
- ram_counters.normal++;
- pages = 1;
- } else {
- qemu_file_set_error(rs->f, blen);
- error_report("compressed data failed!");
- }
- }
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 {
pages = save_zero_page(rs, block, offset);
--
2.14.3
- [Qemu-devel] [PATCH 0/8] migration: improve and cleanup compression, guangrong . xiao, 2018/03/13
- [Qemu-devel] [PATCH 1/8] migration: stop compressing page in migration thread,
guangrong . xiao <=
- Re: [Qemu-devel] [PATCH 1/8] migration: stop compressing page in migration thread, Dr. David Alan Gilbert, 2018/03/15
- Re: [Qemu-devel] [PATCH 1/8] migration: stop compressing page in migration thread, Xiao Guangrong, 2018/03/16
- Re: [Qemu-devel] [PATCH 1/8] migration: stop compressing page in migration thread, Dr. David Alan Gilbert, 2018/03/19
- Re: [Qemu-devel] [PATCH 1/8] migration: stop compressing page in migration thread, Peter Xu, 2018/03/21
- Re: [Qemu-devel] [PATCH 1/8] migration: stop compressing page in migration thread, Xiao Guangrong, 2018/03/22
- Re: [Qemu-devel] [PATCH 1/8] migration: stop compressing page in migration thread, Peter Xu, 2018/03/26
- Re: [Qemu-devel] [PATCH 1/8] migration: stop compressing page in migration thread, Xiao Guangrong, 2018/03/26
- Re: [Qemu-devel] [PATCH 1/8] migration: stop compressing page in migration thread, Peter Xu, 2018/03/27
- Re: [Qemu-devel] [PATCH 1/8] migration: stop compressing page in migration thread, Dr. David Alan Gilbert, 2018/03/27
Re: [Qemu-devel] [PATCH 1/8] migration: stop compressing page in migration thread, Wang, Wei W, 2018/03/27