[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/26] ram/COLO: Record the dirty pages that SVM rece
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 08/26] ram/COLO: Record the dirty pages that SVM received |
Date: |
Mon, 15 Oct 2018 16:46:08 +0800 |
From: Zhang Chen <address@hidden>
We record the address of the dirty pages that received,
it will help flushing pages that cached into SVM.
Here, it is a trick, we record dirty pages by re-using migration
dirty bitmap. In the later patch, we will start the dirty log
for SVM, just like migration, in this way, we can record both
the dirty pages caused by PVM and SVM, we only flush those dirty
pages from RAM cache while do checkpoint.
Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
migration/ram.c | 43 ++++++++++++++++++++++++++++++++++++++++---
1 file changed, 40 insertions(+), 3 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index cd7a446..404c8f0 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3458,6 +3458,15 @@ static inline void
*colo_cache_from_block_offset(RAMBlock *block,
__func__, block->idstr);
return NULL;
}
+
+ /*
+ * During colo checkpoint, we need bitmap of these migrated pages.
+ * It help us to decide which pages in ram cache should be flushed
+ * into VM's RAM later.
+ */
+ if (!test_and_set_bit(offset >> TARGET_PAGE_BITS, block->bmap)) {
+ ram_state->migration_dirty_pages++;
+ }
return block->colo_cache + offset;
}
@@ -3675,7 +3684,7 @@ int colo_init_ram_cache(void)
RAMBlock *block;
rcu_read_lock();
- QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
+ RAMBLOCK_FOREACH_MIGRATABLE(block) {
block->colo_cache = qemu_anon_ram_alloc(block->used_length,
NULL,
false);
@@ -3688,10 +3697,29 @@ int colo_init_ram_cache(void)
memcpy(block->colo_cache, block->host, block->used_length);
}
rcu_read_unlock();
+ /*
+ * Record the dirty pages that sent by PVM, we use this dirty bitmap
together
+ * with to decide which page in cache should be flushed into SVM's RAM. Here
+ * we use the same name 'ram_bitmap' as for migration.
+ */
+ if (ram_bytes_total()) {
+ RAMBlock *block;
+
+ RAMBLOCK_FOREACH_MIGRATABLE(block) {
+ unsigned long pages = block->max_length >> TARGET_PAGE_BITS;
+
+ block->bmap = bitmap_new(pages);
+ bitmap_set(block->bmap, 0, pages);
+ }
+ }
+ ram_state = g_new0(RAMState, 1);
+ ram_state->migration_dirty_pages = 0;
+
return 0;
out_locked:
- QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
+
+ RAMBLOCK_FOREACH_MIGRATABLE(block) {
if (block->colo_cache) {
qemu_anon_ram_free(block->colo_cache, block->used_length);
block->colo_cache = NULL;
@@ -3707,14 +3735,23 @@ void colo_release_ram_cache(void)
{
RAMBlock *block;
+ RAMBLOCK_FOREACH_MIGRATABLE(block) {
+ g_free(block->bmap);
+ block->bmap = NULL;
+ }
+
rcu_read_lock();
- QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
+
+ RAMBLOCK_FOREACH_MIGRATABLE(block) {
if (block->colo_cache) {
qemu_anon_ram_free(block->colo_cache, block->used_length);
block->colo_cache = NULL;
}
}
+
rcu_read_unlock();
+ g_free(ram_state);
+ ram_state = NULL;
}
/**
--
2.5.0
- [Qemu-devel] [PULL 00/26] Net patches, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 01/26] filter-rewriter: Add TCP state machine and fix memory leak in connection_track_table, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 09/26] COLO: Flush memory data from ram cache, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 02/26] colo-compare: implement the process of checkpoint, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 08/26] ram/COLO: Record the dirty pages that SVM received,
Jason Wang <=
- [Qemu-devel] [PULL 11/26] qapi/migration.json: Rename COLO unknown mode to none mode., Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 04/26] COLO: integrate colo compare with colo frame, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 10/26] qmp event: Add COLO_EXIT event to notify users while exited COLO, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 05/26] COLO: Add block replication into colo process, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 14/26] COLO: flush host dirty ram from cache, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 18/26] COLO: quick failover process by kick COLO thread, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 03/26] colo-compare: use notifier to notify packets comparing result, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 15/26] filter: Add handle_event method for NetFilterClass, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 19/26] docs: Add COLO status diagram to COLO-FT.txt, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 13/26] savevm: split the process of different stages for loadvm/savevm, Jason Wang, 2018/10/15