From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNxeV-0000aL-GK for qemu-devel@nongnu.org; Wed, 30 May 2018 05:44:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNxeU-0006v7-M4 for qemu-devel@nongnu.org; Wed, 30 May 2018 05:44:19 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:36565) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fNxeU-0006ux-Dm for qemu-devel@nongnu.org; Wed, 30 May 2018 05:44:18 -0400 Received: by mail-pf0-x244.google.com with SMTP id w129-v6so8757264pfd.3 for ; Wed, 30 May 2018 02:44:18 -0700 (PDT) From: Lidong Chen Date: Wed, 30 May 2018 17:43:35 +0800 Message-Id: <1527673416-31268-12-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 11/12] migration: poll the cm event while wait RDMA work request completion 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 If the peer qemu is crashed, the qemu_rdma_wait_comp_channel function maybe loop forever. so we should also poll the cm event fd, and when receive any cm event, we consider some error happened. Signed-off-by: Lidong Chen --- migration/rdma.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index 1b9e261..d611a06 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -1489,6 +1489,9 @@ static uint64_t qemu_rdma_poll(RDMAContext *rdma, uint64_t *wr_id_out, */ static int qemu_rdma_wait_comp_channel(RDMAContext *rdma) { + struct rdma_cm_event *cm_event; + int ret = -1; + /* * Coroutine doesn't start until migration_fd_process_incoming() * so don't yield unless we know we're running inside of a coroutine. @@ -1504,25 +1507,35 @@ static int qemu_rdma_wait_comp_channel(RDMAContext *rdma) * But we need to be able to handle 'cancel' or an error * without hanging forever. */ - while (!rdma->error_state && !rdma->received_error) { - GPollFD pfds[1]; + while (!rdma->error_state && !rdma->received_error) { + GPollFD pfds[2]; pfds[0].fd = rdma->comp_channel->fd; pfds[0].events = G_IO_IN | G_IO_HUP | G_IO_ERR; + pfds[0].revents = 0; + + pfds[1].fd = rdma->channel->fd; + pfds[1].events = G_IO_IN | G_IO_HUP | G_IO_ERR; + pfds[1].revents = 0; + /* 0.1s timeout, should be fine for a 'cancel' */ - switch (qemu_poll_ns(pfds, 1, 100 * 1000 * 1000)) { - case 1: /* fd active */ - return 0; + qemu_poll_ns(pfds, 2, 100 * 1000 * 1000); - case 0: /* Timeout, go around again */ - break; + if (pfds[1].revents) { + ret = rdma_get_cm_event(rdma->channel, &cm_event); + if (!ret) { + rdma_ack_cm_event(cm_event); + } + error_report("receive cm event while wait comp channel," + "cm event is %d", cm_event->event); - default: /* Error of some type - - * I don't trust errno from qemu_poll_ns - */ - error_report("%s: poll failed", __func__); + /* consider any rdma communication event as an error */ return -EPIPE; } + if (pfds[0].revents) { + return 0; + } + if (migrate_get_current()->state == MIGRATION_STATUS_CANCELLING) { /* Bail out and let the cancellation happen */ return -EPIPE; -- 1.8.3.1