[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 4/8] migration: Do chunk page in postcopy_each_ram_send_discar
From: |
Peter Xu |
Subject: |
[PATCH v2 4/8] migration: Do chunk page in postcopy_each_ram_send_discard() |
Date: |
Mon, 20 Dec 2021 16:53:51 +0800 |
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.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/ram.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index b22c9e7432..e7107b9790 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2468,6 +2468,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
*
@@ -2489,6 +2491,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
@@ -2589,7 +2599,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();
@@ -2601,15 +2610,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.32.0
- [PATCH v2 0/8] migration: Postcopy cleanup on ram disgard, Peter Xu, 2021/12/20
- [PATCH v2 3/8] migration: Drop postcopy_chunk_hostpages(), Peter Xu, 2021/12/20
- [PATCH v2 8/8] migration: Tracepoint change in postcopy-run bottom half, Peter Xu, 2021/12/20
- [PATCH v2 2/8] migration: Don't return for postcopy_chunk_hostpages(), Peter Xu, 2021/12/20
- [PATCH v2 6/8] migration: Dump sub-cmd name in loadvm_process_command tp, Peter Xu, 2021/12/20
- [PATCH v2 4/8] migration: Do chunk page in postcopy_each_ram_send_discard(),
Peter Xu <=
- [PATCH v2 5/8] migration: Drop return code for disgard ram process, Peter Xu, 2021/12/20
- [PATCH v2 7/8] migration: Finer grained tracepoints for POSTCOPY_LISTEN, Peter Xu, 2021/12/20
- [PATCH v2 1/8] migration: Drop dead code of ram_debug_dump_bitmap(), Peter Xu, 2021/12/20