Skip to content

Commit cdc3970

Browse files
yliu80Fabiano Rosas
authored and
Fabiano Rosas
committed
multifd: bugfix for migration using compression methods
When compression is enabled on the migration channel and the pages processed are all zero pages, these pages will not be sent and updated on the target side, resulting in incorrect memory data on the source and target sides. The root cause is that all compression methods call multifd_send_prepare_common to determine whether to compress dirty pages, but multifd_send_prepare_common does not update the IOV of MultiFDPacket_t when all dirty pages are zero pages. The solution is to always update the IOV of MultiFDPacket_t regardless of whether the dirty pages are all zero pages. Fixes: 303e6f5 ("migration/multifd: Implement zero page transmission on the multifd thread.") Cc: [email protected] #9.0+ Signed-off-by: Yuan Liu <[email protected]> Reviewed-by: Jason Zeng <[email protected]> Reviewed-by: Peter Xu <[email protected]> Message-Id: <[email protected]> Signed-off-by: Fabiano Rosas <[email protected]>
1 parent c76ee1f commit cdc3970

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

migration/multifd-nocomp.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,15 +432,14 @@ int multifd_ram_flush_and_sync(QEMUFile *f)
432432
bool multifd_send_prepare_common(MultiFDSendParams *p)
433433
{
434434
MultiFDPages_t *pages = &p->data->u.ram;
435+
multifd_send_prepare_header(p);
435436
multifd_send_zero_page_detect(p);
436437

437438
if (!pages->normal_num) {
438439
p->next_packet_size = 0;
439440
return false;
440441
}
441442

442-
multifd_send_prepare_header(p);
443-
444443
return true;
445444
}
446445

0 commit comments

Comments
 (0)