From patchwork Fri Aug 3 09:13:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 858585 jemmy X-Patchwork-Id: 953137 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FiXgbURY"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41hhKM0q1mz9s0R for ; Fri, 3 Aug 2018 19:17:59 +1000 (AEST) Received: from localhost ([::1]:49755 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1flWDc-0004My-Mf for incoming@patchwork.ozlabs.org; Fri, 03 Aug 2018 05:17:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1flWA3-0001Vg-0Q for qemu-devel@nongnu.org; Fri, 03 Aug 2018 05:14:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1flWA1-0001dc-Ix for qemu-devel@nongnu.org; Fri, 03 Aug 2018 05:14:14 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:33091) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1flWA1-0001cM-Ab for qemu-devel@nongnu.org; Fri, 03 Aug 2018 05:14:13 -0400 Received: by mail-pg1-x541.google.com with SMTP id r5-v6so2582940pgv.0 for ; Fri, 03 Aug 2018 02:14:13 -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=NJ8AlY4mjuV9hYO17hGvZ8dmi6Tk0gA05ynUsTBv4Fw=; b=FiXgbURYs0OhG2i4wrD6PM8klDiCpBv8gRxWAfiGwU7okMeuWDrzGklFmuUzQ1WZlH aEU76p+5nmGoWMYvtteXbix7eBH7DW8PBiX7xUdp/agoChoKw2nVopXD5/TdUdd0NX7S 4ypAAsM612+1OJNOfV8MEk6rMVQAbdMvRnbOVBMuw9nHg0Tdbdy+OzLF8VevcKMjA1ob gQ3+Q3Sj9LS8dfC6xseFcK+X2I+sIQpjceKN3UwID93hFScv/ZjmvkTasaeea5Ow67lw Ir0EOBIwl4PlGhqxhqeBGiCt1C2FmxVueM5lVURQbt+AmVo2N3J6jCUIsx62IELh1dwH PQPQ== 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=NJ8AlY4mjuV9hYO17hGvZ8dmi6Tk0gA05ynUsTBv4Fw=; b=iA0TvHJDzdzzf5Tw60Oxt2xLnOXPrAqCUIcVL0ToGKl2MUg7NDOebttR0AHpXoyoya xDQo4kQH7ieB+PJZF+k7nu7y2XU9XlCEiLfOqOylyHQg40qgn+oqiyfhUW37sX+MlUQI IvoG6385Te+3a1TNdiNSVw/kJj8q0sbzgsaEI+e4wv1g8YiPQ/tFaderWdyW6Kk/Spn3 EyjbOPsfbVhMIfxvbjxXmAbEczaz/ASscLz4ZsqPa2kU0yThCn6c4rTNjS0D109vXL7E Ol99Aki3wImrN1O8Tq8xPK7dVlgQIPQbTdqIxS/q4JhMDTWcnREfDOg24EryIfyWIXKf RKVg== X-Gm-Message-State: AOUpUlFDxu5igqflRqRiPlamUaWDGW0R03FqP0RiBCwOGEdlxAO9gXAA GGSiIGHoN6NdD+LqSSojGOvB9avfcJI= X-Google-Smtp-Source: AAOMgpcwxiS2FYEc76s1vk6e085CAS2ITtq8XhoDrtoDRzMp5fSesZ5dw6rePF6Ez1JwWfvKtVrAzQ== X-Received: by 2002:aa7:8591:: with SMTP id w17-v6mr3506785pfn.77.1533287652493; Fri, 03 Aug 2018 02:14:12 -0700 (PDT) Received: from VM_120_46_centos.localdomain ([119.28.87.64]) by smtp.gmail.com with ESMTPSA id e21-v6sm7991352pfl.187.2018.08.03.02.14.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Aug 2018 02:14:12 -0700 (PDT) From: Lidong Chen X-Google-Original-From: Lidong Chen To: zhang.zhanghailiang@huawei.com, quintela@redhat.com, dgilbert@redhat.com Date: Fri, 3 Aug 2018 17:13:46 +0800 Message-Id: <1533287630-4221-9-git-send-email-lidongchen@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1533287630-4221-1-git-send-email-lidongchen@tencent.com> References: <1533287630-4221-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:4864:20::541 Subject: [Qemu-devel] [PATCH v6 08/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: Gal Shachaf , Lidong Chen , Aviad Yehezkel , qemu-devel@nongnu.org, Lidong Chen Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: 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 RDMA_CM_EVENT_DISCONNECTED and RDMA_CM_EVENT_DEVICE_REMOVAL, we consider some error happened. Signed-off-by: Lidong Chen Signed-off-by: Gal Shachaf Signed-off-by: Aviad Yehezkel --- migration/rdma.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index d6bbf28..673f126 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. @@ -1505,13 +1508,37 @@ static int qemu_rdma_wait_comp_channel(RDMAContext *rdma) * without hanging forever. */ while (!rdma->error_state && !rdma->received_error) { - GPollFD pfds[1]; + 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)) { + switch (qemu_poll_ns(pfds, 2, 100 * 1000 * 1000)) { + case 2: case 1: /* fd active */ - return 0; + if (pfds[0].revents) { + return 0; + } + + 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); + if (cm_event->event == RDMA_CM_EVENT_DISCONNECTED || + cm_event->event == RDMA_CM_EVENT_DEVICE_REMOVAL) { + return -EPIPE; + } + } + break; case 0: /* Timeout, go around again */ break;