[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/16] migration: introduce save_normal_page()
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 15/16] migration: introduce save_normal_page() |
Date: |
Wed, 25 Apr 2018 21:03:25 +0100 |
From: Xiao Guangrong <address@hidden>
It directly sends the page to the stream neither checking zero nor
using xbzrle or compression
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Xiao Guangrong <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/ram.c | 50 +++++++++++++++++++++++++++++--------------------
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 97917542c5..2eb4c0bf49 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1012,6 +1012,34 @@ static bool control_save_page(RAMState *rs, RAMBlock
*block, ram_addr_t offset,
return true;
}
+/*
+ * directly send the page to the stream
+ *
+ * Returns the number of pages written.
+ *
+ * @rs: current RAM state
+ * @block: block that contains the page we want to send
+ * @offset: offset inside the block for the page
+ * @buf: the page to be sent
+ * @async: send to page asyncly
+ */
+static int save_normal_page(RAMState *rs, RAMBlock *block, ram_addr_t offset,
+ uint8_t *buf, bool async)
+{
+ ram_counters.transferred += save_page_header(rs, rs->f, block,
+ offset | RAM_SAVE_FLAG_PAGE);
+ if (async) {
+ qemu_put_buffer_async(rs->f, buf, TARGET_PAGE_SIZE,
+ migrate_release_ram() &
+ migration_in_postcopy());
+ } else {
+ qemu_put_buffer(rs->f, buf, TARGET_PAGE_SIZE);
+ }
+ ram_counters.transferred += TARGET_PAGE_SIZE;
+ ram_counters.normal++;
+ return 1;
+}
+
/**
* ram_save_page: send the given page to the stream
*
@@ -1052,18 +1080,7 @@ static int ram_save_page(RAMState *rs, PageSearchStatus
*pss, bool last_stage)
/* XBZRLE overflow or normal page */
if (pages == -1) {
- ram_counters.transferred +=
- save_page_header(rs, rs->f, block, offset | RAM_SAVE_FLAG_PAGE);
- if (send_async) {
- qemu_put_buffer_async(rs->f, p, TARGET_PAGE_SIZE,
- migrate_release_ram() &
- migration_in_postcopy());
- } else {
- qemu_put_buffer(rs->f, p, TARGET_PAGE_SIZE);
- }
- ram_counters.transferred += TARGET_PAGE_SIZE;
- pages = 1;
- ram_counters.normal++;
+ pages = save_normal_page(rs, block, offset, p, send_async);
}
XBZRLE_cache_unlock();
@@ -1194,14 +1211,7 @@ static int ram_save_compressed_page(RAMState *rs,
PageSearchStatus *pss,
* 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;
+ pages = save_normal_page(rs, block, offset, p, true);
} else {
pages = compress_page_with_multi_thread(rs, block, offset);
}
--
2.17.0
- Re: [Qemu-devel] [PULL 01/16] migration: introduce postcopy-blocktime capability, (continued)
- [Qemu-devel] [PULL 02/16] migration: add postcopy blocktime ctx into MigrationIncomingState, Dr. David Alan Gilbert (git), 2018/04/25
- [Qemu-devel] [PULL 05/16] migration: add blocktime calculation into migration-test, Dr. David Alan Gilbert (git), 2018/04/25
- [Qemu-devel] [PULL 08/16] migration: stop compression to allocate and free memory frequently, Dr. David Alan Gilbert (git), 2018/04/25
- [Qemu-devel] [PULL 07/16] migration: stop compressing page in migration thread, Dr. David Alan Gilbert (git), 2018/04/25
- [Qemu-devel] [PULL 09/16] migration: stop decompression to allocate and free memory frequently, Dr. David Alan Gilbert (git), 2018/04/25
- [Qemu-devel] [PULL 06/16] migration: add postcopy total blocktime into query-migrate, Dr. David Alan Gilbert (git), 2018/04/25
- [Qemu-devel] [PULL 15/16] migration: introduce save_normal_page(),
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 14/16] migration: move calling save_zero_page to the common place, Dr. David Alan Gilbert (git), 2018/04/25
- [Qemu-devel] [PULL 03/16] migration: calculate vCPU blocktime on dst side, Dr. David Alan Gilbert (git), 2018/04/25
- [Qemu-devel] [PULL 10/16] migration: detect compression and decompression errors, Dr. David Alan Gilbert (git), 2018/04/25
- [Qemu-devel] [PULL 12/16] migration: move some code to ram_save_host_page, Dr. David Alan Gilbert (git), 2018/04/25
- [Qemu-devel] [PULL 11/16] migration: introduce control_save_page(), Dr. David Alan Gilbert (git), 2018/04/25
- [Qemu-devel] [PULL 13/16] migration: move calling control_save_page to the common place, Dr. David Alan Gilbert (git), 2018/04/25
- [Qemu-devel] [PULL 16/16] migration: remove ram_save_compressed_page(), Dr. David Alan Gilbert (git), 2018/04/25
- Re: [Qemu-devel] [PULL 00/16] migration queue, Peter Maydell, 2018/04/26