From nobody Wed May 8 02:19:17 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=1569261057; cv=none; d=zoho.com; s=zohoarc; b=dmBIrT50GTni7Mbrd66A0PqfYPhK5Re/La/U/k99KJULJQqDr6I3i/Zx98MTyOauqG8s0lnurD/UF8CV71e/WJz1Mj9WzIT8wpGrwncHgEsHeF+qvh99r+BYHMTQtPofWvHNIoKOcnRwwukyb8oUaOYwkq1o5XIY1qPVoplQ4lo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569261057; h=Content-Transfer-Encoding:Cc: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=+W3Br5VXaVcYn0H2cv63nkPd4JP3zqLyoFKO9nFknBU=; b=ZzQfcuON2AI/CIxU77RKjD5ymJ8wAhW+C+i9VDEsnt9PK8rLNgDlK1fIYkqbh5SIdcmiIW/jtl1XctFYr3r+DJ2A+YkQassry/1rPiMbIH6lv2TT//NeIJAkGhdD3hcFKDdbC9CHloOV8b5vzzx9+ZAddu5xh9j7TxvRkRi9o3M= 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 1569261057054257.60761263494976; Mon, 23 Sep 2019 10:50:57 -0700 (PDT) Received: from localhost ([::1]:60440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCSUB-0000XX-LP for importer@patchew.org; Mon, 23 Sep 2019 13:50:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44665) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCSTC-0008Ko-8B for qemu-devel@nongnu.org; Mon, 23 Sep 2019 13:49:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCSTA-0008K3-4m for qemu-devel@nongnu.org; Mon, 23 Sep 2019 13:49:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44788) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCST9-0008JE-VL for qemu-devel@nongnu.org; Mon, 23 Sep 2019 13:49:52 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 86A0320F6; Mon, 23 Sep 2019 17:49:50 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-213.ams2.redhat.com [10.36.117.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id 72F6560F80; Mon, 23 Sep 2019 17:49:44 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, quintela@redhat.com, peterx@redhat.com Subject: [PATCH] migration/postcopy: Recognise the recovery states as 'in_postcopy' Date: Mon, 23 Sep 2019 18:49:42 +0100 Message-Id: <20190923174942.12182-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Mon, 23 Sep 2019 17:49:50 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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: , Cc: thuth@redhat.com, alex.bennee@linaro.org 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" Various parts of the migration code do different things when they're in postcopy mode; prior to this patch this has been 'postcopy-active'. This patch extends 'in_postcopy' to include 'postcopy-paused' and 'postcopy-recover'. In particular, when you set the max-postcopy-bandwidth parameter, this only affects the current migration fd if we're 'in_postcopy'; this leads to a race in the postcopy recovery test where it increases the speed from 4k/sec to unlimited, but that increase can get ignored if the change is made between the point at which the reconnection happens and it transitions back to active. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Juan Quintela Reviewed-by: Peter Xu Tested-by: Alex Benn=C3=A9e Tested-by: Markus Armbruster --- migration/migration.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/migration/migration.c b/migration/migration.c index 01863a95f5..5f7e4d15e9 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1659,7 +1659,14 @@ bool migration_in_postcopy(void) { MigrationState *s =3D migrate_get_current(); =20 - return (s->state =3D=3D MIGRATION_STATUS_POSTCOPY_ACTIVE); + switch (s->state) { + case MIGRATION_STATUS_POSTCOPY_ACTIVE: + case MIGRATION_STATUS_POSTCOPY_PAUSED: + case MIGRATION_STATUS_POSTCOPY_RECOVER: + return true; + default: + return false; + } } =20 bool migration_in_postcopy_after_devices(MigrationState *s) --=20 2.21.0