Skip to contentSkip to conversation

migration/multifd: sync packet_num after all thread are done

PATCH In review Wei Yang 3 participants 3 messages Jun 4, 2019 – Jun 5, 2019

lore
Share & tools
lore

Wei Yang

author
#0 lore raw

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
index ac75e3e30e..a4e7587648 100644
@@ -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
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Wei Yang

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.

It shouldn't matter a lot in real life, but I agree that it is better.

#2 lore raw
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_num for another.

Quoted 8 lines
Quoted 3 lines

Move the adjustment after we are sure each recv thread are sync-ed.

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