[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/34] migration/multifd: Cleanup multifd_load_cleanup()
From: |
peterx |
Subject: |
[PULL 21/34] migration/multifd: Cleanup multifd_load_cleanup() |
Date: |
Thu, 8 Feb 2024 11:05:15 +0800 |
From: Peter Xu <peterx@redhat.com>
Use similar logic to cleanup the recv side.
Note that multifd_recv_terminate_threads() may need some similar rework
like the sender side, but let's leave that for later.
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: 20240202102857.110210-21-peterx@redhat.com">https://lore.kernel.org/r/20240202102857.110210-21-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/multifd.c | 52 ++++++++++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 22 deletions(-)
diff --git a/migration/multifd.c b/migration/multifd.c
index 4cb0d2cc17..e2dd2f6e04 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -1070,6 +1070,34 @@ void multifd_load_shutdown(void)
}
}
+static void multifd_recv_cleanup_channel(MultiFDRecvParams *p)
+{
+ migration_ioc_unregister_yank(p->c);
+ object_unref(OBJECT(p->c));
+ p->c = NULL;
+ qemu_mutex_destroy(&p->mutex);
+ qemu_sem_destroy(&p->sem_sync);
+ g_free(p->name);
+ p->name = NULL;
+ p->packet_len = 0;
+ g_free(p->packet);
+ p->packet = NULL;
+ g_free(p->iov);
+ p->iov = NULL;
+ g_free(p->normal);
+ p->normal = NULL;
+ multifd_recv_state->ops->recv_cleanup(p);
+}
+
+static void multifd_recv_cleanup_state(void)
+{
+ qemu_sem_destroy(&multifd_recv_state->sem_sync);
+ g_free(multifd_recv_state->params);
+ multifd_recv_state->params = NULL;
+ g_free(multifd_recv_state);
+ multifd_recv_state = NULL;
+}
+
void multifd_load_cleanup(void)
{
int i;
@@ -1092,29 +1120,9 @@ void multifd_load_cleanup(void)
qemu_thread_join(&p->thread);
}
for (i = 0; i < migrate_multifd_channels(); i++) {
- MultiFDRecvParams *p = &multifd_recv_state->params[i];
-
- migration_ioc_unregister_yank(p->c);
- object_unref(OBJECT(p->c));
- p->c = NULL;
- qemu_mutex_destroy(&p->mutex);
- qemu_sem_destroy(&p->sem_sync);
- g_free(p->name);
- p->name = NULL;
- p->packet_len = 0;
- g_free(p->packet);
- p->packet = NULL;
- g_free(p->iov);
- p->iov = NULL;
- g_free(p->normal);
- p->normal = NULL;
- multifd_recv_state->ops->recv_cleanup(p);
+ multifd_recv_cleanup_channel(&multifd_recv_state->params[i]);
}
- qemu_sem_destroy(&multifd_recv_state->sem_sync);
- g_free(multifd_recv_state->params);
- multifd_recv_state->params = NULL;
- g_free(multifd_recv_state);
- multifd_recv_state = NULL;
+ multifd_recv_cleanup_state();
}
void multifd_recv_sync_main(void)
--
2.43.0
- [PULL 03/34] migration/multifd: multifd_send_kick_main(), (continued)
- [PULL 03/34] migration/multifd: multifd_send_kick_main(), peterx, 2024/02/07
- [PULL 05/34] migration/multifd: Postpone reset of MultiFDPages_t, peterx, 2024/02/07
- [PULL 06/34] migration/multifd: Drop MultiFDSendParams.normal[] array, peterx, 2024/02/07
- [PULL 07/34] migration/multifd: Separate SYNC request with normal jobs, peterx, 2024/02/07
- [PULL 04/34] migration/multifd: Drop MultiFDSendParams.quit, cleanup error paths, peterx, 2024/02/07
- [PULL 08/34] migration/multifd: Simplify locking in sender thread, peterx, 2024/02/07
- [PULL 09/34] migration/multifd: Drop pages->num check in sender thread, peterx, 2024/02/07
- [PULL 13/34] migration/multifd: multifd_send_prepare_header(), peterx, 2024/02/07
- [PULL 10/34] migration/multifd: Rename p->num_packets and clean it up, peterx, 2024/02/07
- [PULL 20/34] migration/multifd: Cleanup multifd_save_cleanup(), peterx, 2024/02/07
- [PULL 21/34] migration/multifd: Cleanup multifd_load_cleanup(),
peterx <=
- [PULL 11/34] migration/multifd: Move total_normal_pages accounting, peterx, 2024/02/07
- [PULL 12/34] migration/multifd: Move trace_multifd_send|recv(), peterx, 2024/02/07
- [PULL 14/34] migration/multifd: Move header prepare/fill into send_prepare(), peterx, 2024/02/07
- [PULL 15/34] migration/multifd: Forbid spurious wakeups, peterx, 2024/02/07
- [PULL 17/34] migration/multifd: Change retval of multifd_queue_page(), peterx, 2024/02/07
- [PULL 19/34] migration/multifd: Rewrite multifd_queue_page(), peterx, 2024/02/07
- [PULL 22/34] migration/multifd: Stick with send/recv on function names, peterx, 2024/02/07
- [PULL 25/34] migration: Fix logic of channels and transport compatibility check, peterx, 2024/02/07
- [PULL 24/34] migration/multifd: Optimize sender side to be lockless, peterx, 2024/02/07
- [PULL 23/34] migration/multifd: Fix MultiFDSendParams.packet_num race, peterx, 2024/02/07