[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 27/36] migration: Do chunk page in postcopy_each_ram_send_discard(
From: |
Juan Quintela |
Subject: |
[PULL 27/36] migration: Do chunk page in postcopy_each_ram_send_discard() |
Date: |
Fri, 28 Jan 2022 19:30:24 +0100 |
From: Peter Xu <peterx@redhat.com>
Right now we loop ramblocks for twice, the 1st time chunk the dirty bits with
huge page information; the 2nd time we send the discard ranges. That's not
necessary - we can do them in a single loop.
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/ram.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 91d32002e8..d74a8c04b6 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2454,6 +2454,8 @@ static int postcopy_send_discard_bm_ram(MigrationState
*ms, RAMBlock *block)
return 0;
}
+static void postcopy_chunk_hostpages_pass(MigrationState *ms, RAMBlock *block);
+
/**
* postcopy_each_ram_send_discard: discard all RAMBlocks
*
@@ -2475,6 +2477,14 @@ static int postcopy_each_ram_send_discard(MigrationState
*ms)
RAMBLOCK_FOREACH_NOT_IGNORED(block) {
postcopy_discard_send_init(ms, block->idstr);
+ /*
+ * Deal with TPS != HPS and huge pages. It discard any partially sent
+ * host-page size chunks, mark any partially dirty host-page size
+ * chunks as all dirty. In this case the host-page is the host-page
+ * for the particular RAMBlock, i.e. it might be a huge page.
+ */
+ postcopy_chunk_hostpages_pass(ms, block);
+
/*
* Postcopy sends chunks of bitmap over the wire, but it
* just needs indexes at this point, avoids it having
@@ -2575,7 +2585,6 @@ static void postcopy_chunk_hostpages_pass(MigrationState
*ms, RAMBlock *block)
int ram_postcopy_send_discard_bitmap(MigrationState *ms)
{
RAMState *rs = ram_state;
- RAMBlock *block;
RCU_READ_LOCK_GUARD();
@@ -2587,15 +2596,6 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms)
rs->last_sent_block = NULL;
rs->last_page = 0;
- RAMBLOCK_FOREACH_NOT_IGNORED(block) {
- /*
- * Deal with TPS != HPS and huge pages. It discard any partially sent
- * host-page size chunks, mark any partially dirty host-page size
- * chunks as all dirty. In this case the host-page is the host-page
- * for the particular RAMBlock, i.e. it might be a huge page.
- */
- postcopy_chunk_hostpages_pass(ms, block);
- }
trace_ram_postcopy_send_discard_bitmap();
return postcopy_each_ram_send_discard(ms);
--
2.34.1
- [PULL 16/36] multifd: recv side only needs the RAMBlock host address, (continued)
- [PULL 16/36] multifd: recv side only needs the RAMBlock host address, Juan Quintela, 2022/01/28
- [PULL 17/36] multifd: Rename pages_used to normal_pages, Juan Quintela, 2022/01/28
- [PULL 19/36] migration/migration.c: Add missed default error handler for migration state, Juan Quintela, 2022/01/28
- [PULL 18/36] Remove unnecessary minimum_version_id_old fields, Juan Quintela, 2022/01/28
- [PULL 20/36] migration/migration.c: Avoid COLO boot in postcopy migration, Juan Quintela, 2022/01/28
- [PULL 21/36] migration/migration.c: Remove the MIGRATION_STATUS_ACTIVE when migration finished, Juan Quintela, 2022/01/28
- [PULL 22/36] migration: Report the error returned when save_live_iterate fails, Juan Quintela, 2022/01/28
- [PULL 23/36] migration/ram: clean up unused comment., Juan Quintela, 2022/01/28
- [PULL 25/36] migration: Don't return for postcopy_chunk_hostpages(), Juan Quintela, 2022/01/28
- [PULL 24/36] migration: Drop dead code of ram_debug_dump_bitmap(), Juan Quintela, 2022/01/28
- [PULL 27/36] migration: Do chunk page in postcopy_each_ram_send_discard(),
Juan Quintela <=
- [PULL 26/36] migration: Drop postcopy_chunk_hostpages(), Juan Quintela, 2022/01/28
- [PULL 28/36] migration: Drop return code for disgard ram process, Juan Quintela, 2022/01/28
- [PULL 30/36] migration: Introduce ram_transferred_add(), Juan Quintela, 2022/01/28
- [PULL 29/36] migration: Don't return for postcopy_send_discard_bm_ram(), Juan Quintela, 2022/01/28
- [PULL 31/36] migration: Tally pre-copy, downtime and post-copy bytes independently, Juan Quintela, 2022/01/28
- [PULL 34/36] migration: Add postcopy_has_request(), Juan Quintela, 2022/01/28
- [PULL 32/36] migration: No off-by-one for pss->page update in host page size, Juan Quintela, 2022/01/28
- [PULL 33/36] migration: Enable UFFD_FEATURE_THREAD_ID even without blocktime feat, Juan Quintela, 2022/01/28
- [PULL 36/36] migration: Move temp page setup and cleanup into separate functions, Juan Quintela, 2022/01/28
- [PULL 35/36] migration: Simplify unqueue_page(), Juan Quintela, 2022/01/28