From nobody Sun Feb 8 14:35:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) 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=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1503471329720173.39268782482816; Tue, 22 Aug 2017 23:55:29 -0700 (PDT) Received: from localhost ([::1]:42147 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkPZY-0004l9-HM for importer@patchew.org; Wed, 23 Aug 2017 02:55:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkPWO-0002U3-TQ for qemu-devel@nongnu.org; Wed, 23 Aug 2017 02:52:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkPWO-0007dX-56 for qemu-devel@nongnu.org; Wed, 23 Aug 2017 02:52:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34672) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dkPWN-0007dH-VP for qemu-devel@nongnu.org; Wed, 23 Aug 2017 02:52:12 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DDDC383F42; Wed, 23 Aug 2017 06:52:10 +0000 (UTC) Received: from pxdev.xzpeter.org.com (dhcp-14-103.nay.redhat.com [10.66.14.103]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F6C478363; Wed, 23 Aug 2017 06:52:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DDDC383F42 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=peterx@redhat.com From: Peter Xu To: qemu-devel@nongnu.org Date: Wed, 23 Aug 2017 14:51:11 +0800 Message-Id: <1503471071-2233-9-git-send-email-peterx@redhat.com> In-Reply-To: <1503471071-2233-1-git-send-email-peterx@redhat.com> References: <1503471071-2233-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 23 Aug 2017 06:52:11 +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] [RFC v2 8/8] migration: add incoming mgmt lock 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: Laurent Vivier , Fam Zheng , Juan Quintela , Markus Armbruster , peterx@redhat.com, mdroth@linux.vnet.ibm.com, Paolo Bonzini , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Now at least migrate_incoming can be run in parallel. Let's provide a migration lock to protect it. Signed-off-by: Peter Xu --- migration/migration.c | 6 ++++++ migration/migration.h | 3 +++ 2 files changed, 9 insertions(+) diff --git a/migration/migration.c b/migration/migration.c index c3fe0ed..32058f7 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -145,6 +145,7 @@ MigrationIncomingState *migration_incoming_get_current(= void) mis_current.state =3D MIGRATION_STATUS_NONE; memset(&mis_current, 0, sizeof(MigrationIncomingState)); qemu_mutex_init(&mis_current.rp_mutex); + qemu_mutex_init(&mis_current.mgmt_mutex); qemu_event_init(&mis_current.main_thread_load_event, false); once =3D true; } @@ -1171,6 +1172,7 @@ void qmp_migrate_incoming(const char *uri, Error **er= rp) { Error *local_err =3D NULL; static bool once =3D true; + MigrationIncomingState *mis =3D migration_incoming_get_current(); =20 if (!deferred_incoming) { error_setg(errp, "For use with '-incoming defer'"); @@ -1180,8 +1182,12 @@ void qmp_migrate_incoming(const char *uri, Error **e= rrp) error_setg(errp, "The incoming migration has already been started"= ); } =20 + qemu_mutex_lock(&mis->mgmt_mutex); + qemu_start_incoming_migration(uri, &local_err); =20 + qemu_mutex_unlock(&mis->mgmt_mutex); + if (local_err) { error_propagate(errp, local_err); return; diff --git a/migration/migration.h b/migration/migration.h index 148c9fa..95f077b 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -58,6 +58,9 @@ struct MigrationIncomingState { /* The coroutine we should enter (back) after failover */ Coroutine *migration_incoming_co; QemuSemaphore colo_incoming_sem; + + /* Migration incoming management lock */ + QemuMutex mgmt_mutex; }; =20 MigrationIncomingState *migration_incoming_get_current(void); --=20 2.7.4