From nobody Wed Apr 24 16:23:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570444573; cv=none; d=zoho.com; s=zohoarc; b=HFwPu/rjqMfBbefcVtUvYejNTnUwKd954V8HSSRFngWSUkMazc2zYe4rhMwr50MF6+rVr28E/JiS2OjX1MjyXVUlgZXoS6VnD20xSZD6+MJng1bjCjmwcp0OUa8QIhhUirF+iqJLJEKFAmoPaDGEoCyu/TjDnW9xt1Xt+IIChHM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570444573; h=Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=moZftD++R2dusPiNbmjbwX7FUs5SeSQo+gnPxt9RGks=; b=chEjwpMweDx01f/nSLZvXXEkG+mNlHl2kn2C26nZhO/GWtRbw+fyJGegCjvz9e1ihKtk5VJxqUqfKsOLliDko7qQx6yVnNxftG5/zUkFSVnLL+ToygcCYmmhySW+V+gz4D9O/3lpkAskmDPvxGrGaN214I6uFrRHiIthk8a1r2Y= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570444573381898.7319610624859; Mon, 7 Oct 2019 03:36:13 -0700 (PDT) Received: from localhost ([::1]:42780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHQN5-0005T5-L2 for importer@patchew.org; Mon, 07 Oct 2019 06:36:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36094) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHQMG-0004x3-Jq for qemu-devel@nongnu.org; Mon, 07 Oct 2019 06:35:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iHQME-00030z-Of for qemu-devel@nongnu.org; Mon, 07 Oct 2019 06:35:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56868) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iHQME-0002yq-Io for qemu-devel@nongnu.org; Mon, 07 Oct 2019 06:35:14 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2EBEF5945E; Mon, 7 Oct 2019 10:35:13 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.36.118.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id ABD26600C1; Mon, 7 Oct 2019 10:35:09 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, peterx@redhat.com, quintela@redhat.com, groug@kaod.org Subject: [PATCH] migration: Don't try and recover return path in non-postcopy Date: Mon, 7 Oct 2019 11:35:07 +0100 Message-Id: <20191007103507.31308-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 07 Oct 2019 10:35:13 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" In normal precopy we can't do reconnection recovery - but we also don't need to, since you can just rerun migration. At the moment if the 'return-path' capability is on, we use the return path in precopy to give a postiive 'OK' to the end of migration; however if migration fails then we fall into the postcopy recovery path and hang. This fixes it by only running the return path in the postcopy case. Reported-by: Greg Kurz Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu Tested-by: Greg Kurz --- migration/migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/migration.c b/migration/migration.c index 5f7e4d15e9..d5d9b31bb7 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2481,7 +2481,7 @@ retry: out: res =3D qemu_file_get_error(rp); if (res) { - if (res =3D=3D -EIO) { + if (res =3D=3D -EIO && migration_in_postcopy()) { /* * Maybe there is something we can do: it looks like a * network down issue, and we pause for a recovery. --=20 2.21.0