]> www.infradead.org Git - users/dwmw2/qemu.git/commit
migration/multifd: Fix multifd_send_setup cleanup when channel creation fails
authorFabiano Rosas <farosas@suse.de>
Thu, 1 Aug 2024 17:41:01 +0000 (14:41 -0300)
committerFabiano Rosas <farosas@suse.de>
Fri, 2 Aug 2024 12:47:40 +0000 (09:47 -0300)
commit0bd5b9284fa94a6242a0d27a46380d93e753488b
treea3ebbbf7340317b1da7bff34b71745873e142fff
parent84ac6fa12df3e96fdae8f3d992a7c2914c9a6ca5
migration/multifd: Fix multifd_send_setup cleanup when channel creation fails

When a channel fails to create, the code currently just returns. This
is wrong for two reasons:

1) Channel n+1 will not get to initialize it's semaphores, leading to
   an assert when terminate_threads tries to post to it:

 qemu-system-x86_64: ../util/qemu-thread-posix.c:92:
 qemu_mutex_lock_impl: Assertion `mutex->initialized' failed.

2) (theoretical) If channel n-1 already started creation it will
   defeat the purpose of the channels_created logic which is in place
   to avoid migrate_fd_cleanup() to run while channels are still being
   created.

   This cannot really happen today because the current failure cases
   for multifd_new_send_channel_create() are all synchronous,
   resulting from qio_channel_file_new_path() getting a bad
   filename. This would hit all channels equally.

   But I don't want to set a trap for future people, so have all
   channels try to create (even if failing), and only fail after the
   channels_created semaphore has been posted.

While here, remove the error_report_err call. There's one already at
migrate_fd_cleanup later on.

Cc: qemu-stable@nongnu.org
Reported-by: Jim Fehlig <jfehlig@suse.com>
Fixes: b7b03eb614 ("migration/multifd: Add outgoing QIOChannelFile support")
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
migration/multifd.c