|
 |
357786 |
From 5c9d6d50076df3032b1d09196e36c33004eb52fb Mon Sep 17 00:00:00 2001
|
|
|
357786 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
357786 |
Date: Fri, 22 Jun 2018 18:59:57 +0200
|
|
|
357786 |
Subject: [PATCH 18/57] migration: remove ram_save_compressed_page()
|
|
|
357786 |
|
|
|
357786 |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
357786 |
Message-id: <20180622190005.21297-11-dgilbert@redhat.com>
|
|
|
357786 |
Patchwork-id: 81011
|
|
|
357786 |
O-Subject: [RHEL7.6 qemu-kvm-rhev PATCH 10/18] migration: remove ram_save_compressed_page()
|
|
|
357786 |
Bugzilla: 1584139
|
|
|
357786 |
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
|
357786 |
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
|
357786 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
357786 |
|
|
|
357786 |
From: Xiao Guangrong <xiaoguangrong@tencent.com>
|
|
|
357786 |
|
|
|
357786 |
Now, we can reuse the path in ram_save_page() to post the page out
|
|
|
357786 |
as normal, then the only thing remained in ram_save_compressed_page()
|
|
|
357786 |
is compression that we can move it out to the caller
|
|
|
357786 |
|
|
|
357786 |
Reviewed-by: Peter Xu <peterx@redhat.com>
|
|
|
357786 |
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
357786 |
Signed-off-by: Xiao Guangrong <xiaoguangrong@tencent.com>
|
|
|
357786 |
Message-Id: <20180330075128.26919-11-xiaoguangrong@tencent.com>
|
|
|
357786 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
357786 |
(cherry picked from commit da3f56cb2e767016d3f204837a77caf35b463f90)
|
|
|
357786 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
357786 |
---
|
|
|
357786 |
migration/ram.c | 45 ++++++++-------------------------------------
|
|
|
357786 |
1 file changed, 8 insertions(+), 37 deletions(-)
|
|
|
357786 |
|
|
|
357786 |
diff --git a/migration/ram.c b/migration/ram.c
|
|
|
357786 |
index 908879f..466609f 100644
|
|
|
357786 |
--- a/migration/ram.c
|
|
|
357786 |
+++ b/migration/ram.c
|
|
|
357786 |
@@ -1186,41 +1186,6 @@ static int compress_page_with_multi_thread(RAMState *rs, RAMBlock *block,
|
|
|
357786 |
}
|
|
|
357786 |
|
|
|
357786 |
/**
|
|
|
357786 |
- * ram_save_compressed_page: compress the given page and send it to the stream
|
|
|
357786 |
- *
|
|
|
357786 |
- * Returns the number of pages written.
|
|
|
357786 |
- *
|
|
|
357786 |
- * @rs: current RAM state
|
|
|
357786 |
- * @block: block that contains the page we want to send
|
|
|
357786 |
- * @offset: offset inside the block for the page
|
|
|
357786 |
- * @last_stage: if we are at the completion stage
|
|
|
357786 |
- */
|
|
|
357786 |
-static int ram_save_compressed_page(RAMState *rs, PageSearchStatus *pss,
|
|
|
357786 |
- bool last_stage)
|
|
|
357786 |
-{
|
|
|
357786 |
- int pages = -1;
|
|
|
357786 |
- uint8_t *p;
|
|
|
357786 |
- RAMBlock *block = pss->block;
|
|
|
357786 |
- ram_addr_t offset = pss->page << TARGET_PAGE_BITS;
|
|
|
357786 |
-
|
|
|
357786 |
- p = block->host + offset;
|
|
|
357786 |
-
|
|
|
357786 |
- if (block != rs->last_sent_block) {
|
|
|
357786 |
- /*
|
|
|
357786 |
- * Make sure the first page is sent out before other pages.
|
|
|
357786 |
- *
|
|
|
357786 |
- * we post it as normal page as compression will take much
|
|
|
357786 |
- * CPU resource.
|
|
|
357786 |
- */
|
|
|
357786 |
- pages = save_normal_page(rs, block, offset, p, true);
|
|
|
357786 |
- } else {
|
|
|
357786 |
- pages = compress_page_with_multi_thread(rs, block, offset);
|
|
|
357786 |
- }
|
|
|
357786 |
-
|
|
|
357786 |
- return pages;
|
|
|
357786 |
-}
|
|
|
357786 |
-
|
|
|
357786 |
-/**
|
|
|
357786 |
* find_dirty_block: find the next dirty page and update any state
|
|
|
357786 |
* associated with the search process.
|
|
|
357786 |
*
|
|
|
357786 |
@@ -1519,8 +1484,14 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss,
|
|
|
357786 |
return res;
|
|
|
357786 |
}
|
|
|
357786 |
|
|
|
357786 |
- if (save_page_use_compression(rs)) {
|
|
|
357786 |
- return ram_save_compressed_page(rs, pss, last_stage);
|
|
|
357786 |
+ /*
|
|
|
357786 |
+ * Make sure the first page is sent out before other pages.
|
|
|
357786 |
+ *
|
|
|
357786 |
+ * we post it as normal page as compression will take much
|
|
|
357786 |
+ * CPU resource.
|
|
|
357786 |
+ */
|
|
|
357786 |
+ if (block == rs->last_sent_block && save_page_use_compression(rs)) {
|
|
|
357786 |
+ res = compress_page_with_multi_thread(rs, block, offset);
|
|
|
357786 |
}
|
|
|
357786 |
|
|
|
357786 |
return ram_save_page(rs, pss, last_stage);
|
|
|
357786 |
--
|
|
|
357786 |
1.8.3.1
|
|
|
357786 |
|