From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNxeK-0000SW-Ae for qemu-devel@nongnu.org; Wed, 30 May 2018 05:44:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNxeJ-0006rI-F7 for qemu-devel@nongnu.org; Wed, 30 May 2018 05:44:08 -0400 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:33344) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fNxeJ-0006rA-9j for qemu-devel@nongnu.org; Wed, 30 May 2018 05:44:07 -0400 Received: by mail-pg0-x244.google.com with SMTP id e21-v6so7906761pgv.0 for ; Wed, 30 May 2018 02:44:07 -0700 (PDT) From: Lidong Chen Date: Wed, 30 May 2018 17:43:30 +0800 Message-Id: <1527673416-31268-7-git-send-email-lidongchen@tencent.com> In-Reply-To: <1527673416-31268-1-git-send-email-lidongchen@tencent.com> References: <1527673416-31268-1-git-send-email-lidongchen@tencent.com> Subject: [Qemu-devel] [PATCH v4 06/12] migration: Stop rdma yielding during incoming postcopy List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: zhang.zhanghailiang@huawei.com, quintela@redhat.com, dgilbert@redhat.com, berrange@redhat.com, aviadye@mellanox.com, pbonzini@redhat.com Cc: qemu-devel@nongnu.org, adido@mellanox.com, Lidong Chen , Lidong Chen From: Lidong Chen 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 Reviewed-by: Dr. David Alan Gilbert --- migration/rdma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/migration/rdma.c b/migration/rdma.c index 45f01e6..0dd4033 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -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. -- 1.8.3.1