[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/10] Add the function of colo_bitmap_clear_diry
From: |
leirao |
Subject: |
[PATCH 09/10] Add the function of colo_bitmap_clear_diry |
Date: |
Wed, 13 Jan 2021 10:46:34 +0800 |
From: "Rao, Lei" <lei.rao@intel.com>
When we use continuous dirty memory copy for flushing ram cache on
secondary VM, we can also clean up the bitmap of contiguous dirty
page memory. This also can reduce the VM stop time during checkpoint.
Signed-off-by: Lei Rao <lei.rao@intel.com>
---
migration/ram.c | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index d875e9a..0f43b79 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -839,6 +839,30 @@ unsigned long colo_bitmap_find_dirty(RAMState *rs,
RAMBlock *rb,
return first;
}
+/**
+ * colo_bitmap_clear_dirty:when we flush ram cache to ram, we will use
+ * continuous memory copy, so we can also clean up the bitmap of contiguous
+ * dirty memory.
+ */
+static inline bool colo_bitmap_clear_dirty(RAMState *rs,
+ RAMBlock *rb,
+ unsigned long start,
+ unsigned long num)
+{
+ bool ret;
+ unsigned long i = 0;
+
+ qemu_mutex_lock(&rs->bitmap_mutex);
+ for (i = 0; i < num; i++) {
+ ret = test_and_clear_bit(start + i, rb->bmap);
+ if (ret) {
+ rs->migration_dirty_pages--;
+ }
+ }
+ qemu_mutex_unlock(&rs->bitmap_mutex);
+ return ret;
+}
+
static inline bool migration_bitmap_clear_dirty(RAMState *rs,
RAMBlock *rb,
unsigned long page)
@@ -3406,7 +3430,6 @@ void colo_flush_ram_cache(void)
void *src_host;
unsigned long offset = 0;
unsigned long num = 0;
- unsigned long i = 0;
memory_global_dirty_log_sync();
WITH_RCU_READ_LOCK_GUARD() {
@@ -3428,9 +3451,7 @@ void colo_flush_ram_cache(void)
num = 0;
block = QLIST_NEXT_RCU(block, next);
} else {
- for (i = 0; i < num; i++) {
- migration_bitmap_clear_dirty(ram_state, block, offset + i);
- }
+ colo_bitmap_clear_dirty(ram_state, block, offset, num);
dst_host = block->host
+ (((ram_addr_t)offset) << TARGET_PAGE_BITS);
src_host = block->colo_cache
--
1.8.3.1
- RE: [PATCH 03/10] Optimize the function of filter_send, (continued)
- [PATCH 04/10] Remove migrate_set_block_enabled in checkpoint, leirao, 2021/01/12
- [PATCH 05/10] Optimize the function of packet_new, leirao, 2021/01/12
- [PATCH 06/10] Add the function of colo_compare_cleanup, leirao, 2021/01/12
- [PATCH 08/10] Reduce the PVM stop time during Checkpoint, leirao, 2021/01/12
- [PATCH 07/10] Disable auto-coverge before entering COLO mode., leirao, 2021/01/12
- [PATCH 09/10] Add the function of colo_bitmap_clear_diry,
leirao <=
- [PATCH 10/10] Fixed calculation error of pkt->header_size in fill_pkt_tcp_info(), leirao, 2021/01/12