[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 03/10] migration: avoid concurrent invoke channel
From: |
Lidong Chen |
Subject: |
[Qemu-devel] [PATCH v5 03/10] migration: avoid concurrent invoke channel_close by different threads |
Date: |
Tue, 5 Jun 2018 23:28:02 +0800 |
The channel_close maybe invoked by different threads. For example, source
qemu invokes qemu_fclose in main thread, migration thread and return path
thread. Destination qemu invokes qemu_fclose in main thread, listen thread
and COLO incoming thread.
Signed-off-by: Lidong Chen <address@hidden>
---
migration/migration.c | 2 ++
migration/migration.h | 7 +++++++
migration/qemu-file.c | 6 ++++--
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 1e99ec9..1d0aaec 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -3075,6 +3075,7 @@ static void migration_instance_finalize(Object *obj)
qemu_mutex_destroy(&ms->error_mutex);
qemu_mutex_destroy(&ms->qemu_file_lock);
+ qemu_mutex_destroy(&ms->qemu_file_close_lock);
g_free(params->tls_hostname);
g_free(params->tls_creds);
qemu_sem_destroy(&ms->pause_sem);
@@ -3115,6 +3116,7 @@ static void migration_instance_init(Object *obj)
qemu_sem_init(&ms->postcopy_pause_rp_sem, 0);
qemu_sem_init(&ms->rp_state.rp_sem, 0);
qemu_mutex_init(&ms->qemu_file_lock);
+ qemu_mutex_init(&ms->qemu_file_close_lock);
}
/*
diff --git a/migration/migration.h b/migration/migration.h
index 5af57d6..7a6025a 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -121,6 +121,13 @@ struct MigrationState
*/
QemuMutex qemu_file_lock;
+ /*
+ * The to_src_file and from_dst_file point to one QIOChannelRDMA,
+ * And qemu_fclose maybe invoked by different threads. use this lock
+ * to avoid concurrent invoke channel_close by different threads.
+ */
+ QemuMutex qemu_file_close_lock;
+
/* bytes already send at the beggining of current interation */
uint64_t iteration_initial_bytes;
/* time at the start of current iteration */
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 977b9ae..74c48e0 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -323,12 +323,14 @@ void qemu_update_position(QEMUFile *f, size_t size)
*/
int qemu_fclose(QEMUFile *f)
{
- int ret;
+ int ret, ret2;
qemu_fflush(f);
ret = qemu_file_get_error(f);
if (f->ops->close) {
- int ret2 = f->ops->close(f->opaque);
+ qemu_mutex_lock(&migrate_get_current()->qemu_file_close_lock);
+ ret2 = f->ops->close(f->opaque);
+ qemu_mutex_unlock(&migrate_get_current()->qemu_file_close_lock);
if (ret >= 0) {
ret = ret2;
}
--
1.8.3.1
- [Qemu-devel] [PATCH v5 00/10] Enable postcopy RDMA live migration, Lidong Chen, 2018/06/05
- [Qemu-devel] [PATCH v5 01/10] migration: disable RDMA WRITE after postcopy started, Lidong Chen, 2018/06/05
- [Qemu-devel] [PATCH v5 02/10] migration: create a dedicated connection for rdma return path, Lidong Chen, 2018/06/05
- [Qemu-devel] [PATCH v5 03/10] migration: avoid concurrent invoke channel_close by different threads,
Lidong Chen <=
- [Qemu-devel] [PATCH v5 05/10] migration: Stop rdma yielding during incoming postcopy, Lidong Chen, 2018/06/05
- [Qemu-devel] [PATCH v5 04/10] migration: implement bi-directional RDMA QIOChannel, Lidong Chen, 2018/06/05
- [Qemu-devel] [PATCH v5 07/10] migration: invoke qio_channel_yield only when qemu_in_coroutine(), Lidong Chen, 2018/06/05
- [Qemu-devel] [PATCH v5 06/10] migration: implement io_set_aio_fd_handler function for RDMA QIOChannel, Lidong Chen, 2018/06/05
- [Qemu-devel] [PATCH v5 08/10] migration: create a dedicated thread to release rdma resource, Lidong Chen, 2018/06/05