OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration/multifd: Protect accesses to migration_threads

Browse Source 
This doubly linked list is common for all the multifd and migration
threads so we need to avoid concurrent access.

Add a mutex to protect the data from concurrent access. This fixes a
crash when removing two MigrationThread objects from the list at the
same time during cleanup of multifd threads.

Fixes: 671326201d ("migration: Introduce interface query-migrationthreads")
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20230607161306.31425-3-farosas@suse.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Fabiano Rosas 2023-06-07 13:13:05 -03:00 committed by Juan Quintela
parent 788fa68041
commit 01ec0f3a92
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
migration/threadinfo.c
View File

@ -10,23 +10,35 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#include "qemu/osdep.h"
#include "qemu/queue.h"
#include "qemu/lockable.h"
#include "threadinfo.h" #include "threadinfo.h"
QemuMutex migration_threads_lock;
static QLIST_HEAD(, MigrationThread) migration_threads; static QLIST_HEAD(, MigrationThread) migration_threads;
static void __attribute__((constructor)) migration_threads_init(void)
{
qemu_mutex_init(&migration_threads_lock);
}
MigrationThread *migration_threads_add(const char *name, int thread_id) MigrationThread *migration_threads_add(const char *name, int thread_id)
{ {
MigrationThread *thread = g_new0(MigrationThread, 1); MigrationThread *thread = g_new0(MigrationThread, 1);
thread->name = name; thread->name = name;
thread->thread_id = thread_id; thread->thread_id = thread_id;
WITH_QEMU_LOCK_GUARD(&migration_threads_lock) {
QLIST_INSERT_HEAD(&migration_threads, thread, node); QLIST_INSERT_HEAD(&migration_threads, thread, node);
}
return thread; return thread;
} }
void migration_threads_remove(MigrationThread *thread) void migration_threads_remove(MigrationThread *thread)
{ {
QEMU_LOCK_GUARD(&migration_threads_lock);
if (thread) { if (thread) {
QLIST_REMOVE(thread, node); QLIST_REMOVE(thread, node);
g_free(thread); g_free(thread);
@ -39,6 +51,7 @@ MigrationThreadInfoList *qmp_query_migrationthreads(Error **errp)
MigrationThreadInfoList **tail = &head; MigrationThreadInfoList **tail = &head;
MigrationThread *thread = NULL; MigrationThread *thread = NULL;
QEMU_LOCK_GUARD(&migration_threads_lock);
QLIST_FOREACH(thread, &migration_threads, node) { QLIST_FOREACH(thread, &migration_threads, node) {
MigrationThreadInfo *info = g_new0(MigrationThreadInfo, 1); MigrationThreadInfo *info = g_new0(MigrationThreadInfo, 1);
info->name = g_strdup(thread->name); info->name = g_strdup(thread->name);

2
migration/threadinfo.h
View File

@ -10,8 +10,6 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#include "qemu/queue.h"
#include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-commands-migration.h" #include "qapi/qapi-commands-migration.h"