migration/postcopy: enable compress during postcopy
v2 cover migration/postcopy: enable compress during postcopy
This patch set tries enable compress during postcopy.
postcopy requires to place a whole host page, while migration thread migrate memory in target page size. This makes postcopy need to collect all target pages in one host page before placing via userfaultfd.
To enable compress during postcopy, there are two problems to solve:
1. Random order for target page arrival
2. Target pages in one host page arrives without interrupt by target page from other host page
The first one is handled by counting the number of target pages arrived instead of the last target page arrived.
The second one is handled by:
1. Flush compress thread for each host page
2. Wait for decompress thread for before placing host page
With the combination of these two changes, compress is enabled during postcopy.
---
v2:
* use uintptr_t to calculate place_dest
* check target pages belongs to the same host page
Wei Yang (6):
migration/postcopy: reduce memset when it is zero page and
matches_target_page_size
migration/postcopy: wait for decompress thread in precopy migration/postcopy: count target page number to decide the
place_needed
migration/postcopy: set all_zero to true on the first target page migration/postcopy: enable random order target page arrival migration/postcopy: enable compress during postcopy
migration/migration.c | 11 ------- migration/ram.c | 67 +++++++++++++++++++++++++++++++++---------- 2 files changed, 52 insertions(+), 26 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/6 migration/postcopy: reduce memset when it is zero page and matches_target_page_size
In this case, page_buffer content would not be used.
Skip this to save some time.
--- migration/ram.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
migration/ram.c +7 -1
@@ -4091,7 +4091,13 @@ static int ram_load_postcopy(QEMUFile *f)switch (flags & ~RAM_SAVE_FLAG_CONTINUE ) {case RAM_SAVE_FLAG_ZERO : ch =qemu_get_byte (f); -memset (page_buffer, ch,TARGET_PAGE_SIZE ); +/* +* Can skip to set page_buffer when +* this is a zero page and (block->page_size == TARGET_PAGE_SIZE). +*/ +if (ch || !matches_target_page_size) { +memset (page_buffer, ch,TARGET_PAGE_SIZE ); + }if (ch) { all_zero = false; }
Signature · 1 line
2.17.1
Re: [Patch v2 1/6] migration/postcopy: reduce memset when it is zero page and matches_target_page_size
Quoted 6 lines · Wei Yang
In this case,
page_buffercontent would not be used.Skip this to save some time.
Signed-off-by Wei Yang <[email protected]>Reviewed-by Dr. David Alan Gilbert <[email protected]>
PATCH v2 2/6 migration/postcopy: wait for decompress thread in precopy
In reply to Wei YangCompress is not supported with postcopy, it is safe to wait for decompress thread just in precopy.
This is a preparation for later patch.
--- migration/ram.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
migration/ram.c +1 -2
@@ -4375,6 +4375,7 @@ static int ram_load_precopy(QEMUFile *f) } } + ret |=wait_for_decompress_done ();return ret; }
@@ -4406,8 +4407,6 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) }else { ret =ram_load_precopy (f); } - - ret |=wait_for_decompress_done (); }trace_ram_load_complete (ret, seq_iter);
Signature · 1 line
2.17.1
Re: [Patch v2 2/6] migration/postcopy: wait for decompress thread in precopy
Quoted 7 lines · Wei Yang
Compress is not supported with postcopy, it is safe to wait for decompress thread just in precopy.
This is a preparation for later patch.
Signed-off-by Wei Yang <[email protected]>Reviewed-by Dr. David Alan Gilbert <[email protected]>
PATCH v2 3/6 migration/postcopy: count target page number to decide the place_needed
In reply to Wei YangIn postcopy, it requires to place whole host page instead of target page.
Currently, it relies on the page offset to decide whether this is the last target page. We also can count the target page number during the iteration. When the number of target page equals
(host page size / target page size), this means it is the last target page in the host page.
This is a preparation for non-ordered target page transmission.
--- migration/ram.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
migration/ram.c +6 -2
@@ -4017,6 +4017,7 @@ static int ram_load_postcopy(QEMUFile *f)void *postcopy_host_page = mis->postcopy_tmp_page;void *last_host =NULL ;bool all_zero = false; +int target_pages =0 ;while (!ret && !(flags &RAM_SAVE_FLAG_EOS )) {ram_addr_t addr;
@@ -4051,6 +4052,7 @@ static int ram_load_postcopy(QEMUFile *f) ret = -EINVAL ;break ; } + target_pages++; matches_target_page_size = block->page_size ==TARGET_PAGE_SIZE ;/* * Postcopy requires that we place whole host pages atomically;
@@ -4082,8 +4084,10 @@ static int ram_load_postcopy(QEMUFile *f)* If it's the last part of a host page then we place the host * page */ - place_needed = (((uintptr_t )host +TARGET_PAGE_SIZE ) & - (block->page_size -1 )) ==0 ; +if (target_pages == (block->page_size /TARGET_PAGE_SIZE )) { + place_needed = true; + target_pages =0 ; + } place_source = postcopy_host_page; } last_host = host;
Signature · 1 line
2.17.1
Re: [Patch v2 3/6] migration/postcopy: count target page number to decide the place_needed
Quoted 9 lines · Wei Yang
In postcopy, it requires to place whole host page instead of target page.
Currently, it relies on the page offset to decide whether this is the last target page. We also can count the target page number during the iteration. When the number of target page equals
(host page size / target page size), this means it is the last target page in the host page.
Quoted 4 lines
This is a preparation for non-ordered target page transmission.
Signed-off-by Wei Yang <[email protected]>Reviewed-by Dr. David Alan Gilbert <[email protected]>
PATCH v2 4/6 migration/postcopy: set all_zero to true on the first target page
In reply to Wei YangFor the first target page, all_zero is set to true for this round check.
After target_pages introduced, we could leverage this variable instead of checking the address offset.
--- migration/ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
migration/ram.c +1 -1
@@ -4067,7 +4067,7 @@ static int ram_load_postcopy(QEMUFile *f) page_buffer = postcopy_host_page + ((uintptr_t )host & (block->page_size -1 ));/* If all TP are zero then we can optimise the place */ -if (!((uintptr_t )host & (block->page_size -1 ))) { +if (target_pages ==1 ) { all_zero = true; }else {/* not the 1st TP within the HP */
Signature · 1 line
2.17.1
Re: [Patch v2 4/6] migration/postcopy: set all_zero to true on the first target page
Quoted 7 lines · Wei Yang
For the first target page,
all_zerois set to true for this round check.After
target_pagesintroduced, we could leverage this variable instead of checking the address offset.Signed-off-by Wei Yang <[email protected]>Reviewed-by Dr. David Alan Gilbert <[email protected]>
PATCH v2 5/6 migration/postcopy: enable random order target page arrival
In reply to Wei YangAfter using number of target page received to track one host page, we could have the capability to handle random order target page arrival in one host page.
This is a preparation for enabling compress during postcopy.
---
v2:
* use uintptr_t to calculate place_dest
* check target pages belongs to the same host page
--- migration/ram.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
migration/ram.c +10 -8
@@ -4015,7 +4015,7 @@ static int ram_load_postcopy(QEMUFile *f)MigrationIncomingState *mis =migration_incoming_get_current ();/* Temporary page that is later 'placed' */ void *postcopy_host_page = mis->postcopy_tmp_page; -void *last_host =NULL ; +void *this_host =NULL ;bool all_zero = false;int target_pages =0 ;
@@ -4062,24 +4062,26 @@ static int ram_load_postcopy(QEMUFile *f)* that's moved into place later. * The migration protocol uses, possibly smaller, target-pages * however the source ensures it always sends all the components -* of a host page in order. +* of a host page in one chunk. */ page_buffer = postcopy_host_page + ((uintptr_t )host & (block->page_size -1 ));/* If all TP are zero then we can optimise the place */ if (target_pages ==1 ) { all_zero = true; + this_host = (void *)QEMU_ALIGN_DOWN ((uintptr_t )host, + block->page_size); }else {/* not the 1st TP within the HP */ -if (host != (last_host +TARGET_PAGE_SIZE )) { -error_report ("Non-sequential target page %p/%p" , - host, last_host); +if (QEMU_ALIGN_DOWN ((uintptr_t )host, block->page_size) != + (uintptr_t )this_host) { +error_report ("Non-same host page %p/%p" , + host, this_host); ret = -EINVAL ;break ; } } -/* * If it's the last part of a host page then we place the host * page
@@ -4090,7 +4092,6 @@ static int ram_load_postcopy(QEMUFile *f) } place_source = postcopy_host_page; } - last_host = host;switch (flags & ~RAM_SAVE_FLAG_CONTINUE ) {case RAM_SAVE_FLAG_ZERO :
@@ -4143,7 +4144,8 @@ static int ram_load_postcopy(QEMUFile *f)if (!ret && place_needed) {/* This gets called at the last target page in the host page */ -void *place_dest = host +TARGET_PAGE_SIZE - block->page_size; +void *place_dest = (void *)QEMU_ALIGN_DOWN ((uintptr_t )host, + block->page_size);if (all_zero) { ret = postcopy_place_page_zero(mis, place_dest,
Signature · 1 line
2.17.1
Re: [Patch v2 5/6] migration/postcopy: enable random order target page arrival
Quoted 7 lines · * Wei Yang ([email protected]) wrote:
After using number of target page received to track one host page, we could have the capability to handle random order target page arrival in one host page.
This is a preparation for enabling compress during postcopy.
Signed-off-by Wei Yang <[email protected]>
Yep, that's better
Quoted 74 lines
---
v2:
* useuintptr_tto calculateplace_dest
* check target pages belongs to the same host page--- migration/ram.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)migration/ram.c +10
-8@@ -4015,7 +4015,7 @@ static int ram_load_postcopy(QEMUFile *f)MigrationIncomingState *mis =migration_incoming_get_current ();/* Temporary page that is later 'placed' */ void *postcopy_host_page = mis->postcopy_tmp_page; -void *last_host =NULL ; +void *this_host =NULL ;bool all_zero = false;int target_pages =0 ;@@ -4062,24 +4062,26 @@ static int ram_load_postcopy(QEMUFile *f)* that's moved into place later. * The migration protocol uses, possibly smaller, target-pages * however the source ensures it always sends all the components -* of a host page in order. +* of a host page in one chunk. */ page_buffer = postcopy_host_page + ((uintptr_t )host & (block->page_size -1 ));/* If all TP are zero then we can optimise the place */ if (target_pages ==1 ) { all_zero = true; + this_host = (void *)QEMU_ALIGN_DOWN ((uintptr_t )host, + block->page_size); }else {/* not the 1st TP within the HP */ -if (host != (last_host +TARGET_PAGE_SIZE )) { -error_report ("Non-sequential target page %p/%p" , - host, last_host); +if (QEMU_ALIGN_DOWN ((uintptr_t )host, block->page_size) != + (uintptr_t )this_host) { +error_report ("Non-same host page %p/%p" , + host, this_host); ret = -EINVAL ;break ; } } -/* * If it's the last part of a host page then we place the host * page @@ -4090,7 +4092,6 @@ static int ram_load_postcopy(QEMUFile *f) } place_source = postcopy_host_page; } - last_host = host;switch (flags & ~RAM_SAVE_FLAG_CONTINUE ) {case RAM_SAVE_FLAG_ZERO :@@ -4143,7 +4144,8 @@ static int ram_load_postcopy(QEMUFile *f)if (!ret && place_needed) {/* This gets called at the last target page in the host page */ -void *place_dest = host +TARGET_PAGE_SIZE - block->page_size; +void *place_dest = (void *)QEMU_ALIGN_DOWN ((uintptr_t )host, + block->page_size);if (all_zero) { ret = postcopy_place_page_zero(mis, place_dest,Signature · 1 line
2.17.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [Patch v2 5/6] migration/postcopy: enable random order target page arrival
Quoted 5 lines · Dr. David Alan Gilbert
Quoted 4 lines · * Wei Yang ([email protected]) wrote:
After using number of target page received to track one host page, we could have the capability to handle random order target page arrival in one host page.
Quoted 8 lines
Quoted 3 lines
This is a preparation for enabling compress during postcopy.
Signed-off-by Wei Yang <[email protected]>Yep, that's better
Reviewed-by Dr. David Alan Gilbert <[email protected]>
Thanks for your suggestion :-)
Signature · 2 lines
Wei Yang Help you, Help me
Re: [Patch v2 5/6] migration/postcopy: enable random order target page arrival
In reply to Wei YangQuoted 4 lines · Wei Yang
After using number of target page received to track one host page, we could have the capability to handle random order target page arrival in one host page.
Quoted 8 lines
This is a preparation for enabling compress during postcopy.
Signed-off-by Wei Yang <[email protected]>---
v2:
* useuintptr_tto calculateplace_dest
* check target pages belongs to the same host page
PATCH v2 6/6 migration/postcopy: enable compress during postcopy
In reply to Wei Yangpostcopy requires to place a whole host page, while migration thread migrate memory in target page size. This makes postcopy need to collect all target pages in one host page before placing via userfaultfd.
To enable compress during postcopy, there are two problems to solve:
1. Random order for target page arrival
2. Target pages in one host page arrives without interrupt by target page from other host page
The first one is handled by previous cleanup patch.
This patch handles the second one by:
1. Flush compress thread for each host page
2. Wait for decompress thread for before placing host page
--- migration/migration.c | 11 ----------- migration/ram.c | 28 +++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 12 deletions(-)
migration/migration.c +0 -11
@@ -1005,17 +1005,6 @@ static bool migrate_caps_check(bool *cap_list,#endif if (cap_list[MIGRATION_CAPABILITY_POSTCOPY_RAM ]) { -if (cap_list[MIGRATION_CAPABILITY_COMPRESS ]) { -/* The decompression threads asynchronously write into RAM -* rather than use the atomic copies needed to avoid -* userfaulting. It should be possible to fix the decompression -* threads for compatibility in future. -*/ -error_setg (errp,"Postcopy is not currently compatible " -"with compression" ); -return false; - } -/* This check is reasonably expensive, so only when it's being * set the first time, also it's only the destination that needs * special support.
migration/ram.c +27 -1
@@ -3449,6 +3449,14 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) rs->target_page_count += pages; +/* +* During postcopy, it is necessary to make sure one whole host +* page is sent in one chunk. +*/ +if (migrate_postcopy_ram ()) { +flush_compressed_data (rs); + } +/* * we want to check in the 1st loop, just in case it was the 1st * time and we had to sync the dirty bitmap.
@@ -4026,6 +4034,7 @@ static int ram_load_postcopy(QEMUFile *f)void *place_source =NULL ;RAMBlock *block =NULL ;uint8_t ch; +int len; addr =qemu_get_be64 (f);
@@ -4043,7 +4052,8 @@ static int ram_load_postcopy(QEMUFile *f)trace_ram_load_postcopy_loop ((uint64_t )addr, flags); place_needed = false; -if (flags & (RAM_SAVE_FLAG_ZERO |RAM_SAVE_FLAG_PAGE )) { +if (flags & (RAM_SAVE_FLAG_ZERO |RAM_SAVE_FLAG_PAGE | +RAM_SAVE_FLAG_COMPRESS_PAGE )) { block =ram_block_from_stream (f, flags); host =host_from_ram_block_offset (block, addr);
@@ -4126,6 +4136,17 @@ static int ram_load_postcopy(QEMUFile *f) TARGET_PAGE_SIZE); }break ; +case RAM_SAVE_FLAG_COMPRESS_PAGE : + all_zero = false; + len =qemu_get_be32 (f); +if (len <0 || len >compressBound (TARGET_PAGE_SIZE )) { +error_report ("Invalid compressed data length: %d" , len); + ret = -EINVAL ; +break ; + } +decompress_data_with_multi_threads (f, page_buffer, len); +break ; +case RAM_SAVE_FLAG_EOS :/* normal exit */ multifd_recv_sync_main ();
@@ -4137,6 +4158,11 @@ static int ram_load_postcopy(QEMUFile *f)break ; } +/* Got the whole host page, wait for decompress before placing. */ +if (place_needed) { + ret |=wait_for_decompress_done (); + } +/* Detect for any possible file errors */ if (!ret &&qemu_file_get_error (f)) { ret =qemu_file_get_error (f);
Signature · 1 line
2.17.1
Quoted 12 lines · Wei Yang
postcopy requires to place a whole host page, while migration thread migrate memory in target page size. This makes postcopy need to collect all target pages in one host page before placing via userfaultfd.
To enable compress during postcopy, there are two problems to solve:
1. Random order for target page arrival
2. Target pages in one host page arrives without interrupt by target page from other host pageThe first one is handled by previous cleanup patch.
Quoted 7 lines
This patch handles the second one by:
1. Flush compress thread for each host page
2. Wait for decompress thread for before placing host pageSigned-off-by Wei Yang <[email protected]>Reviewed-by Dr. David Alan Gilbert <[email protected]>
Would this one be picked up in this version?
Quoted 44 lines · Wei Yang
This patch set tries enable compress during postcopy.
postcopy requires to place a whole host page, while migration thread migrate memory in target page size. This makes postcopy need to collect all target pages in one host page before placing via userfaultfd.
To enable compress during postcopy, there are two problems to solve:
1. Random order for target page arrival
2. Target pages in one host page arrives without interrupt by target page from other host pageThe first one is handled by counting the number of target pages arrived instead of the last target page arrived.
The second one is handled by:
1. Flush compress thread for each host page
2. Wait for decompress thread for before placing host pageWith the combination of these two changes, compress is enabled during postcopy.
---
v2:
* useuintptr_tto calculateplace_dest
* check target pages belongs to the same host pageWei Yang (6):
migration/postcopy: reduce memset when it is zero page and
matches_target_page_size
migration/postcopy: wait for decompress thread in precopy migration/postcopy: count target page number to decide the
place_needed
migration/postcopy: setall_zeroto true on the first target page migration/postcopy: enable random order target page arrival migration/postcopy: enable compress during postcopy
migration/migration.c| 11 -------migration/ram.c| 67 +++++++++++++++++++++++++++++++++----------2 files changed, 52 insertions(+), 26 deletions(-)Signature · 1 line
2.17.1
Signature · 2 lines
Wei Yang Help you, Help me
Quoted 1 line · * Wei Yang ([email protected]) wrote:
Would this one be picked up in this version?
I think that one is on Juan's list for the pull he's going to do soon.
Dave
Quoted 39 lines · Wei Yang
Quoted 38 lines
This patch set tries enable compress during postcopy.
postcopy requires to place a whole host page, while migration thread migrate memory in target page size. This makes postcopy need to collect all target pages in one host page before placing via userfaultfd.
To enable compress during postcopy, there are two problems to solve:
1. Random order for target page arrival
2. Target pages in one host page arrives without interrupt by target page from other host pageThe first one is handled by counting the number of target pages arrived instead of the last target page arrived.
The second one is handled by:
1. Flush compress thread for each host page
2. Wait for decompress thread for before placing host pageWith the combination of these two changes, compress is enabled during postcopy.
---
v2:
* useuintptr_tto calculateplace_dest
* check target pages belongs to the same host pageWei Yang (6):
migration/postcopy: reduce memset when it is zero page and
matches_target_page_size
migration/postcopy: wait for decompress thread in precopy migration/postcopy: count target page number to decide the
place_needed
migration/postcopy: setall_zeroto true on the first target page migration/postcopy: enable random order target page arrival migration/postcopy: enable compress during postcopy
Quoted 11 lines
Quoted 6 lines
migration/migration.c| 11 -------migration/ram.c| 67 +++++++++++++++++++++++++++++++++----------2 files changed, 52 insertions(+), 26 deletions(-)Signature · 1 line
2.17.1Signature · 2 lines
Wei Yang Help you, Help me
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 7 lines · Dr. David Alan Gilbert
Quoted 1 line · * Wei Yang ([email protected]) wrote:
Would this one be picked up in this version?
I think that one is on Juan's list for the pull he's going to do soon.
Dave
Happy New Year to all~
May I ask the plan for this patch set?
Signature · 2 lines
Wei Yang Help you, Help me