Skip to content

Commit 7fb9ce4

Browse files
yliu80Michael Tokarev
authored and
Michael Tokarev
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]> (cherry picked from commit cdc3970) Signed-off-by: Michael Tokarev <[email protected]>
1 parent 82565fb commit 7fb9ce4

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
@@ -362,15 +362,14 @@ int multifd_ram_flush_and_sync(void)
362362
bool multifd_send_prepare_common(MultiFDSendParams *p)
363363
{
364364
MultiFDPages_t *pages = &p->data->u.ram;
365+
multifd_send_prepare_header(p);
365366
multifd_send_zero_page_detect(p);
366367

367368
if (!pages->normal_num) {
368369
p->next_packet_size = 0;
369370
return false;
370371
}
371372

372-
multifd_send_prepare_header(p);
373-
374373
return true;
375374
}
376375

0 commit comments

Comments
 (0)