From nobody Mon Feb 9 20:58:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507749692617906.14870465916; Wed, 11 Oct 2017 12:21:32 -0700 (PDT) Received: from localhost ([::1]:42349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2MZ6-0001qy-74 for importer@patchew.org; Wed, 11 Oct 2017 15:21:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2MSU-0005cj-3t for qemu-devel@nongnu.org; Wed, 11 Oct 2017 15:14:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e2MST-00056c-2b for qemu-devel@nongnu.org; Wed, 11 Oct 2017 15:14:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60394) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e2MSS-00056E-QB for qemu-devel@nongnu.org; Wed, 11 Oct 2017 15:14:21 -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 EDED37E427; Wed, 11 Oct 2017 19:14:19 +0000 (UTC) Received: from dgilbert-t530.redhat.com (ovpn-117-166.ams2.redhat.com [10.36.117.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 38DAF6C407; Wed, 11 Oct 2017 19:14:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EDED37E427 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=dgilbert@redhat.com From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, kwolf@redhat.com, jdenemar@redhat.com, wangjie88@huawei.com, quintela@redhat.com, peterx@redhat.com, mreitz@redhat.com Date: Wed, 11 Oct 2017 20:13:17 +0100 Message-Id: <20171011191317.24157-8-dgilbert@redhat.com> In-Reply-To: <20171011191317.24157-1-dgilbert@redhat.com> References: <20171011191317.24157-1-dgilbert@redhat.com> 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.27]); Wed, 11 Oct 2017 19:14:20 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 7/7] migration: pause-before-device for 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: fuweiwei2@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Add pause-before-device support for postcopy. After starting postcopy it will transition active->pause_before_device->postcopy_active Signed-off-by: Dr. David Alan Gilbert --- migration/migration.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index fa42918270..bdb6a30995 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -104,6 +104,9 @@ enum mig_rp_message_type { static MigrationState *current_migration; =20 static bool migration_object_check(MigrationState *ms, Error **errp); +static int migration_maybe_pause(MigrationState *s, + int *current_active_state, + int new_state); =20 void migration_object_init(void) { @@ -1829,8 +1832,11 @@ static int postcopy_start(MigrationState *ms, bool *= old_vm_running) QEMUFile *fb; int64_t time_at_stop =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); bool restart_block =3D false; - migrate_set_state(&ms->state, MIGRATION_STATUS_ACTIVE, - MIGRATION_STATUS_POSTCOPY_ACTIVE); + int cur_state =3D MIGRATION_STATUS_ACTIVE; + if (!migrate_pause_before_device()) { + migrate_set_state(&ms->state, MIGRATION_STATUS_ACTIVE, + MIGRATION_STATUS_POSTCOPY_ACTIVE); + } =20 trace_postcopy_start(); qemu_mutex_lock_iothread(); @@ -1850,6 +1856,12 @@ static int postcopy_start(MigrationState *ms, bool *= old_vm_running) } restart_block =3D true; =20 + ret =3D migration_maybe_pause(ms, &cur_state, + MIGRATION_STATUS_POSTCOPY_ACTIVE); + if (ret < 0) { + goto fail; + } + /* * Cause any non-postcopiable, but iterative devices to * send out their final data. @@ -1986,7 +1998,9 @@ fail: * called with the iothread locked * Returns: 0 on success */ -static int migration_maybe_pause(MigrationState *s, int *current_active_st= ate) +static int migration_maybe_pause(MigrationState *s, + int *current_active_state, + int new_state) { int ret; if (!migrate_pause_before_device()) { @@ -2014,11 +2028,11 @@ static int migration_maybe_pause(MigrationState *s,= int *current_active_state) MIGRATION_STATUS_PAUSE_BEFORE_DEVICE); qemu_sem_wait(&s->pause_sem); migrate_set_state(&s->state, MIGRATION_STATUS_PAUSE_BEFORE_DEVICE, - MIGRATION_STATUS_DEVICE); - *current_active_state =3D MIGRATION_STATUS_DEVICE; + new_state); + *current_active_state =3D new_state; qemu_mutex_lock_iothread(); =20 - return s->state =3D=3D MIGRATION_STATUS_DEVICE ? 0 : -EINVAL; + return s->state =3D=3D new_state ? 0 : -EINVAL; } =20 /** @@ -2047,7 +2061,8 @@ static void migration_completion(MigrationState *s, i= nt current_active_state, bool inactivate =3D !migrate_colo_enabled(); ret =3D vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); if (ret >=3D 0) { - ret =3D migration_maybe_pause(s, ¤t_active_state); + ret =3D migration_maybe_pause(s, ¤t_active_state, + MIGRATION_STATUS_DEVICE); /* If this worked it will already have inactivated */ inactivate &=3D !migrate_pause_before_device(); } --=20 2.13.6