migration/multifd: sync packet_num after all thread are done
PATCH 1/1 migration/multifd: sync packet_num after all thread are done
Notification from recv thread is not ordered, which means we may be notified by one MultiFDRecvParams but adjust packet_num for another.
Move the adjustment after we are sure each recv thread are sync-ed.
--- migration/ram.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
migration/ram.c +4 -4
@@ -1292,15 +1292,15 @@ static void multifd_recv_sync_main(void)trace_multifd_recv_sync_main_wait (p->id);qemu_sem_wait (&multifd_recv_state->sem_sync); + } +for (i =0 ; i <migrate_multifd_channels (); i++) { +MultiFDRecvParams *p = &multifd_recv_state->params[i]; +qemu_mutex_lock (&p->mutex);if (multifd_recv_state->packet_num < p->packet_num) { multifd_recv_state->packet_num = p->packet_num; }qemu_mutex_unlock (&p->mutex); - } -for (i =0 ; i <migrate_multifd_channels (); i++) { -MultiFDRecvParams *p = &multifd_recv_state->params[i]; -trace_multifd_recv_sync_main_signal (p->id);qemu_sem_post (&p->sem_sync); }
Signature · 1 line
2.19.1
Quoted 6 lines · Wei Yang
Notification from recv thread is not ordered, which means we may be notified by one MultiFDRecvParams but adjust
packet_numfor another.Move the adjustment after we are sure each recv thread are sync-ed.
Signed-off-by Wei Yang <[email protected]>
It shouldn't matter a lot in real life, but I agree that it is better.
Quoted 4 lines · Juan Quintela
Quoted 3 lines · Wei Yang
Notification from recv thread is not ordered, which means we may be notified by one MultiFDRecvParams but adjust
packet_numfor another.
Quoted 8 lines
Quoted 3 lines
Move the adjustment after we are sure each recv thread are sync-ed.
Signed-off-by Wei Yang <[email protected]>Reviewed-by Juan Quintela <[email protected]>It shouldn't matter a lot in real life, but I agree that it is better.
Yep, thanks.
Signature · 2 lines
Wei Yang Help you, Help me