ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Lidong Chen <lidongchen@tencent.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Lidong Chen 2018-08-06 21:29:30 +08:00 committed by Juan Quintela
parent 74637e6f08
commit f5627c2af9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
migration/rdma.c
View File

@ -1493,11 +1493,13 @@ static int qemu_rdma_wait_comp_channel(RDMAContext *rdma)
* Coroutine doesn't start until migration_fd_process_incoming() * Coroutine doesn't start until migration_fd_process_incoming()
* so don't yield unless we know we're running inside of a coroutine. * 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); yield_until_fd_readable(rdma->comp_channel->fd);
} else { } else {
/* This is the source side, we're in a separate thread /* This is the source side, we're in a separate thread
* or destination prior to migration_fd_process_incoming() * 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. * we can't yield; so we have to poll the fd.
* But we need to be able to handle 'cancel' or an error * But we need to be able to handle 'cancel' or an error
* without hanging forever. * without hanging forever.