| Message ID | 20190604023540.26532-1-richardw.yang@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | migration/multifd: sync packet_num after all thread are done | expand |
Wei Yang <richardw.yang@linux.intel.com> wrote: > 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. > > Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> Reviewed-by: Juan Quintela <quintela@redhat.com> It shouldn't matter a lot in real life, but I agree that it is better.
On Wed, Jun 05, 2019 at 12:39:06PM +0200, Juan Quintela wrote: >Wei Yang <richardw.yang@linux.intel.com> wrote: >> 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. >> >> Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> > > >Reviewed-by: Juan Quintela <quintela@redhat.com> > >It shouldn't matter a lot in real life, but I agree that it is better. Yep, thanks.
diff --git a/migration/ram.c b/migration/ram.c index ac75e3e30e..a4e7587648 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -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); }
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. Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> --- migration/ram.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)