qtest/migration-test.c: Add tests with compress enabled
PATCH v2 1/2 qtest/migration-test.c: Add tests with compress enabled
There has never been tests for migration with compress enabled.
Add suitable tests, testing with compress-wait-thread = false too.
---
v2:
- Split into 2 tests, one with compress-wait-thread = true and faster compress options. And one with compress-wait-thread = false and slower compress options, so it definitely sends some pages uncompressed.
- Add comment for iterations = 2.
tests/qtest/migration-test.c | 103 +++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+)
tests/qtest/migration-test.c +103 -0
@@ -406,6 +406,41 @@ static void migrate_set_parameter_str(QTestState *who, const char *parameter,migrate_check_parameter_str (who, parameter, value); } +static long long migrate_get_parameter_bool (QTestState *who, +const char *parameter) +{ +QDict *rsp; +int result; + + rsp =wait_command (who,"{ 'execute': 'query-migrate-parameters' }" ); + result =qdict_get_bool (rsp, parameter); +qobject_unref (rsp); +return !!result; +} + +static void migrate_check_parameter_bool (QTestState *who,const char *parameter, +int value) +{ +int result; + + result =migrate_get_parameter_bool (who, parameter); + g_assert_cmpint(result, ==, value); +} + +static void migrate_set_parameter_bool (QTestState *who,const char *parameter, +int value) +{ +QDict *rsp; + + rsp =qtest_qmp (who, +"{ 'execute': 'migrate-set-parameters'," +"'arguments': { %s: %i } }" , + parameter, value); +g_assert (qdict_haskey (rsp,"return" )); +qobject_unref (rsp); +migrate_check_parameter_bool (who, parameter, value); +} +static void migrate_ensure_non_converge (QTestState *who) {/* Can't converge with 1ms downtime + 3 mbs bandwidth limit */
@@ -1524,6 +1559,70 @@ static void test_precopy_unix_xbzrle(void)test_precopy_common (&args); } +static void * +test_migrate_compress_start (QTestState *from, +QTestState *to) +{ +migrate_set_parameter_int (from,"compress-level" ,1 ); +migrate_set_parameter_int (from,"compress-threads" ,4 ); +migrate_set_parameter_bool (from,"compress-wait-thread" , true); +migrate_set_parameter_int (to,"decompress-threads" ,4 ); + +migrate_set_capability (from,"compress" , true); +migrate_set_capability (to,"compress" , true); + +return NULL ; +} + +static void test_precopy_unix_compress (void ) +{ + g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs); +MigrateCommon args = { + .connect_uri = uri, + .listen_uri = uri, + .start_hook = test_migrate_compress_start, +/* +* Test that no invalid thread state is left over from +* the previous iteration. +*/ + .iterations =2 , + }; + +test_precopy_common (&args); +} + +static void * +test_migrate_compress_nowait_start (QTestState *from, +QTestState *to) +{ +migrate_set_parameter_int (from,"compress-level" ,9 ); +migrate_set_parameter_int (from,"compress-threads" ,1 ); +migrate_set_parameter_bool (from,"compress-wait-thread" , false); +migrate_set_parameter_int (to,"decompress-threads" ,1 ); + +migrate_set_capability (from,"compress" , true); +migrate_set_capability (to,"compress" , true); + +return NULL ; +} + +static void test_precopy_unix_compress_nowait (void ) +{ + g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs); +MigrateCommon args = { + .connect_uri = uri, + .listen_uri = uri, + .start_hook = test_migrate_compress_nowait_start, +/* +* Test that no invalid thread state is left over from +* the previous iteration. +*/ + .iterations =2 , + }; + +test_precopy_common (&args); +} +static void test_precopy_tcp_plain (void ) {MigrateCommon args = {
@@ -2515,6 +2614,10 @@ int main(int argc, char **argv)qtest_add_func ("/migration/bad_dest" , test_baddest);qtest_add_func ("/migration/precopy/unix/plain" , test_precopy_unix_plain);qtest_add_func ("/migration/precopy/unix/xbzrle" , test_precopy_unix_xbzrle); +qtest_add_func ("/migration/precopy/unix/compress/wait" , + test_precopy_unix_compress); +qtest_add_func ("/migration/precopy/unix/compress/nowait" , + test_precopy_unix_compress_nowait);#ifdef CONFIG_GNUTLS qtest_add_func ("/migration/precopy/unix/tls/psk" , test_precopy_unix_tls_psk);
Signature · 1 line
2.40.0
PATCH v2 2/2 migration/ram.c: Fix migration with compress enabled
Since ec6f3ab9, migration with compress enabled was broken, because the compress threads use a dummy QEMUFile which just acts as a buffer and that commit accidentally changed it to use the outgoing migration channel instead.
Fix this by using the dummy file again in the compress threads.
---
v2:
- Add Fixed: and Reviewed-by: tags
migration/ram.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
migration/ram.c +11 -13
@@ -688,12 +688,11 @@ exit:* @offset: offset inside the block for the page * in the lower bits, it contains flags */ -static size_t save_page_header (PageSearchStatus *pss,RAMBlock *block, -ram_addr_t offset) +static size_t save_page_header (PageSearchStatus *pss,QEMUFile *f, +RAMBlock *block,ram_addr_t offset) {size_t size, len;bool same_block = (block == pss->last_sent_block); -QEMUFile *f = pss->pss_channel;if (same_block) { offset |=RAM_SAVE_FLAG_CONTINUE ;
@@ -867,7 +866,7 @@ static int save_xbzrle_page(RAMState *rs, PageSearchStatus *pss, }/* Send XBZRLE based compressed page */ - bytes_xbzrle =save_page_header (pss, block, + bytes_xbzrle =save_page_header (pss, pss->pss_channel, block, offset |RAM_SAVE_FLAG_XBZRLE );qemu_put_byte (file,ENCODING_FLAG_XBZRLE );qemu_put_be16 (file, encoded_len);
@@ -1302,15 +1301,14 @@ void ram_release_page(const char *rbname, uint64_t offset)* @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page_to_file (PageSearchStatus *pss, +static int save_zero_page_to_file (PageSearchStatus *pss,QEMUFile *file,RAMBlock *block,ram_addr_t offset) {uint8_t *p = block->host + offset; -QEMUFile *file = pss->pss_channel;int len =0 ;if (buffer_is_zero (p,TARGET_PAGE_SIZE )) { - len +=save_page_header (pss, block, offset |RAM_SAVE_FLAG_ZERO ); + len +=save_page_header (pss, file, block, offset |RAM_SAVE_FLAG_ZERO );qemu_put_byte (file,0 ); len +=1 ;ram_release_page (block->idstr, offset);
@@ -1327,10 +1325,10 @@ static int save_zero_page_to_file(PageSearchStatus *pss,* @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page (PageSearchStatus *pss,RAMBlock *block, +static int save_zero_page (PageSearchStatus *pss,QEMUFile *f,RAMBlock *block,ram_addr_t offset) { -int len =save_zero_page_to_file (pss, block, offset); +int len =save_zero_page_to_file (pss, f, block, offset);if (len) {stat64_add (&ram_atomic_counters.duplicate,1 );
@@ -1394,7 +1392,7 @@ static int save_normal_page(PageSearchStatus *pss, RAMBlock *block, {QEMUFile *file = pss->pss_channel; -ram_transferred_add (save_page_header (pss, block, +ram_transferred_add (save_page_header (pss, pss->pss_channel, block, offset |RAM_SAVE_FLAG_PAGE ));if (async) { qemu_put_buffer_async(file, buf, TARGET_PAGE_SIZE,
@@ -1473,11 +1471,11 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock *block,uint8_t *p = block->host + offset;int ret; -if (save_zero_page_to_file (pss, block, offset)) { +if (save_zero_page_to_file (pss, f, block, offset)) {return true; } -save_page_header (pss, block, offset |RAM_SAVE_FLAG_COMPRESS_PAGE ); +save_page_header (pss, f, block, offset |RAM_SAVE_FLAG_COMPRESS_PAGE );/* * copy it to a internal buffer to avoid it being modified by VM
@@ -2355,7 +2353,7 @@ static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss)return 1 ; } - res =save_zero_page (pss, block, offset); + res =save_zero_page (pss, pss->pss_channel, block, offset);if (res >0 ) {/* Must let xbzrle know, otherwise a previous (now 0'd) cached * page would be stale
Signature · 1 line
2.40.0
Re: [PATCH for-8.0 v2 2/2] migration/ram.c: Fix migration with compress enabled
Ping? This should go in rc4, there is not much time left to prepare a PULL...
Best Regards,
Lukas Straub
Quoted 108 lines · On Tue, 4 Apr 2023 14:36:03 +0000 Lukas Straub <[email protected]> wrote:
Since
ec6f3ab9, migration with compress enabled was broken, because the compress threads use a dummy QEMUFile which just acts as a buffer and that commit accidentally changed it to use the outgoing migration channel instead.Fix this by using the dummy file again in the compress threads.
Fixes ec6f3ab9f4 ("migration: Move last_sent_block into PageSearchStatus")Signed-off-by Lukas Straub <[email protected]>Reviewed-by Peter Xu <[email protected]>---
v2:
- Add Fixed: and Reviewed-by: tagsmigration/ram.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)migration/ram.c +11
-13@@ -688,12 +688,11 @@ exit:* @offset: offset inside the block for the page * in the lower bits, it contains flags */ -static size_t save_page_header (PageSearchStatus *pss,RAMBlock *block, -ram_addr_t offset) +static size_t save_page_header (PageSearchStatus *pss,QEMUFile *f, +RAMBlock *block,ram_addr_t offset) {size_t size, len;bool same_block = (block == pss->last_sent_block); -QEMUFile *f = pss->pss_channel;if (same_block) { offset |=RAM_SAVE_FLAG_CONTINUE ;@@ -867,7 +866,7 @@ static int save_xbzrle_page(RAMState *rs, PageSearchStatus *pss, }/* Send XBZRLE based compressed page */ - bytes_xbzrle =save_page_header (pss, block, + bytes_xbzrle =save_page_header (pss, pss->pss_channel, block, offset |RAM_SAVE_FLAG_XBZRLE );qemu_put_byte (file,ENCODING_FLAG_XBZRLE );qemu_put_be16 (file, encoded_len);@@ -1302,15 +1301,14 @@ void ram_release_page(const char *rbname, uint64_t offset)* @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page_to_file (PageSearchStatus *pss, +static int save_zero_page_to_file (PageSearchStatus *pss,QEMUFile *file,RAMBlock *block,ram_addr_t offset) {uint8_t *p = block->host + offset; -QEMUFile *file = pss->pss_channel;int len =0 ;if (buffer_is_zero (p,TARGET_PAGE_SIZE )) { - len +=save_page_header (pss, block, offset |RAM_SAVE_FLAG_ZERO ); + len +=save_page_header (pss, file, block, offset |RAM_SAVE_FLAG_ZERO );qemu_put_byte (file,0 ); len +=1 ;ram_release_page (block->idstr, offset);@@ -1327,10 +1325,10 @@ static int save_zero_page_to_file(PageSearchStatus *pss,* @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page (PageSearchStatus *pss,RAMBlock *block, +static int save_zero_page (PageSearchStatus *pss,QEMUFile *f,RAMBlock *block,ram_addr_t offset) { -int len =save_zero_page_to_file (pss, block, offset); +int len =save_zero_page_to_file (pss, f, block, offset);if (len) {stat64_add (&ram_atomic_counters.duplicate,1 );@@ -1394,7 +1392,7 @@ static int save_normal_page(PageSearchStatus *pss, RAMBlock *block, {QEMUFile *file = pss->pss_channel; -ram_transferred_add (save_page_header (pss, block, +ram_transferred_add (save_page_header (pss, pss->pss_channel, block, offset |RAM_SAVE_FLAG_PAGE ));if (async) { qemu_put_buffer_async(file, buf, TARGET_PAGE_SIZE,@@ -1473,11 +1471,11 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock *block,uint8_t *p = block->host + offset;int ret; -if (save_zero_page_to_file (pss, block, offset)) { +if (save_zero_page_to_file (pss, f, block, offset)) {return true; } -save_page_header (pss, block, offset |RAM_SAVE_FLAG_COMPRESS_PAGE ); +save_page_header (pss, f, block, offset |RAM_SAVE_FLAG_COMPRESS_PAGE );/* * copy it to a internal buffer to avoid it being modified by VM @@ -2355,7 +2353,7 @@ static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss)return 1 ; } - res =save_zero_page (pss, block, offset); + res =save_zero_page (pss, pss->pss_channel, block, offset);if (res >0 ) {/* Must let xbzrle know, otherwise a previous (now 0'd) cached * page would be stale
Re: [PATCH for-8.0 v2 2/2] migration/ram.c: Fix migration with compress enabled
Ping...
Quoted 120 lines · On Thu, 6 Apr 2023 15:21:55 +0000 Lukas Straub <[email protected]> wrote:
Ping? This should go in rc4, there is not much time left to prepare a PULL...
Best Regards,
Lukas StraubQuoted 108 lines · On Tue, 4 Apr 2023 14:36:03 +0000 Lukas Straub <[email protected]> wrote:
Since
ec6f3ab9, migration with compress enabled was broken, because the compress threads use a dummy QEMUFile which just acts as a buffer and that commit accidentally changed it to use the outgoing migration channel instead.Fix this by using the dummy file again in the compress threads.
Fixes ec6f3ab9f4 ("migration: Move last_sent_block into PageSearchStatus")Signed-off-by Lukas Straub <[email protected]>Reviewed-by Peter Xu <[email protected]>---
v2:
- Add Fixed: and Reviewed-by: tagsmigration/ram.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)migration/ram.c +11
-13@@ -688,12 +688,11 @@ exit:* @offset: offset inside the block for the page * in the lower bits, it contains flags */ -static size_t save_page_header (PageSearchStatus *pss,RAMBlock *block, -ram_addr_t offset) +static size_t save_page_header (PageSearchStatus *pss,QEMUFile *f, +RAMBlock *block,ram_addr_t offset) {size_t size, len;bool same_block = (block == pss->last_sent_block); -QEMUFile *f = pss->pss_channel;if (same_block) { offset |=RAM_SAVE_FLAG_CONTINUE ;@@ -867,7 +866,7 @@ static int save_xbzrle_page(RAMState *rs, PageSearchStatus *pss, }/* Send XBZRLE based compressed page */ - bytes_xbzrle =save_page_header (pss, block, + bytes_xbzrle =save_page_header (pss, pss->pss_channel, block, offset |RAM_SAVE_FLAG_XBZRLE );qemu_put_byte (file,ENCODING_FLAG_XBZRLE );qemu_put_be16 (file, encoded_len);@@ -1302,15 +1301,14 @@ void ram_release_page(const char *rbname, uint64_t offset)* @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page_to_file (PageSearchStatus *pss, +static int save_zero_page_to_file (PageSearchStatus *pss,QEMUFile *file,RAMBlock *block,ram_addr_t offset) {uint8_t *p = block->host + offset; -QEMUFile *file = pss->pss_channel;int len =0 ;if (buffer_is_zero (p,TARGET_PAGE_SIZE )) { - len +=save_page_header (pss, block, offset |RAM_SAVE_FLAG_ZERO ); + len +=save_page_header (pss, file, block, offset |RAM_SAVE_FLAG_ZERO );qemu_put_byte (file,0 ); len +=1 ;ram_release_page (block->idstr, offset);@@ -1327,10 +1325,10 @@ static int save_zero_page_to_file(PageSearchStatus *pss,* @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page (PageSearchStatus *pss,RAMBlock *block, +static int save_zero_page (PageSearchStatus *pss,QEMUFile *f,RAMBlock *block,ram_addr_t offset) { -int len =save_zero_page_to_file (pss, block, offset); +int len =save_zero_page_to_file (pss, f, block, offset);if (len) {stat64_add (&ram_atomic_counters.duplicate,1 );@@ -1394,7 +1392,7 @@ static int save_normal_page(PageSearchStatus *pss, RAMBlock *block, {QEMUFile *file = pss->pss_channel; -ram_transferred_add (save_page_header (pss, block, +ram_transferred_add (save_page_header (pss, pss->pss_channel, block, offset |RAM_SAVE_FLAG_PAGE ));if (async) { qemu_put_buffer_async(file, buf, TARGET_PAGE_SIZE,@@ -1473,11 +1471,11 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock *block,uint8_t *p = block->host + offset;int ret; -if (save_zero_page_to_file (pss, block, offset)) { +if (save_zero_page_to_file (pss, f, block, offset)) {return true; } -save_page_header (pss, block, offset |RAM_SAVE_FLAG_COMPRESS_PAGE ); +save_page_header (pss, f, block, offset |RAM_SAVE_FLAG_COMPRESS_PAGE );/* * copy it to a internal buffer to avoid it being modified by VM @@ -2355,7 +2353,7 @@ static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss)return 1 ; } - res =save_zero_page (pss, block, offset); + res =save_zero_page (pss, pss->pss_channel, block, offset);if (res >0 ) {/* Must let xbzrle know, otherwise a previous (now 0'd) cached * page would be stale
Quoted 6 lines · Lukas Straub
There has never been tests for migration with compress enabled.
Add suitable tests, testing with compress-wait-thread = false too.
Signed-off-by Lukas Straub <[email protected]>
Signature · 1 line
Peter Xu
Quoted 6 lines · Lukas Straub
There has never been tests for migration with compress enabled.
Add suitable tests, testing with compress-wait-thread = false too.
Signed-off-by Lukas Straub <[email protected]>
queued.