From patchwork Wed May 30 09:43:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 858585 jemmy X-Patchwork-Id: 10438107 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5F443603D7 for ; Wed, 30 May 2018 09:56:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4DFA02888C for ; Wed, 30 May 2018 09:56:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40CAC288ED; Wed, 30 May 2018 09:56:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A27642888C for ; Wed, 30 May 2018 09:56:01 +0000 (UTC) Received: from localhost ([::1]:37297 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNxpo-0000M0-Uj for patchwork-qemu-devel@patchwork.kernel.org; Wed, 30 May 2018 05:56:00 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PLY3XFHAd8mJL9+yVghHeSjCauckPGLwpP9im9j+9Es=; b=Q9xkr6aY803vmWI+19TLcavYr3MazWT7zDPLX3KXYYYF98omRnyPgIVRLMTNQZjsJe waKLc+HtV8Z4tkfrNPqfGqVJuwFSQtEuYG8X5X3jA5T9tsSTabUuT6GmVg+Mm3YdZ2Cb ZFCtUfotcbdNgcWNxhl20gq8KUIxxuH0KreHV/QO4zelW5lpK2vQIm65BCmAAR4gJoY7 x/HUgcZH7t+biJdol2uqJq7qiwEtAR6v2oxYhZaW8G0MGzdoEjzKcWn9kYbda8fEQFID onGwwKqGCCVCO0zXpD/KDYXw45EE1LI1kFncSNuY6vaKSGhi0owFNTVSNUbaqYbXhf9J evzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PLY3XFHAd8mJL9+yVghHeSjCauckPGLwpP9im9j+9Es=; b=PcpQJLsft0o2d992TeXs+G8BTFMPojksvchSdJ4p3rn1xysuuwhZ3MuemVDg76WAOb jiO5uveC5h9MNWn3ZFtmh6JhfJ5dndbJIdSWtWM7LdINTXTXDN/hKWNFPzB3heRrTJIL 5LxgObxp7aoANNrhNUS3k7OO/PU7gTQu+DhLjUSCZZB+PnqzJR6MP1FRuIVu0GnULTxz Orpvj1jDS6wy5gGzMwY9Yqury9gLCV5ME0bn2HFLwrgBimgWPbf6JmcFJhpW1x6Hujqu wmlrarw5HFZ1zkB/JZx69VS4XoiHa2/NdG594QHlWcdiF4BZ58gKgwS9loP/Q55MM/VM chng== X-Gm-Message-State: ALKqPweJpMO/kjScfs4Y7wlap7j/I15WNExwAhxtxEEQM/0qwGMJ3KnV Jj4kQ2LbcE57IJV0X4RJ6Tw= X-Google-Smtp-Source: ADUXVKKG4G+rMStNon1aeUlA10hN0CnJSrK8YpXmEUO7b0XNOj1T/GXYmAYrgMzSVMP3k4WYW1EfIw== X-Received: by 2002:a62:d11d:: with SMTP id z29-v6mr2072475pfg.246.1527673457575; Wed, 30 May 2018 02:44:17 -0700 (PDT) Received: from VM_93_245_centos.localdomain ([150.109.57.149]) by smtp.gmail.com with ESMTPSA id 29-v6sm60565257pfj.14.2018.05.30.02.44.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 May 2018 02:44:17 -0700 (PDT) From: Lidong Chen X-Google-Original-From: Lidong Chen To: zhang.zhanghailiang@huawei.com, quintela@redhat.com, dgilbert@redhat.com, berrange@redhat.com, aviadye@mellanox.com, pbonzini@redhat.com Date: Wed, 30 May 2018 17:43:35 +0800 Message-Id: <1527673416-31268-12-git-send-email-lidongchen@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1527673416-31268-1-git-send-email-lidongchen@tencent.com> References: <1527673416-31268-1-git-send-email-lidongchen@tencent.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::244 Subject: [Qemu-devel] [PATCH v4 11/12] migration: poll the cm event while wait RDMA work request completion X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: adido@mellanox.com, qemu-devel@nongnu.org, Lidong Chen Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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;