Commit f5627c2a authored by Lidong Chen's avatar Lidong Chen Committed by Juan Quintela
Browse files

migration: Stop rdma yielding during incoming postcopy 



During incoming postcopy, the destination qemu will invoke
qemu_rdma_wait_comp_channel in a seprate thread. So does not use rdma
yield, and poll the completion channel fd instead.

Signed-off-by: default avatarLidong Chen <lidongchen@tencent.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 74637e6f

migration/rdma.c

+3 −1
Original line number Diff line number Diff line
@@ -1493,11 +1493,13 @@ static int qemu_rdma_wait_comp_channel(RDMAContext *rdma) 
     * Coroutine doesn't start until migration_fd_process_incoming()

     * so don't yield unless we know we're running inside of a coroutine.

     */

    if (rdma->migration_started_on_destination) {

    if (rdma->migration_started_on_destination &&

        migration_incoming_get_current()->state == MIGRATION_STATUS_ACTIVE) {

        yield_until_fd_readable(rdma->comp_channel->fd);

    } else {

        /* This is the source side, we're in a separate thread

         * or destination prior to migration_fd_process_incoming()

         * after postcopy, the destination also in a seprate thread.

         * we can't yield; so we have to poll the fd.

         * But we need to be able to handle 'cancel' or an error

         * without hanging forever.