[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/18] multifd: Fix the number of channels ready
From: |
Juan Quintela |
Subject: |
[PULL 01/18] multifd: Fix the number of channels ready |
Date: |
Thu, 27 Apr 2023 17:22:17 +0200 |
We don't wait in the sem when we are doing a sync_main. Make it wait
there. To make things clearer, we mark the channel ready at the
begining of the thread loop.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
---
migration/multifd.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/migration/multifd.c b/migration/multifd.c
index cce3ad6988..6a59c03dd2 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -635,6 +635,7 @@ int multifd_send_sync_main(QEMUFile *f)
for (i = 0; i < migrate_multifd_channels(); i++) {
MultiFDSendParams *p = &multifd_send_state->params[i];
+ qemu_sem_wait(&multifd_send_state->channels_ready);
trace_multifd_send_sync_main_wait(p->id);
qemu_sem_wait(&p->sem_sync);
@@ -668,6 +669,7 @@ static void *multifd_send_thread(void *opaque)
p->num_packets = 1;
while (true) {
+ qemu_sem_post(&multifd_send_state->channels_ready);
qemu_sem_wait(&p->sem);
if (qatomic_read(&multifd_send_state->exiting)) {
@@ -736,7 +738,6 @@ static void *multifd_send_thread(void *opaque)
if (flags & MULTIFD_FLAG_SYNC) {
qemu_sem_post(&p->sem_sync);
}
- qemu_sem_post(&multifd_send_state->channels_ready);
} else if (p->quit) {
qemu_mutex_unlock(&p->mutex);
break;
--
2.40.0
- [PULL 00/18] Migration 20230427 patches, Juan Quintela, 2023/04/27
- [PULL 04/18] migration: Create migrate_downtime_limit() function, Juan Quintela, 2023/04/27
- [PULL 10/18] migration: Create migrate_tls_hostname() function, Juan Quintela, 2023/04/27
- [PULL 06/18] migration: Move block_cleanup_parameters() to options.c, Juan Quintela, 2023/04/27
- [PULL 01/18] multifd: Fix the number of channels ready,
Juan Quintela <=
- [PULL 17/18] migration: Make dirty_pages_rate atomic, Juan Quintela, 2023/04/27
- [PULL 14/18] multifd: Protect multifd_send_sync_main() calls, Juan Quintela, 2023/04/27
- [PULL 13/18] multifd: Create property multifd-flush-after-each-section, Juan Quintela, 2023/04/27
- [PULL 05/18] migration: Move migrate_set_block_incremental() to options.c, Juan Quintela, 2023/04/27
- [PULL 16/18] stat64: Add stat64_set() operation, Juan Quintela, 2023/04/27
- [PULL 18/18] migration: Make dirty_bytes_last_sync atomic, Juan Quintela, 2023/04/27
- [PULL 07/18] migration: Remove MigrationState from block_cleanup_parameters(), Juan Quintela, 2023/04/27
- [PULL 08/18] migration: Create migrate_tls_creds() function, Juan Quintela, 2023/04/27
- [PULL 15/18] multifd: Only flush once each full round of memory, Juan Quintela, 2023/04/27
- [PULL 11/18] migration: Create migrate_block_bitmap_mapping() function, Juan Quintela, 2023/04/27