From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
"Daniel P . Berrange" <berrange@redhat.com>,
Fam Zheng <famz@redhat.com>, Juan Quintela <quintela@redhat.com>,
mdroth@linux.vnet.ibm.com, peterx@redhat.com,
Eric Blake <eblake@redhat.com>,
Laurent Vivier <lvivier@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>
Subject: [Qemu-devel] [RFC v2 8/8] migration: add incoming mgmt lock
Date: Wed, 23 Aug 2017 14:51:11 +0800 [thread overview]
Message-ID: <1503471071-2233-9-git-send-email-peterx@redhat.com> (raw)
In-Reply-To: <1503471071-2233-1-git-send-email-peterx@redhat.com>
Now at least migrate_incoming can be run in parallel. Let's provide a
migration lock to protect it.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
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 = 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 = true;
}
@@ -1171,6 +1172,7 @@ void qmp_migrate_incoming(const char *uri, Error **errp)
{
Error *local_err = NULL;
static bool once = true;
+ MigrationIncomingState *mis = migration_incoming_get_current();
if (!deferred_incoming) {
error_setg(errp, "For use with '-incoming defer'");
@@ -1180,8 +1182,12 @@ void qmp_migrate_incoming(const char *uri, Error **errp)
error_setg(errp, "The incoming migration has already been started");
}
+ qemu_mutex_lock(&mis->mgmt_mutex);
+
qemu_start_incoming_migration(uri, &local_err);
+ 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;
};
MigrationIncomingState *migration_incoming_get_current(void);
--
2.7.4
next prev parent reply other threads:[~2017-08-23 6:52 UTC|newest]
Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-23 6:51 [Qemu-devel] [RFC v2 0/8] monitor: allow per-monitor thread Peter Xu
2017-08-23 6:51 ` [Qemu-devel] [RFC v2 1/8] monitor: move skip_flush into monitor_data_init Peter Xu
2017-08-23 16:31 ` Dr. David Alan Gilbert
2017-08-23 6:51 ` [Qemu-devel] [RFC v2 2/8] monitor: allow monitor to create thread to poll Peter Xu
2017-08-23 17:35 ` Dr. David Alan Gilbert
2017-08-25 4:25 ` Peter Xu
2017-08-25 9:30 ` Dr. David Alan Gilbert
2017-08-28 5:53 ` Peter Xu
2017-09-08 17:29 ` Dr. David Alan Gilbert
2017-08-25 15:27 ` Marc-André Lureau
2017-08-25 15:33 ` Dr. David Alan Gilbert
2017-08-25 16:07 ` Marc-André Lureau
2017-08-25 16:12 ` Dr. David Alan Gilbert
2017-08-25 16:21 ` Marc-André Lureau
2017-08-25 16:29 ` Dr. David Alan Gilbert
2017-08-26 8:33 ` Marc-André Lureau
2017-08-28 3:05 ` Peter Xu
2017-08-28 10:11 ` Marc-André Lureau
2017-08-28 12:48 ` Peter Xu
2017-09-05 18:58 ` Dr. David Alan Gilbert
2017-08-28 11:08 ` Markus Armbruster
2017-08-28 12:28 ` Marc-André Lureau
2017-08-28 16:24 ` Markus Armbruster
2017-08-28 17:24 ` Marc-André Lureau
2017-08-29 6:27 ` Markus Armbruster
2017-08-23 6:51 ` [Qemu-devel] [RFC v2 3/8] char-io: fix possible risk on IOWatchPoll Peter Xu
2017-08-25 14:44 ` Marc-André Lureau
2017-08-26 7:19 ` Fam Zheng
2017-08-28 5:56 ` Peter Xu
2017-08-23 6:51 ` [Qemu-devel] [RFC v2 4/8] QAPI: new QMP command option "without-bql" Peter Xu
2017-08-23 17:44 ` Dr. David Alan Gilbert
2017-08-23 23:37 ` Fam Zheng
2017-08-25 5:37 ` Peter Xu
2017-08-25 9:14 ` Dr. David Alan Gilbert
2017-08-28 8:08 ` Peter Xu
2017-09-08 17:38 ` Dr. David Alan Gilbert
2017-08-25 5:35 ` Peter Xu
2017-08-25 9:06 ` Dr. David Alan Gilbert
2017-08-28 8:26 ` Peter Xu
2017-09-08 17:52 ` Dr. David Alan Gilbert
2017-08-23 6:51 ` [Qemu-devel] [RFC v2 5/8] hmp: support "without_bql" Peter Xu
2017-08-23 17:46 ` Dr. David Alan Gilbert
2017-08-25 5:44 ` Peter Xu
2017-08-23 6:51 ` [Qemu-devel] [RFC v2 6/8] migration: qmp: migrate_incoming don't need BQL Peter Xu
2017-08-23 6:51 ` [Qemu-devel] [RFC v2 7/8] migration: hmp: " Peter Xu
2017-08-23 6:51 ` Peter Xu [this message]
2017-08-23 18:01 ` [Qemu-devel] [RFC v2 8/8] migration: add incoming mgmt lock Dr. David Alan Gilbert
2017-08-25 5:49 ` Peter Xu
2017-08-25 9:34 ` Dr. David Alan Gilbert
2017-08-28 8:39 ` Peter Xu
2017-08-29 11:03 ` [Qemu-devel] [RFC v2 0/8] monitor: allow per-monitor thread Daniel P. Berrange
2017-08-30 7:06 ` Markus Armbruster
2017-08-30 10:13 ` Daniel P. Berrange
2017-08-31 3:31 ` Peter Xu
2017-08-31 9:14 ` Daniel P. Berrange
2017-09-06 9:48 ` Dr. David Alan Gilbert
2017-09-06 10:46 ` Daniel P. Berrange
2017-09-06 10:48 ` Dr. David Alan Gilbert
2017-09-06 10:54 ` Daniel P. Berrange
2017-09-06 10:57 ` Dr. David Alan Gilbert
2017-09-06 11:06 ` Daniel P. Berrange
2017-09-06 11:31 ` Dr. David Alan Gilbert
2017-09-06 11:54 ` Daniel P. Berrange
2017-09-07 8:13 ` Peter Xu
2017-09-07 8:49 ` Stefan Hajnoczi
2017-09-07 9:18 ` Dr. David Alan Gilbert
2017-09-07 10:19 ` Stefan Hajnoczi
2017-09-07 10:24 ` Peter Xu
2017-09-07 8:55 ` Daniel P. Berrange
2017-09-07 9:19 ` Dr. David Alan Gilbert
2017-09-07 9:22 ` Daniel P. Berrange
2017-09-07 9:27 ` Dr. David Alan Gilbert
2017-09-07 11:19 ` Markus Armbruster
2017-09-07 11:31 ` Dr. David Alan Gilbert
2017-09-07 9:15 ` Dr. David Alan Gilbert
2017-09-07 9:25 ` Daniel P. Berrange
2017-09-07 12:59 ` Markus Armbruster
2017-09-07 13:22 ` Daniel P. Berrange
2017-09-07 17:41 ` Markus Armbruster
2017-09-07 18:09 ` Dr. David Alan Gilbert
2017-09-08 8:41 ` Markus Armbruster
2017-09-08 9:32 ` Dr. David Alan Gilbert
2017-09-08 11:49 ` Markus Armbruster
2017-09-08 13:19 ` Stefan Hajnoczi
2017-09-11 10:32 ` Peter Xu
2017-09-11 10:36 ` Peter Xu
2017-09-11 10:43 ` Daniel P. Berrange
2017-09-08 9:27 ` Daniel P. Berrange
2017-09-07 14:20 ` Dr. David Alan Gilbert
2017-09-07 17:41 ` Markus Armbruster
2017-09-07 18:04 ` Dr. David Alan Gilbert
2017-09-07 10:04 ` Dr. David Alan Gilbert
2017-09-07 10:08 ` Daniel P. Berrange
2017-09-07 13:59 ` Eric Blake
2017-09-06 14:50 ` Stefan Hajnoczi
2017-09-06 15:14 ` Dr. David Alan Gilbert
2017-09-07 7:38 ` Peter Xu
2017-09-07 8:58 ` Stefan Hajnoczi
2017-09-07 9:35 ` Dr. David Alan Gilbert
2017-09-07 10:09 ` Stefan Hajnoczi
2017-09-07 12:02 ` Peter Xu
2017-09-07 16:53 ` Stefan Hajnoczi
2017-09-07 17:14 ` Dr. David Alan Gilbert
2017-09-07 17:35 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1503471071-2233-9-git-send-email-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=famz@redhat.com \
--cc=lvivier@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.