[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 28/38] migration: Drop postcopy_chunk_hostpages()
From: |
Juan Quintela |
Subject: |
[PULL 28/38] migration: Drop postcopy_chunk_hostpages() |
Date: |
Thu, 27 Jan 2022 16:05:38 +0100 |
From: Peter Xu <peterx@redhat.com>
This function calls three functions:
- postcopy_discard_send_init(ms, block->idstr);
- postcopy_chunk_hostpages_pass(ms, block);
- postcopy_discard_send_finish(ms);
However only the 2nd function call is meaningful. It's major role is to make
sure dirty bits are applied in host-page-size granule, so there will be no
partial dirty bits set for a whole host page if huge pages are used.
The 1st/3rd call are for latter when we want to send the disgard ranges.
They're mostly no-op here besides some tracepoints (which are misleading!).
Drop them, then we can directly drop postcopy_chunk_hostpages() as a whole
because we can call postcopy_chunk_hostpages_pass() directly.
There're still some nice comments above postcopy_chunk_hostpages() that explain
what it does. Copy it over to the caller's site.
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 | 33 +++++++--------------------------
1 file changed, 7 insertions(+), 26 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index c60cf5ad83..91d32002e8 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2557,30 +2557,6 @@ static void postcopy_chunk_hostpages_pass(MigrationState
*ms, RAMBlock *block)
}
}
-/**
- * postcopy_chunk_hostpages: discard any partially sent host page
- *
- * Utility for the outgoing postcopy code.
- *
- * 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
- *
- * @ms: current migration state
- * @block: block we want to work with
- */
-static void postcopy_chunk_hostpages(MigrationState *ms, RAMBlock *block)
-{
- postcopy_discard_send_init(ms, block->idstr);
-
- /*
- * Ensure that all partially dirty host pages are made fully dirty.
- */
- postcopy_chunk_hostpages_pass(ms, block);
-
- postcopy_discard_send_finish(ms);
-}
-
/**
* ram_postcopy_send_discard_bitmap: transmit the discard bitmap
*
@@ -2612,8 +2588,13 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms)
rs->last_page = 0;
RAMBLOCK_FOREACH_NOT_IGNORED(block) {
- /* Deal with TPS != HPS and huge pages */
- postcopy_chunk_hostpages(ms, 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();
--
2.34.1
- [PULL 15/38] multifd: Use normal pages array on the recv side, (continued)
- [PULL 15/38] multifd: Use normal pages array on the recv side, Juan Quintela, 2022/01/27
- [PULL 16/38] multifd: recv side only needs the RAMBlock host address, Juan Quintela, 2022/01/27
- [PULL 17/38] multifd: Rename pages_used to normal_pages, Juan Quintela, 2022/01/27
- [PULL 18/38] Remove unnecessary minimum_version_id_old fields, Juan Quintela, 2022/01/27
- [PULL 19/38] migration/migration.c: Add missed default error handler for migration state, Juan Quintela, 2022/01/27
- [PULL 20/38] migration/migration.c: Avoid COLO boot in postcopy migration, Juan Quintela, 2022/01/27
- [PULL 22/38] migration: Report the error returned when save_live_iterate fails, Juan Quintela, 2022/01/27
- [PULL 21/38] migration/migration.c: Remove the MIGRATION_STATUS_ACTIVE when migration finished, Juan Quintela, 2022/01/27
- [PULL 25/38] migration/ram: clean up unused comment., Juan Quintela, 2022/01/27
- [PULL 23/38] migration: Add canary to VMSTATE_END_OF_LIST, Juan Quintela, 2022/01/27
- [PULL 28/38] migration: Drop postcopy_chunk_hostpages(),
Juan Quintela <=
- [PULL 27/38] migration: Don't return for postcopy_chunk_hostpages(), Juan Quintela, 2022/01/27
- [PULL 26/38] migration: Drop dead code of ram_debug_dump_bitmap(), Juan Quintela, 2022/01/27
- [PULL 24/38] migration: Perform vmsd structure check during tests, Juan Quintela, 2022/01/27
- [PULL 29/38] migration: Do chunk page in postcopy_each_ram_send_discard(), Juan Quintela, 2022/01/27
- [PULL 30/38] migration: Drop return code for disgard ram process, Juan Quintela, 2022/01/27
- [PULL 31/38] migration: Don't return for postcopy_send_discard_bm_ram(), Juan Quintela, 2022/01/27
- [PULL 32/38] migration: Introduce ram_transferred_add(), Juan Quintela, 2022/01/27
- [PULL 33/38] migration: Tally pre-copy, downtime and post-copy bytes independently, Juan Quintela, 2022/01/27
- [PULL 34/38] migration: No off-by-one for pss->page update in host page size, Juan Quintela, 2022/01/27
- [PULL 35/38] migration: Enable UFFD_FEATURE_THREAD_ID even without blocktime feat, Juan Quintela, 2022/01/27