openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

migration: let incoming side use thread context 

The old incoming migration is running in main thread and default
gcontext.  With the new qio_channel_add_watch_full() we can now let it
run in the thread's own gcontext (if there is one).

Currently this patch does nothing alone.  But when any of the incoming
migration is run in another iothread (e.g., the upcoming migrate-recover
command), this patch will bind the incoming logic to the iothread
instead of the main thread (which may already get page faulted and
hanged).

RDMA is not considered for now since it's not even using the QIO watch
framework at all.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20180502104740.12123-2-peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Peter Xu 2018-05-02 18:47:17 +08:00 committed by Juan Quintela
parent 8c4598f2b1
commit e89f5ff2c3
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
migration/exec.c
View File

@ -65,9 +65,8 @@ void exec_start_incoming_migration(const char *command, Error **errp)
}
qio_channel_set_name(ioc, "migration-exec-incoming");
qio_channel_add_watch(ioc,
G_IO_IN,
exec_accept_incoming_migration,
NULL,
NULL);
qio_channel_add_watch_full(ioc, G_IO_IN,
exec_accept_incoming_migration,
NULL, NULL,
g_main_context_get_thread_default());
}

9
migration/fd.c
View File

@ -66,9 +66,8 @@ void fd_start_incoming_migration(const char *infd, Error **errp)
}
qio_channel_set_name(QIO_CHANNEL(ioc), "migration-fd-incoming");
qio_channel_add_watch(ioc,
G_IO_IN,
fd_accept_incoming_migration,
NULL,
NULL);
qio_channel_add_watch_full(ioc, G_IO_IN,
fd_accept_incoming_migration,
NULL, NULL,
g_main_context_get_thread_default());
}

7
migration/socket.c
View File

@ -190,9 +190,10 @@ static void socket_start_incoming_migration(SocketAddress *saddr,
return;
}
qio_net_listener_set_client_func(listener,
socket_accept_incoming_migration,
NULL, NULL);
qio_net_listener_set_client_func_full(listener,
socket_accept_incoming_migration,
NULL, NULL,
g_main_context_get_thread_default());
}
void tcp_start_incoming_migration(const char *host_port, Error **errp)