ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration/multifd: multifd_send_kick_main() 

When a multifd sender thread hit errors, it always needs to kick the main
thread by kicking all the semaphores that it can be waiting upon.

Provide a helper for it and deduplicate the code.

Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/r/20240202102857.110210-3-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Peter Xu 2024-02-02 18:28:36 +08:00
parent 8888a552bf
commit 48c0f5d56f
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
migration/multifd.c
View File

@ -372,6 +372,18 @@ struct {
MultiFDMethods *ops; MultiFDMethods *ops;
} *multifd_send_state; } *multifd_send_state;
/*
* The migration thread can wait on either of the two semaphores. This
* function can be used to kick the main thread out of waiting on either of
* them. Should mostly only be called when something wrong happened with
* the current multifd send thread.
*/
static void multifd_send_kick_main(MultiFDSendParams *p)
{
qemu_sem_post(&p->sem_sync);
qemu_sem_post(&multifd_send_state->channels_ready);
}
/* /*
* How we use multifd_send_state->pages and channel->pages? * How we use multifd_send_state->pages and channel->pages?
* *
@ -739,8 +751,7 @@ out:
assert(local_err); assert(local_err);
trace_multifd_send_error(p->id); trace_multifd_send_error(p->id);
multifd_send_terminate_threads(local_err); multifd_send_terminate_threads(local_err);
qemu_sem_post(&p->sem_sync); multifd_send_kick_main(p);
qemu_sem_post(&multifd_send_state->channels_ready);
error_free(local_err); error_free(local_err);
} }
@ -781,8 +792,7 @@ static void multifd_tls_outgoing_handshake(QIOTask *task,
* is not created, and then tell who pay attention to me. * is not created, and then tell who pay attention to me.
*/ */
p->quit = true; p->quit = true;
qemu_sem_post(&multifd_send_state->channels_ready); multifd_send_kick_main(p);
qemu_sem_post(&p->sem_sync);
error_free(err); error_free(err);
} }
@ -852,8 +862,7 @@ static void multifd_new_send_channel_cleanup(MultiFDSendParams *p,
{ {
migrate_set_error(migrate_get_current(), err); migrate_set_error(migrate_get_current(), err);
/* Error happen, we need to tell who pay attention to me */ /* Error happen, we need to tell who pay attention to me */
qemu_sem_post(&multifd_send_state->channels_ready); multifd_send_kick_main(p);
qemu_sem_post(&p->sem_sync);
/* /*
* Although multifd_send_thread is not created, but main migration * Although multifd_send_thread is not created, but main migration
* thread need to judge whether it is running, so we need to mark * thread need to judge whether it is running, so we need to mark