From patchwork Mon Aug 6 13:29:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 858585 jemmy X-Patchwork-Id: 953870 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="T+w7eGnw"; 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 41kdsR39wgz9s0n for ; Mon, 6 Aug 2018 23:34:03 +1000 (AEST) Received: from localhost ([::1]:34129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmfe3-0006R3-St for incoming@patchwork.ozlabs.org; Mon, 06 Aug 2018 09:34:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmfa5-0003Hc-Cc for qemu-devel@nongnu.org; Mon, 06 Aug 2018 09:29:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fmfa4-0008Fg-Ei for qemu-devel@nongnu.org; Mon, 06 Aug 2018 09:29:53 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:38300) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fmfa4-0008FR-8V for qemu-devel@nongnu.org; Mon, 06 Aug 2018 09:29:52 -0400 Received: by mail-pg1-x542.google.com with SMTP id k3-v6so6239760pgq.5 for ; Mon, 06 Aug 2018 06:29:52 -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=BhTjWSxI5vI0JqfpTA2MCjzO8Oc/jwHf7sGsu2PlpTU=; b=T+w7eGnwSRBGCRhNi3IdZg9VTrjeAOR/CjAsKCNwM78dkyorHIpf/PyYcD8WVd4nUU qleG4Pr2eSzmf6ove4Z8Ce56rlPLCCq5QVWNw7Xe7IxSIJciIbtxuXqws9fOruyP7KOO bWTV50NenZgB+elz588TIlDu1HEqkZ4UngmLgJV1X6H3ptgvG6M7KvjDN8ET8WKMygxY XWo7CeyE9uZ0lLAYuKi1hag7f7zZBZAeLNi2vuK33+UkVk0efzaBlgnzGgXHjZemg3FQ UUj6bgcyXqZcKUyPOT3MyDkABveBYX2flyQFuEUnwsRs1ljJWmfqN9nJwBis/cqqc3zR 5WNQ== 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=BhTjWSxI5vI0JqfpTA2MCjzO8Oc/jwHf7sGsu2PlpTU=; b=L+NHOJS4B+TnkdZTgscZAPBCEmmO0SxCSEW5uOeH3pePkbuO7l0OZOaPJhUpPeLeYE P8Oog2jNQF28JKHTv0L1/N5wJubqBHsiKhUfSZfmej7ajdFdhHjq5E2UnJwU0C6ZtK4f xH4wruCh0+TEWhIdyHbl7Vm3mZBpSFclshgF6MYc77ec2Qv8V5HX4V2dzSDDpsKaGoAE mCk7H0pRxRqjzpjAoRQE67boADpCPJCcX4Ta4Ed0WDC4ClMR0NeJAy5a3mhCX97UXA7v WDbWk1j7qpRJpK/8v/nW9dZFHHxIo2nP172ytnGGxGFtylx/Nvjlsl6E774XZ56lgc7p diFg== X-Gm-Message-State: AOUpUlGnxeY23W0rVjGvxi9JJDSU9BLPre5uww1cluAE8monU38Rkfwk 8/KOFdsQO8iTo4lGVK0l0J0= X-Google-Smtp-Source: AAOMgpexjONPNLEzw9mYpTNHsukZynEO3bgEnGGDQ4Z6AhKvL6jA3AhJobx9dNNN52V/lCNsUlaIxg== X-Received: by 2002:a63:788b:: with SMTP id t133-v6mr14561889pgc.329.1533562191462; Mon, 06 Aug 2018 06:29:51 -0700 (PDT) Received: from VM_120_46_centos.localdomain ([119.28.87.64]) by smtp.gmail.com with ESMTPSA id f11-v6sm11756302pfa.131.2018.08.06.06.29.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 06:29:51 -0700 (PDT) From: Lidong Chen X-Google-Original-From: Lidong Chen To: zhang.zhanghailiang@huawei.com, quintela@redhat.com, dgilbert@redhat.com Date: Mon, 6 Aug 2018 21:29:30 +0800 Message-Id: <1533562177-16447-5-git-send-email-lidongchen@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1533562177-16447-1-git-send-email-lidongchen@tencent.com> References: <1533562177-16447-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::542 Subject: [Qemu-devel] [PATCH v6 04/11] migration: Stop rdma yielding during incoming postcopy 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: Lidong Chen , qemu-devel@nongnu.org, Lidong Chen Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Juan Quintela --- migration/rdma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/migration/rdma.c b/migration/rdma.c index a5535fb..cfb0671 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.