[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 01/10] XBZRLE: Fix one XBZRLE corruption issues
From: |
arei.gonglei |
Subject: |
[Qemu-devel] [PATCH v5 01/10] XBZRLE: Fix one XBZRLE corruption issues |
Date: |
Fri, 4 Apr 2014 17:57:53 +0800 |
From: ChenLiang <address@hidden>
The page may not be inserted into cache after executing save_xbzrle_page.
In case of failure to insert, the original page should be sent rather
than the page in the cache.
Signed-off-by: ChenLiang <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
---
arch_init.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 60c975d..2ac68c2 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -340,7 +340,7 @@ static void xbzrle_cache_zero_page(ram_addr_t current_addr)
#define ENCODING_FLAG_XBZRLE 0x1
-static int save_xbzrle_page(QEMUFile *f, uint8_t *current_data,
+static int save_xbzrle_page(QEMUFile *f, uint8_t **current_data,
ram_addr_t current_addr, RAMBlock *block,
ram_addr_t offset, int cont, bool last_stage)
{
@@ -348,19 +348,23 @@ static int save_xbzrle_page(QEMUFile *f, uint8_t
*current_data,
uint8_t *prev_cached_page;
if (!cache_is_cached(XBZRLE.cache, current_addr)) {
+ acct_info.xbzrle_cache_miss++;
if (!last_stage) {
- if (cache_insert(XBZRLE.cache, current_addr, current_data) == -1) {
+ if (cache_insert(XBZRLE.cache, current_addr, *current_data) == -1)
{
return -1;
+ } else {
+ /* update *current_data when the page has been
+ inserted into cache */
+ *current_data = get_cached_data(XBZRLE.cache, current_addr);
}
}
- acct_info.xbzrle_cache_miss++;
return -1;
}
prev_cached_page = get_cached_data(XBZRLE.cache, current_addr);
/* save current buffer into memory */
- memcpy(XBZRLE.current_buf, current_data, TARGET_PAGE_SIZE);
+ memcpy(XBZRLE.current_buf, *current_data, TARGET_PAGE_SIZE);
/* XBZRLE encoding (if there is no overflow) */
encoded_len = xbzrle_encode_buffer(prev_cached_page, XBZRLE.current_buf,
@@ -373,7 +377,10 @@ static int save_xbzrle_page(QEMUFile *f, uint8_t
*current_data,
DPRINTF("Overflow\n");
acct_info.xbzrle_overflows++;
/* update data in the cache */
- memcpy(prev_cached_page, current_data, TARGET_PAGE_SIZE);
+ if (!last_stage) {
+ memcpy(prev_cached_page, *current_data, TARGET_PAGE_SIZE);
+ *current_data = prev_cached_page;
+ }
return -1;
}
@@ -598,15 +605,9 @@ static int ram_save_block(QEMUFile *f, bool last_stage)
*/
xbzrle_cache_zero_page(current_addr);
} else if (!ram_bulk_stage && migrate_use_xbzrle()) {
- bytes_sent = save_xbzrle_page(f, p, current_addr, block,
+ bytes_sent = save_xbzrle_page(f, &p, current_addr, block,
offset, cont, last_stage);
if (!last_stage) {
- /* We must send exactly what's in the xbzrle cache
- * even if the page wasn't xbzrle compressed, so that
- * it's right next time.
- */
- p = get_cached_data(XBZRLE.cache, current_addr);
-
/* Can't send this cached data async, since the cache page
* might get updated before it gets to the wire
*/
--
1.7.12.4
- [Qemu-devel] [PATCH v5 00/10] migration: Optimizate the xbzrle and fix one corruption issue, arei.gonglei, 2014/04/04
- [Qemu-devel] [PATCH v5 10/10] migration: clear the dead code, arei.gonglei, 2014/04/04
- [Qemu-devel] [PATCH v5 09/10] migration: optimize xbzrle by reducing data copy, arei.gonglei, 2014/04/04
- [Qemu-devel] [PATCH v5 03/10] migration: expose the bitmap_sync_count to the end, arei.gonglei, 2014/04/04
- [Qemu-devel] [PATCH v5 05/10] XBZRLE: optimize XBZRLE to decrease the cache misses, arei.gonglei, 2014/04/04
- [Qemu-devel] [PATCH v5 01/10] XBZRLE: Fix one XBZRLE corruption issues,
arei.gonglei <=
- [Qemu-devel] [PATCH v5 04/10] migration: expose xbzrle cache miss rate, arei.gonglei, 2014/04/04
- [Qemu-devel] [PATCH v5 06/10] XBZRLE: rebuild the cache_is_cached function, arei.gonglei, 2014/04/04
- [Qemu-devel] [PATCH v5 07/10] xbzrle: don't check the value in the vm ram repeatedly, arei.gonglei, 2014/04/04
- [Qemu-devel] [PATCH v5 02/10] migration: Add counts of updating the dirty bitmap, arei.gonglei, 2014/04/04
- [Qemu-devel] [PATCH v5 08/10] xbzrle: check 8 bytes at a time after an concurrency scene, arei.gonglei, 2014/04/04
- Re: [Qemu-devel] [PATCH v5 00/10] migration: Optimizate the xbzrle and fix one corruption issue, Dr. David Alan Gilbert, 2014/04/04
- [Qemu-devel] For 2.0? Re: [PATCH v5 00/10] migration: Optimizate the xbzrle and fix one corruption issue, Eric Blake, 2014/04/04