From: guangrong.xiao@gmail.com To: pbonzini@redhat.com, mst@redhat.com, mtosatti@redhat.com Cc: kvm@vger.kernel.org, Xiao Guangrong <xiaoguangrong@tencent.com>, qemu-devel@nongnu.org, peterx@redhat.com, dgilbert@redhat.com, wei.w.wang@intel.com, jiang.biao2@zte.com.cn Subject: [PATCH v2 06/10] migration: move some code ram_save_host_page Date: Tue, 27 Mar 2018 17:10:39 +0800 [thread overview] Message-ID: <20180327091043.30220-7-xiaoguangrong@tencent.com> (raw) In-Reply-To: <20180327091043.30220-1-xiaoguangrong@tencent.com> From: Xiao Guangrong <xiaoguangrong@tencent.com> Move some code from ram_save_target_page() to ram_save_host_page() to make it be more readable for latter patches that dramatically clean ram_save_target_page() up Signed-off-by: Xiao Guangrong <xiaoguangrong@tencent.com> --- migration/ram.c | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index fc1fde7bb7..104d3d3e9f 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1485,38 +1485,23 @@ err: * Returns the number of pages written * * @rs: current RAM state - * @ms: current migration state * @pss: data about the page we want to send * @last_stage: if we are at the completion stage */ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss, bool last_stage) { - int res = 0; - - /* Check the pages is dirty and if it is send it */ - if (migration_bitmap_clear_dirty(rs, pss->block, pss->page)) { - /* - * If xbzrle is on, stop using the data compression after first - * round of migration even if compression is enabled. In theory, - * xbzrle can do better than compression. - */ - if (migrate_use_compression() && - (rs->ram_bulk_stage || !migrate_use_xbzrle())) { - res = ram_save_compressed_page(rs, pss, last_stage); - } else { - res = ram_save_page(rs, pss, last_stage); - } - - if (res < 0) { - return res; - } - if (pss->block->unsentmap) { - clear_bit(pss->page, pss->block->unsentmap); - } + /* + * If xbzrle is on, stop using the data compression after first + * round of migration even if compression is enabled. In theory, + * xbzrle can do better than compression. + */ + if (migrate_use_compression() && + (rs->ram_bulk_stage || !migrate_use_xbzrle())) { + return ram_save_compressed_page(rs, pss, last_stage); } - return res; + return ram_save_page(rs, pss, last_stage); } /** @@ -1545,12 +1530,22 @@ static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss, qemu_ram_pagesize(pss->block) >> TARGET_PAGE_BITS; do { + /* Check the pages is dirty and if it is send it */ + if (!migration_bitmap_clear_dirty(rs, pss->block, pss->page)) { + pss->page++; + continue; + } + tmppages = ram_save_target_page(rs, pss, last_stage); if (tmppages < 0) { return tmppages; } pages += tmppages; + if (pss->block->unsentmap) { + clear_bit(pss->page, pss->block->unsentmap); + } + pss->page++; } while ((pss->page & (pagesize_bits - 1)) && offset_in_ramblock(pss->block, pss->page << TARGET_PAGE_BITS)); -- 2.14.3
WARNING: multiple messages have this Message-ID (diff)
From: guangrong.xiao@gmail.com To: pbonzini@redhat.com, mst@redhat.com, mtosatti@redhat.com Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, dgilbert@redhat.com, peterx@redhat.com, jiang.biao2@zte.com.cn, wei.w.wang@intel.com, Xiao Guangrong <xiaoguangrong@tencent.com> Subject: [Qemu-devel] [PATCH v2 06/10] migration: move some code ram_save_host_page Date: Tue, 27 Mar 2018 17:10:39 +0800 [thread overview] Message-ID: <20180327091043.30220-7-xiaoguangrong@tencent.com> (raw) In-Reply-To: <20180327091043.30220-1-xiaoguangrong@tencent.com> From: Xiao Guangrong <xiaoguangrong@tencent.com> Move some code from ram_save_target_page() to ram_save_host_page() to make it be more readable for latter patches that dramatically clean ram_save_target_page() up Signed-off-by: Xiao Guangrong <xiaoguangrong@tencent.com> --- migration/ram.c | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index fc1fde7bb7..104d3d3e9f 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1485,38 +1485,23 @@ err: * Returns the number of pages written * * @rs: current RAM state - * @ms: current migration state * @pss: data about the page we want to send * @last_stage: if we are at the completion stage */ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss, bool last_stage) { - int res = 0; - - /* Check the pages is dirty and if it is send it */ - if (migration_bitmap_clear_dirty(rs, pss->block, pss->page)) { - /* - * If xbzrle is on, stop using the data compression after first - * round of migration even if compression is enabled. In theory, - * xbzrle can do better than compression. - */ - if (migrate_use_compression() && - (rs->ram_bulk_stage || !migrate_use_xbzrle())) { - res = ram_save_compressed_page(rs, pss, last_stage); - } else { - res = ram_save_page(rs, pss, last_stage); - } - - if (res < 0) { - return res; - } - if (pss->block->unsentmap) { - clear_bit(pss->page, pss->block->unsentmap); - } + /* + * If xbzrle is on, stop using the data compression after first + * round of migration even if compression is enabled. In theory, + * xbzrle can do better than compression. + */ + if (migrate_use_compression() && + (rs->ram_bulk_stage || !migrate_use_xbzrle())) { + return ram_save_compressed_page(rs, pss, last_stage); } - return res; + return ram_save_page(rs, pss, last_stage); } /** @@ -1545,12 +1530,22 @@ static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss, qemu_ram_pagesize(pss->block) >> TARGET_PAGE_BITS; do { + /* Check the pages is dirty and if it is send it */ + if (!migration_bitmap_clear_dirty(rs, pss->block, pss->page)) { + pss->page++; + continue; + } + tmppages = ram_save_target_page(rs, pss, last_stage); if (tmppages < 0) { return tmppages; } pages += tmppages; + if (pss->block->unsentmap) { + clear_bit(pss->page, pss->block->unsentmap); + } + pss->page++; } while ((pss->page & (pagesize_bits - 1)) && offset_in_ramblock(pss->block, pss->page << TARGET_PAGE_BITS)); -- 2.14.3
next prev parent reply other threads:[~2018-03-27 9:10 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-03-27 9:10 [PATCH v2 00/10] migration: improve and cleanup compression guangrong.xiao 2018-03-27 9:10 ` [Qemu-devel] " guangrong.xiao 2018-03-27 9:10 ` [PATCH v2 01/10] migration: stop compressing page in migration thread guangrong.xiao 2018-03-27 9:10 ` [Qemu-devel] " guangrong.xiao 2018-03-27 9:10 ` [PATCH v2 02/10] migration: stop compression to allocate and free memory frequently guangrong.xiao 2018-03-27 9:10 ` [Qemu-devel] " guangrong.xiao 2018-03-28 9:25 ` Peter Xu 2018-03-28 9:25 ` [Qemu-devel] " Peter Xu 2018-03-29 3:41 ` Xiao Guangrong 2018-03-29 3:41 ` [Qemu-devel] " Xiao Guangrong 2018-03-27 9:10 ` [PATCH v2 03/10] migration: stop decompression " guangrong.xiao 2018-03-27 9:10 ` [Qemu-devel] " guangrong.xiao 2018-03-28 9:42 ` Peter Xu 2018-03-28 9:42 ` [Qemu-devel] " Peter Xu 2018-03-29 3:43 ` Xiao Guangrong 2018-03-29 3:43 ` [Qemu-devel] " Xiao Guangrong 2018-03-29 4:14 ` Peter Xu 2018-03-29 4:14 ` [Qemu-devel] " Peter Xu 2018-03-27 9:10 ` [PATCH v2 04/10] migration: detect compression and decompression errors guangrong.xiao 2018-03-27 9:10 ` [Qemu-devel] " guangrong.xiao 2018-03-28 9:59 ` Peter Xu 2018-03-28 9:59 ` [Qemu-devel] " Peter Xu 2018-03-29 3:51 ` Xiao Guangrong 2018-03-29 3:51 ` [Qemu-devel] " Xiao Guangrong 2018-03-29 4:25 ` Peter Xu 2018-03-29 4:25 ` [Qemu-devel] " Peter Xu 2018-03-30 3:11 ` Xiao Guangrong 2018-03-30 3:11 ` [Qemu-devel] " Xiao Guangrong 2018-04-02 4:26 ` Peter Xu 2018-04-02 4:26 ` [Qemu-devel] " Peter Xu 2018-03-27 9:10 ` [PATCH v2 05/10] migration: introduce control_save_page() guangrong.xiao 2018-03-27 9:10 ` [Qemu-devel] " guangrong.xiao 2018-03-27 9:10 ` guangrong.xiao [this message] 2018-03-27 9:10 ` [Qemu-devel] [PATCH v2 06/10] migration: move some code ram_save_host_page guangrong.xiao 2018-03-28 10:05 ` Peter Xu 2018-03-28 10:05 ` [Qemu-devel] " Peter Xu 2018-03-27 9:10 ` [PATCH v2 07/10] migration: move calling control_save_page to the common place guangrong.xiao 2018-03-27 9:10 ` [Qemu-devel] " guangrong.xiao 2018-03-27 9:10 ` [PATCH v2 08/10] migration: move calling save_zero_page " guangrong.xiao 2018-03-27 9:10 ` [Qemu-devel] " guangrong.xiao 2018-03-27 9:10 ` [PATCH v2 09/10] migration: introduce save_normal_page() guangrong.xiao 2018-03-27 9:10 ` [Qemu-devel] " guangrong.xiao 2018-03-27 9:10 ` [PATCH v2 10/10] migration: remove ram_save_compressed_page() guangrong.xiao 2018-03-27 9:10 ` [Qemu-devel] " guangrong.xiao
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180327091043.30220-7-xiaoguangrong@tencent.com \ --to=guangrong.xiao@gmail.com \ --cc=dgilbert@redhat.com \ --cc=jiang.biao2@zte.com.cn \ --cc=kvm@vger.kernel.org \ --cc=mst@redhat.com \ --cc=mtosatti@redhat.com \ --cc=pbonzini@redhat.com \ --cc=peterx@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=wei.w.wang@intel.com \ --cc=xiaoguangrong@tencent.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.