* [PATCH 0/7] migration: Fix multifd+postcopy break on qemu-7.2 machine type
@ 2026-09-16 21:35 Peter Xu
2026-09-16 21:35 ` [PATCH 1/7] tests/migration-test: Add multifd+postcopy test for preempt recovery Peter Xu
` (6 more replies)
0 siblings, 7 replies; 18+ messages in thread
From: Peter Xu @ 2026-09-16 21:35 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Xu, Fabiano Rosas, Akash Kulhalli, Juraj Marcin
CI run: https://gitlab.com/peterx/qemu/-/pipelines/2855601505
Currently, upstream is broken with migration with qemu-7.2 machine types,
simplest reproducer:
$ QTEST_QEMU_MACHINE_TYPE=pc-q35-7.2 \
QTEST_QEMU_BINARY=./qemu-system-x86_64 \
./tests/qtest/migration-test --full \
-r /x86_64/migration/multifd+postcopy/preempt/plain
This series should fix it. Note that this solution will not work for TLS,
and due to the fact that TLS is not peekable (which the design of this
series currently rely on), TLS is not fixable. But as long as the user
doesn't enable all four features (multifd, postcopy, preempt, tls) then it
will still work. I have much more info in patch 6, feel free to read.
Patch layout:
Patch 1: Added one more test for multifd+postcopy recovery non-tls
Patch 2-5: Something I found either buggy or good to have cleanups
Patch 6: Fix the problem on incoming side
Patch 7: Fix the problem on outgoing side
Tests I've done:
- The qtest, concurrent execution of a lot of "migration-test --full",
which I normally use to catch race conditions. Nothing pops up.
- Test migration with all three features enabled (multifd, postcopy-ram,
postcopy-preempt) on different machine types and binaries combinations,
|----------+---------+-------------+--------|
| Machine | Source | Destination | Result |
|----------+---------+-------------+--------|
| q35-11.2 | master | master | PASS | --+
| | master | patched | PASS | |-----> 11.2 machine not affected
| | patched | master | PASS | |
| | patched | patched | PASS | --+
|----------+---------+-------------+--------|
| q35-7.2 | master | master | FAIL | --------> current breakage
| | master | patched | PASS | --+
| | patched | master | PASS | |-----> patch any side should fix
| | patched | patched | PASS | --+
|----------+---------+-------------+--------|
- Manual test of qemu-7.2 binary <-> patched new binary with either (1)
multifd migration, or (2) postcopy + preempt migration. NOTE: qemu-7.2
doesn't support enabling all.
Comments welcomed, thanks.
Peter Xu (7):
tests/migration-test: Add multifd+postcopy test for preempt recovery
migration: Add two more trace points for incoming channel mgmt
migration: Fix socket listen backlog
migration: Split migration_channel_process_incoming()
migration: Dump type of channel in set_incoming_channel tracepoint
migration: Fix incoming channel race with multifd and preempt_pre_7_2
migration: Postpone the outgoing preempt channel for preempt_pre_7_2
migration/channel.h | 6 +-
migration/migration.h | 35 ++
migration/channel.c | 453 +++++++++++++++++++++----
migration/migration.c | 58 +++-
migration/socket.c | 25 +-
tests/qtest/migration/postcopy-tests.c | 11 +
migration/trace-events | 8 +-
7 files changed, 515 insertions(+), 81 deletions(-)
--
2.55.0
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 1/7] tests/migration-test: Add multifd+postcopy test for preempt recovery
2026-09-16 21:35 [PATCH 0/7] migration: Fix multifd+postcopy break on qemu-7.2 machine type Peter Xu
@ 2026-09-16 21:35 ` Peter Xu
2026-09-16 21:35 ` [PATCH 2/7] migration: Add two more trace points for incoming channel mgmt Peter Xu
` (5 subsequent siblings)
6 siblings, 0 replies; 18+ messages in thread
From: Peter Xu @ 2026-09-16 21:35 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Xu, Fabiano Rosas, Akash Kulhalli, Juraj Marcin
We have one for TLS, but we don't have the non-TLS version. Add it.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
tests/qtest/migration/postcopy-tests.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/tests/qtest/migration/postcopy-tests.c b/tests/qtest/migration/postcopy-tests.c
index 13a5759655..6c4fd31152 100644
--- a/tests/qtest/migration/postcopy-tests.c
+++ b/tests/qtest/migration/postcopy-tests.c
@@ -89,6 +89,15 @@ static void test_multifd_postcopy_preempt(char *name, MigrateCommon *args)
test_postcopy_common(args);
}
+static void test_multifd_postcopy_preempt_recovery(char *name,
+ MigrateCommon *args)
+{
+ args->start.caps[MIGRATION_CAPABILITY_MULTIFD] = true;
+ args->start.caps[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT] = true;
+
+ test_postcopy_recovery_common(args, POSTCOPY_FAIL_NONE);
+}
+
void migration_test_add_postcopy(MigrationTestEnv *env)
{
migration_test_add_postcopy_smoke(env);
@@ -113,6 +122,8 @@ void migration_test_add_postcopy(MigrationTestEnv *env)
test_multifd_postcopy);
migration_test_add("/migration/multifd+postcopy/preempt/plain",
test_multifd_postcopy_preempt);
+ migration_test_add("/migration/multifd+postcopy/preempt/recovery/plain",
+ test_multifd_postcopy_preempt_recovery);
if (env->is_x86) {
migration_test_add("/migration/postcopy/suspend",
test_postcopy_suspend);
--
2.55.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 2/7] migration: Add two more trace points for incoming channel mgmt
2026-09-16 21:35 [PATCH 0/7] migration: Fix multifd+postcopy break on qemu-7.2 machine type Peter Xu
2026-09-16 21:35 ` [PATCH 1/7] tests/migration-test: Add multifd+postcopy test for preempt recovery Peter Xu
@ 2026-09-16 21:35 ` Peter Xu
2026-09-16 21:35 ` [PATCH 3/7] migration: Fix socket listen backlog Peter Xu
` (4 subsequent siblings)
6 siblings, 0 replies; 18+ messages in thread
From: Peter Xu @ 2026-09-16 21:35 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Xu, Fabiano Rosas, Akash Kulhalli, Juraj Marcin
We have trace points for both multifd channel and preempt channel when a
new channel is established on the destination, but no main channel. We can
normally deduce this by analyzing the socket channel tracepoints, but add
one for debugging purpose so in a trace log we can see when all channels
are established.
Add one more for start / resume of incoming migration too.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/migration.c | 3 +++
migration/trace-events | 2 ++
2 files changed, 5 insertions(+)
diff --git a/migration/migration.c b/migration/migration.c
index d14beb5d22..cfadcc79c2 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -852,6 +852,7 @@ bool migration_incoming_setup(QIOChannel *ioc, uint8_t channel, Error **errp)
assert(!mis->from_src_file);
mis->from_src_file = f;
qemu_file_set_blocking(f, false, &error_abort);
+ trace_migration_main_channel_received();
break;
case CH_MULTIFD:
@@ -918,6 +919,8 @@ static bool postcopy_try_recover(void)
void migration_start_incoming(void)
{
+ trace_migration_start_incoming();
+
if (postcopy_try_recover()) {
return;
}
diff --git a/migration/trace-events b/migration/trace-events
index e87d4abd91..e755872496 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -200,6 +200,8 @@ postcopy_preempt_enabled(bool value) "%d"
migration_precopy_complete(void) ""
migration_call_notifiers(int type) "type=%d"
migration_request_switchover_ack_legacy(const char *requester, unsigned int switchover_ack_pending_num_legacy) "Requester %s, switchover_ack_pending_num_legacy %u"
+migration_main_channel_received(void) ""
+migration_start_incoming(void) ""
# migration-stats
migration_transferred_bytes(uint64_t qemu_file, uint64_t multifd, uint64_t rdma) "qemu_file %" PRIu64 " multifd %" PRIu64 " RDMA %" PRIu64
--
2.55.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 3/7] migration: Fix socket listen backlog
2026-09-16 21:35 [PATCH 0/7] migration: Fix multifd+postcopy break on qemu-7.2 machine type Peter Xu
2026-09-16 21:35 ` [PATCH 1/7] tests/migration-test: Add multifd+postcopy test for preempt recovery Peter Xu
2026-09-16 21:35 ` [PATCH 2/7] migration: Add two more trace points for incoming channel mgmt Peter Xu
@ 2026-09-16 21:35 ` Peter Xu
2026-09-16 21:35 ` [PATCH 4/7] migration: Split migration_channel_process_incoming() Peter Xu
` (3 subsequent siblings)
6 siblings, 0 replies; 18+ messages in thread
From: Peter Xu @ 2026-09-16 21:35 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Fabiano Rosas, Akash Kulhalli, Juraj Marcin,
Daniel P. Berrangé
QEMU incoming side may have set a wrong listen() backlog. After the
support of multifd + postcopy now we have four possibilities on setting the
backlog, some of them are wrong:
Vanilla: 1 (correct)
Multifd: N (wrong, should be N+1)
Preempt: 2 (correct)
Multifd+Preempt: N (wrong, should be N+2)
No real report for this, found by code observation only. Logically the
backlog (pending accept requests on destination on the listening sockets)
needs to be the maximum of possible channels. Otherwise if the accept
queue full on destination, source QEMU may hit connection errors.
Cc: Daniel P. Berrangé <berrange@redhat.com>
Fixes: 0705e56496 ("multifd: Use number of channels as listen backlog")
Fixes: e274188612 ("migration: enable multifd and postcopy together")
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/socket.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/migration/socket.c b/migration/socket.c
index f57f1a8e7c..31bfa1eeeb 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -139,21 +139,32 @@ socket_incoming_migration_end(void *opaque)
object_unref(OBJECT(listener));
}
+static int socket_get_max_channels(void)
+{
+ /* The main channel is always wanted */
+ int num = 1;
+
+ if (migrate_multifd()) {
+ num += migrate_multifd_channels();
+ }
+
+ if (migrate_postcopy_preempt()) {
+ /* The preempt channel */
+ num += 1;
+ }
+
+ return num;
+}
+
void socket_connect_incoming(SocketAddress *saddr, Error **errp)
{
QIONetListener *listener = qio_net_listener_new();
MigrationIncomingState *mis = migration_incoming_get_current();
size_t i;
- int num = 1;
+ int num = socket_get_max_channels();
qio_net_listener_set_name(listener, "migration-socket-listener");
- if (migrate_multifd()) {
- num = migrate_multifd_channels();
- } else if (migrate_postcopy_preempt()) {
- num = RAM_CHANNEL_MAX;
- }
-
if (qio_net_listener_open_sync(listener, saddr, num, errp) < 0) {
object_unref(OBJECT(listener));
return;
--
2.55.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 4/7] migration: Split migration_channel_process_incoming()
2026-09-16 21:35 [PATCH 0/7] migration: Fix multifd+postcopy break on qemu-7.2 machine type Peter Xu
` (2 preceding siblings ...)
2026-09-16 21:35 ` [PATCH 3/7] migration: Fix socket listen backlog Peter Xu
@ 2026-09-16 21:35 ` Peter Xu
2026-09-16 21:35 ` [PATCH 5/7] migration: Dump type of channel in set_incoming_channel tracepoint Peter Xu
` (2 subsequent siblings)
6 siblings, 0 replies; 18+ messages in thread
From: Peter Xu @ 2026-09-16 21:35 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Xu, Fabiano Rosas, Akash Kulhalli, Juraj Marcin
Introduce two smaller functions for it,
- migration_incoming_channel_install(): peek at channels whenever possible,
and install the channel to one of the slots (main, multifd, preempt)
- migration_incoming_error_propagate(): handling an error happened during
channel establish phase of an incoming migration.
When at it, move the set channel tracepoint into the 1st helper, replacing
the existing tracepoint with trace_migration_channel_process_incoming().
So far, they should fire almost the same time if the channel peek worked.
This fact will change in follow up refactorings.
I also moved migration_ioc_register_yank() to be after identify, hopefully
it makes more sense: we'd better be careful on registration of yank, or we
should be prepared for explosions. Previously it worked, my guess is when
error happens we never unregister yank but hang dest QEMU or quit,
depending on exit_on_error value.
No real functional change intended.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/channel.c | 57 +++++++++++++++++++++++++++++-------------
migration/trace-events | 1 +
2 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/migration/channel.c b/migration/channel.c
index 266ae8f776..8407ea46cb 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -197,6 +197,42 @@ out:
return channel;
}
+static void migration_incoming_error_propagate(MigrationIncomingState *mis,
+ Error *error)
+{
+ error_report_err(error);
+ migrate_set_state(&mis->state, mis->state, MIGRATION_STATUS_FAILED);
+ if (mis->exit_on_error) {
+ exit(EXIT_FAILURE);
+ }
+}
+
+static bool migration_incoming_channel_install(MigrationIncomingState *mis,
+ QIOChannel *ioc,
+ Error **errp)
+{
+ MigChannelType ch = migration_channel_identify(mis, ioc, errp);
+
+ if (!ch) {
+ assert(*errp);
+ return false;
+ }
+
+ trace_migration_set_incoming_channel(ioc,
+ object_get_typename(OBJECT(ioc)));
+ migration_ioc_register_yank(ioc);
+
+ if (migration_incoming_setup(ioc, ch, errp)) {
+ migration_start_incoming();
+ }
+
+ if (*errp) {
+ return false;
+ }
+
+ return true;
+}
+
/**
* @migration_channel_process_incoming - Create new incoming migration channel
*
@@ -209,31 +245,18 @@ void migration_channel_process_incoming(QIOChannel *ioc)
{
MigrationIncomingState *mis = migration_incoming_get_current();
Error *local_err = NULL;
- MigChannelType ch;
- trace_migration_set_incoming_channel(
+ trace_migration_channel_process_incoming(
ioc, object_get_typename(OBJECT(ioc)));
if (migrate_channel_requires_tls_upgrade(ioc)) {
migration_tls_channel_process_incoming(ioc, &local_err);
} else {
- migration_ioc_register_yank(ioc);
- ch = migration_channel_identify(mis, ioc, &local_err);
- if (!ch) {
- goto out;
- }
-
- if (migration_incoming_setup(ioc, ch, &local_err)) {
- migration_start_incoming();
- }
+ migration_incoming_channel_install(mis, ioc, &local_err);
}
-out:
+
if (local_err) {
- error_report_err(local_err);
- migrate_set_state(&mis->state, mis->state, MIGRATION_STATUS_FAILED);
- if (mis->exit_on_error) {
- exit(EXIT_FAILURE);
- }
+ migration_incoming_error_propagate(mis, local_err);
}
}
diff --git a/migration/trace-events b/migration/trace-events
index e755872496..c5fa88fe8f 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -207,6 +207,7 @@ migration_start_incoming(void) ""
migration_transferred_bytes(uint64_t qemu_file, uint64_t multifd, uint64_t rdma) "qemu_file %" PRIu64 " multifd %" PRIu64 " RDMA %" PRIu64
# channel.c
+migration_channel_process_incoming(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
migration_set_incoming_channel(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
migration_set_outgoing_channel(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
--
2.55.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 5/7] migration: Dump type of channel in set_incoming_channel tracepoint
2026-09-16 21:35 [PATCH 0/7] migration: Fix multifd+postcopy break on qemu-7.2 machine type Peter Xu
` (3 preceding siblings ...)
2026-09-16 21:35 ` [PATCH 4/7] migration: Split migration_channel_process_incoming() Peter Xu
@ 2026-09-16 21:35 ` Peter Xu
2026-09-16 21:35 ` [PATCH 6/7] migration: Fix incoming channel race with multifd and preempt_pre_7_2 Peter Xu
2026-09-16 21:35 ` [PATCH 7/7] migration: Postpone the outgoing preempt channel for preempt_pre_7_2 Peter Xu
6 siblings, 0 replies; 18+ messages in thread
From: Peter Xu @ 2026-09-16 21:35 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Xu, Fabiano Rosas, Akash Kulhalli, Juraj Marcin
Add this info to be crystal clear on what channel we're installing.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/channel.h | 3 ++-
migration/channel.c | 10 +++++++++-
migration/trace-events | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/migration/channel.h b/migration/channel.h
index a7d0d29058..678712f291 100644
--- a/migration/channel.h
+++ b/migration/channel.h
@@ -24,7 +24,8 @@ typedef enum {
CH_NONE,
CH_MAIN,
CH_MULTIFD,
- CH_POSTCOPY
+ CH_POSTCOPY,
+ CH_NUM,
} MigChannelType;
void migration_channel_process_incoming(QIOChannel *ioc);
diff --git a/migration/channel.c b/migration/channel.c
index 8407ea46cb..b9065efd03 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -34,6 +34,13 @@
#include "trace.h"
#include "yank_functions.h"
+static const char *const mig_channel_str[CH_NUM] = {
+ [CH_NONE] = "NONE",
+ [CH_MAIN] = "MAIN",
+ [CH_MULTIFD] = "MULTIFD",
+ [CH_POSTCOPY] = "PREEMPT",
+};
+
void migration_connect_outgoing(MigrationState *s, MigrationAddress *addr,
Error **errp)
{
@@ -219,7 +226,8 @@ static bool migration_incoming_channel_install(MigrationIncomingState *mis,
}
trace_migration_set_incoming_channel(ioc,
- object_get_typename(OBJECT(ioc)));
+ object_get_typename(OBJECT(ioc)),
+ mig_channel_str[ch]);
migration_ioc_register_yank(ioc);
if (migration_incoming_setup(ioc, ch, errp)) {
diff --git a/migration/trace-events b/migration/trace-events
index c5fa88fe8f..9ef42f54d1 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -208,7 +208,7 @@ migration_transferred_bytes(uint64_t qemu_file, uint64_t multifd, uint64_t rdma)
# channel.c
migration_channel_process_incoming(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
-migration_set_incoming_channel(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
+migration_set_incoming_channel(void *ioc, const char *ioctype, const char *type) "ioc=%p ioctype=%s type=%s"
migration_set_outgoing_channel(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
# global_state.c
--
2.55.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 6/7] migration: Fix incoming channel race with multifd and preempt_pre_7_2
2026-09-16 21:35 [PATCH 0/7] migration: Fix multifd+postcopy break on qemu-7.2 machine type Peter Xu
` (4 preceding siblings ...)
2026-09-16 21:35 ` [PATCH 5/7] migration: Dump type of channel in set_incoming_channel tracepoint Peter Xu
@ 2026-09-16 21:35 ` Peter Xu
2026-09-23 15:54 ` Fabiano Rosas
2026-09-24 21:54 ` Fabiano Rosas
2026-09-16 21:35 ` [PATCH 7/7] migration: Postpone the outgoing preempt channel for preempt_pre_7_2 Peter Xu
6 siblings, 2 replies; 18+ messages in thread
From: Peter Xu @ 2026-09-16 21:35 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Xu, Fabiano Rosas, Akash Kulhalli, Juraj Marcin
PROBLEM
=======
Migration reliably hangs with old machine types (7.2-) when these migration
capabilities are enabled: multifd, postcopy-ram, postcopy-preempt.
Simplest reproducer :
$ QTEST_QEMU_MACHINE_TYPE=pc-q35-7.2 \
QTEST_QEMU_BINARY=./qemu-system-x86_64 \
./tests/qtest/migration-test --full \
-r /x86_64/migration/multifd+postcopy/preempt/plain
Current workaround is to kill destination QEMU, cancel the migration on
source (with/without yank), disable one or more of the features, and retry.
The hang is caused by receiving preempt channel before most of the multifd
channels, the peek buffer operation will stuck forever.
Incoming side QEMU hang (with relevant tracepoints enabled):
migrate_set_state new state setup
migration_socket_incoming_accepted
migration_set_incoming_channel ioc=0x557d82c1caa0 ioctype=qio-channel-socket
migration_socket_incoming_accepted
migration_set_incoming_channel ioc=0x557d83023840 ioctype=qio-channel-socket
multifd_recv_new_channel channel 1
migration_socket_incoming_accepted
migration_set_incoming_channel ioc=0x557d830c08c0 ioctype=qio-channel-socket
multifd_recv_new_channel channel 0
multifd_recv_thread_start 1
migration_socket_incoming_accepted
migration_set_incoming_channel ioc=0x557d8284a010 ioctype=qio-channel-socket
multifd_recv_thread_start 0
multifd_recv_unfill channel 0 packet_num 0 flags 0x1 next packet size 0
multifd_recv_unfill channel 1 packet_num 1 flags 0x1 next packet size 0
[dest qemu hangs here]
Incoming side backtrace:
__syscall_cancel_arch
__internal_syscall_cancel
__syscall_cancel
recvmsg
qio_channel_socket_readv
qio_channel_readv_full
migration_channel_read_peek
migration_channel_identify
migration_channel_process_incoming
socket_accept_incoming_migration
qio_net_listener_channel_func
qio_channel_fd_source_dispatch
g_main_context_dispatch_unlocked.lto_priv
g_main_context_dispatch
glib_pollfds_poll
os_host_main_loop_wait
main_loop_wait
qemu_main_loop
qemu_default_main
main
This patch tries to fix it, from incoming side first. This patch alone
should enable single-direction migration to this new QEMU. The next patch
will propose a fix for the outgoing path, fixing new->old migrations.
BACKGROUND
==========
preempt_pre_7_2 used to be a flag marking QEMU releases 7.1/7.2 only
because they have a flaw on channel establishment on preempt channel.
Now, after we have multifd + postcopy support, new QEMU binaries can
migrate old machine types with both features enabled. Juraj reported
constant migration hang at the very beginning for those old machine types
in our downstream systems with such setup. Juraj found it's because of
this flag.
QEMU source initiates channels in this order on current master when both
features enabled with postcopy-preempt mode:
- First, main channel connect() happens,
- Second, postcopy_preempt_setup() invokes connect() for preempt channel,
- Last, in migration_thread(), multifd_send_setup() invokes connect()s
for all the multifd channels
However on an old QEMU, it expect the channels arrive in order of
"main"->"multifd"->"preempt". Even on a new QEMU, the destination expects
the same order of arrival on the channels when the channels are not
peekable.
For peekable channels (non-tls sockets), this time we'll likely see preempt
channel appearing very soon, peeking at it causing main thread hang, like
mentioned in the PROBLEM section above.
SOLUTION
========
One major problem of current hang is we try to peek at preempt channel,
which offers nothing at the beginning.
Since we'll need to accept stream from old binaries, arrival of preempt
channel early is unavoidable.
What we can do, though, is to allow concurrent monitoring of all channels
rather than one. Meanwhile, we shouldn't peek at anything that has no
data.
migration_channel_read_peek() almost does the wait, but it's too late.
This patch proposes to watch all channels from the start without reading at
them at all, relying on an IO watch attached. This will make sure (1) for
preempt channel, we never read on it (watch can be gracefully disarmed when
we know it's preempt channel later) (2) since we have one IO watch for each
channel, then we can allow accept() to happen in almost any order, process
only when there's some header to read.
To maintain these watches, a new GArray @channels_early is introduced, with
each element to be a (ioc, GSource) tuple (@MigEarlyIncomingChannel), so
that QEMU can manage all the IO watches later with it. Here I used GSource
rather than io_tag because the GSource may or may not be attached to the
default main thread gcontext: when OOB is used, it may be the iothread
context instead. IOW, g_source_remove() on io_tags stops working, which
only works for default main context.
The trick this patch used is when we have the ability to wait on all
channel headers at the same time, we pick one by one from main and multifd
channels (since both of the types will contain headers dumped right at the
very beginning), leave preempt channel alone. It means, after dest QEMU
finds all main and multifd channels, there are three possibilities:
- If preempt not enabled, we finished full channel establishment, done.
- If preempt enabled,
- If we have one registered IO watch with the IOC, it must be the
preempt channel,
- If we have no further IO watch, wait for the next accept(), which
must be the preempt channel.
This will make channel establish work on incoming side even with the old
QEMU binaries.
While working on it, I managed to refactor the peeking logic quite a bit:
we used to have a very convoluted migration_channel_identify() function,
taking care of two different cases:
(1) when the channel is peekable (like normal socket channels),
(2) when the channel is not peekable (like TLS or file migrations).
This patch refactored that part to make it crystal clear on how we make
decisions on which channel is which, and split the peek/identify paths.
One example incoming migration from pc-q35-7.2 after this patch applied,
and with relevant tracepoints set (8 multifd channels, 1 preempt channel):
migrate_set_state new state setup
migration_channel_process_incoming ioc=0x557dc8af4e20 ioctype=qio-channel-socket
migration_incoming_channel_watch ioc=0x557dc8af4e20 ioctype=qio-channel-socket
migration_channel_process_incoming ioc=0x557dc8abc5d0 ioctype=qio-channel-socket
migration_incoming_channel_watch ioc=0x557dc8abc5d0 ioctype=qio-channel-socket
migration_channel_process_incoming ioc=0x557dc953d680 ioctype=qio-channel-socket
migration_incoming_channel_watch ioc=0x557dc953d680 ioctype=qio-channel-socket
migration_set_incoming_channel ioc=0x557dc8abc5d0 ioctype=qio-channel-socket type=MULTIFD
migration_channel_process_incoming ioc=0x557dc898a820 ioctype=qio-channel-socket
migration_incoming_channel_watch ioc=0x557dc898a820 ioctype=qio-channel-socket
migration_set_incoming_channel ioc=0x557dc953d680 ioctype=qio-channel-socket type=MULTIFD
migration_channel_process_incoming ioc=0x557dc919bd70 ioctype=qio-channel-socket
migration_incoming_channel_watch ioc=0x557dc919bd70 ioctype=qio-channel-socket
migration_set_incoming_channel ioc=0x557dc898a820 ioctype=qio-channel-socket type=MULTIFD
migration_channel_process_incoming ioc=0x557dc8734b20 ioctype=qio-channel-socket
migration_incoming_channel_watch ioc=0x557dc8734b20 ioctype=qio-channel-socket
migration_set_incoming_channel ioc=0x557dc919bd70 ioctype=qio-channel-socket type=MULTIFD
migration_channel_process_incoming ioc=0x557dc898bdf0 ioctype=qio-channel-socket
migration_incoming_channel_watch ioc=0x557dc898bdf0 ioctype=qio-channel-socket
migration_set_incoming_channel ioc=0x557dc8734b20 ioctype=qio-channel-socket type=MULTIFD
migration_channel_process_incoming ioc=0x557dc968cfd0 ioctype=qio-channel-socket
migration_incoming_channel_watch ioc=0x557dc968cfd0 ioctype=qio-channel-socket
migration_set_incoming_channel ioc=0x557dc898bdf0 ioctype=qio-channel-socket type=MULTIFD
migration_channel_process_incoming ioc=0x557dc8c31810 ioctype=qio-channel-socket
migration_incoming_channel_watch ioc=0x557dc8c31810 ioctype=qio-channel-socket
migration_set_incoming_channel ioc=0x557dc968cfd0 ioctype=qio-channel-socket type=MULTIFD
migration_set_incoming_channel ioc=0x557dc8c31810 ioctype=qio-channel-socket type=MULTIFD
migration_set_incoming_channel ioc=0x557dc8af4e20 ioctype=qio-channel-socket type=MAIN
migration_start_incoming
migrate_set_state new state active
migration_channel_process_incoming ioc=0x557dc8966160 ioctype=qio-channel-socket
migration_set_incoming_channel ioc=0x557dc8966160 ioctype=qio-channel-socket type=PREEMPT
While at it, I renamed the four channel incoming/outgoing tracepoints, make
all to follow migration_[incoming|outgoing]_channel_*(). Especially for
incoming, then we can enable migration_incoming_channel* for incoming
channel debuggings.
FINAL NOTE ON TLS
=================
Note that this solution isn't a magic bullet fixing everything. TLS is not
fixable with this approach because TLS isn't peekable channel, hence the
watch won't help.
We can have other ways to hack it to make it work, e.g. we can make TLS
channels peekable too, but I don't want to pollute the TLS iochannel only
for this: let's hope handshake will arrive soon so we can drop these code.
For now, when TLS is involved with such old machine type (7.2-), one needs
to migrate it out with any combination of features except enabling all
four (multifd + TLS + postcopy + preempt) to a patched binary, after that,
all combinations will start working.
BugLink: https://redhat.atlassian.net/browse/RHEL-254933
Fixes: e27418861288 ("migration: enable multifd and postcopy together")
Reported-by: Juraj Marcin <jmarcin@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/channel.h | 3 +
migration/migration.h | 35 ++++
migration/channel.c | 414 +++++++++++++++++++++++++++++++++++------
migration/migration.c | 23 ++-
migration/trace-events | 7 +-
5 files changed, 421 insertions(+), 61 deletions(-)
diff --git a/migration/channel.h b/migration/channel.h
index 678712f291..40bd339a3e 100644
--- a/migration/channel.h
+++ b/migration/channel.h
@@ -49,4 +49,7 @@ bool migration_channel_parse_input(const char *uri,
MigrationChannel **main_channelp,
MigrationChannel **cpr_channelp,
Error **errp);
+
+void migration_incoming_free_early_channels(MigrationIncomingState *mis);
+
#endif
diff --git a/migration/migration.h b/migration/migration.h
index 683bc7bdd5..6f23e1805b 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -90,6 +90,28 @@ typedef enum {
PREEMPT_THREAD_QUIT,
} PreemptThreadStatus;
+typedef struct {
+ /*
+ * The GSource we have allocated to track G_IO_IN events for the
+ * channel. Note: it may not be attached to the default main gcontext,
+ * for example, when in case of io watch created during an OOB
+ * migrate-recover command.
+ */
+ GSource *source;
+ /* The channel we will identify later after getting some buffers to read */
+ QIOChannel *ioc;
+} MigEarlyIncomingChannel;
+
+typedef struct {
+ GArray *channels;
+ /*
+ * In most cases, channels are only operated with BQl, but since we
+ * have OOB command support, don't assume it, just use a standalone
+ * mutex to protect any access to the channels array.
+ */
+ QemuMutex mutex;
+} MigEarlyIncomingChannels;
+
/* State for the incoming migration */
struct MigrationIncomingState {
QEMUFile *from_src_file;
@@ -255,6 +277,19 @@ struct MigrationIncomingState {
/* Do exit on incoming migration failure */
bool exit_on_error;
+
+ /*
+ * Maintains all channels only at early stage. After incoming
+ * migration started, this should be an empty array and no use anymore.
+ *
+ * TODO: we logically only need this to make new QEMU binaries work for
+ * old machines who have @preempt_pre_7_2 set on the source, but it's
+ * also good to have this early stage anyway, making sure when peek the
+ * channel there will be something in the channel. Ideally, we should
+ * manage all migration channels in the future with proper headers,
+ * then we can drop this.
+ */
+ MigEarlyIncomingChannels channels_early;
};
MigrationIncomingState *migration_incoming_get_current(void);
diff --git a/migration/channel.c b/migration/channel.c
index b9065efd03..acb7ef5206 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -12,6 +12,8 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
+#include "qemu/main-loop.h"
+#include "qemu/error-report.h"
#include "channel.h"
#include "exec.h"
#include "fd.h"
@@ -146,61 +148,84 @@ bool migration_has_all_channels(void)
return true;
}
-static MigChannelType migration_channel_identify(MigrationIncomingState *mis,
- QIOChannel *ioc, Error **errp)
+static bool qio_channel_is_peekable(QIOChannel *ioc)
+{
+ return qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_READ_MSG_PEEK);
+}
+
+/*
+ * With multiple channels, it is possible that we receive channels out of
+ * order on destination side, causing incorrect mapping of source channels
+ * on destination side.
+ *
+ * When the channel is peekable (e.g. non-TLS socket channels), check
+ * channel MAGIC to decide type of channel.
+ *
+ * Please note this is best effort, postcopy preempt channel does not send
+ * any magic number so avoid it for postcopy live migration.
+ *
+ * Returns: >0 if success, ==0 (CH_NONE) if error. If error happened,
+ * *errp must be set.
+ */
+static MigChannelType migration_channel_peek(MigrationIncomingState *mis,
+ QIOChannel *ioc,
+ Error **errp)
{
MigChannelType channel = CH_NONE;
uint32_t channel_magic = 0;
int ret = 0;
- if (!migration_has_main_and_multifd_channels()) {
- if (qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_READ_MSG_PEEK)) {
- /*
- * With multiple channels, it is possible that we receive channels
- * out of order on destination side, causing incorrect mapping of
- * source channels on destination side. Check channel MAGIC to
- * decide type of channel. Please note this is best effort,
- * postcopy preempt channel does not send any magic number so
- * avoid it for postcopy live migration. Also tls live migration
- * already does tls handshake while initializing main channel so
- * with tls this issue is not possible.
- */
- ret = migration_channel_read_peek(ioc, (void *)&channel_magic,
- sizeof(channel_magic), errp);
- if (ret != 0) {
- goto out;
- }
+ assert(qio_channel_is_peekable(ioc));
- channel_magic = be32_to_cpu(channel_magic);
- if (channel_magic == QEMU_VM_FILE_MAGIC) {
- channel = CH_MAIN;
- } else if (channel_magic == MULTIFD_MAGIC) {
- assert(migrate_multifd());
- channel = CH_MULTIFD;
- } else if (!mis->from_src_file &&
- mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {
- /* reconnect main channel for postcopy recovery */
- channel = CH_MAIN;
- } else {
- error_setg(errp, "unknown channel magic: %u", channel_magic);
- }
- } else if (mis->from_src_file && migrate_multifd()) {
- /*
- * Non-peekable channels like tls/file are processed as
- * multifd channels when multifd is enabled.
- */
- channel = CH_MULTIFD;
- } else if (!mis->from_src_file) {
- channel = CH_MAIN;
- } else {
- error_setg(errp, "non-peekable channel used without multifd");
- }
+ ret = migration_channel_read_peek(ioc, (void *)&channel_magic,
+ sizeof(channel_magic), errp);
+ if (ret != 0) {
+ /* Failed */
+ return channel;
+ }
+
+ channel_magic = be32_to_cpu(channel_magic);
+
+ if (channel_magic == QEMU_VM_FILE_MAGIC) {
+ channel = CH_MAIN;
+ } else if (channel_magic == MULTIFD_MAGIC) {
+ assert(migrate_multifd());
+ channel = CH_MULTIFD;
+ } else if (!mis->from_src_file &&
+ mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {
+ /* reconnect main channel for postcopy recovery */
+ channel = CH_MAIN;
} else {
+ error_setg(errp, "Unknown channel magic: %u", channel_magic);
+ }
+
+ return channel;
+}
+
+/*
+ * Returns: >0 if success, ==0 (CH_NONE) if error. If error happened,
+ * *errp must be set.
+ */
+static MigChannelType migration_channel_identify(MigrationIncomingState *mis,
+ QIOChannel *ioc, Error **errp)
+{
+ MigChannelType channel = CH_NONE;
+
+ if (migration_has_main_and_multifd_channels()) {
assert(migrate_postcopy_preempt());
channel = CH_POSTCOPY;
+ } else if (!mis->from_src_file) {
+ channel = CH_MAIN;
+ } else if (migrate_multifd()) {
+ /*
+ * Non-peekable channels like tls/file are processed as
+ * multifd channels when multifd is enabled.
+ */
+ channel = CH_MULTIFD;
+ } else {
+ error_setg(errp, "Unexpected non-peekable channel observed");
}
-out:
return channel;
}
@@ -214,31 +239,275 @@ static void migration_incoming_error_propagate(MigrationIncomingState *mis,
}
}
+/* Must be with mis->channels_early.mutex held */
+static void
+migration_incoming_early_channel_insert(MigrationIncomingState *mis,
+ QIOChannel *ioc,
+ GSource *source)
+{
+ MigEarlyIncomingChannel chan = {
+ .source = source,
+ .ioc = ioc,
+ };
+
+ object_ref(OBJECT(ioc));
+ g_source_ref(source);
+
+ g_array_append_val(mis->channels_early.channels, chan);
+}
+
+static void migration_incoming_early_channel_free(GArray *channels, int i)
+{
+ MigEarlyIncomingChannel *chan;
+
+ chan = &g_array_index(channels, MigEarlyIncomingChannel, i);
+
+ g_source_destroy(chan->source);
+ g_source_unref(chan->source);
+ object_unref(OBJECT(chan->ioc));
+
+ g_array_remove_index_fast(channels, i);
+}
+
+/*
+ * Remove this channel from the monitoring of @channels_early array.
+ * Return true if found and successful, false otherwise.
+ */
+static bool
+migration_incoming_early_channel_remove(MigrationIncomingState *mis,
+ QIOChannel *ioc)
+{
+ GArray *channels = mis->channels_early.channels;
+ MigEarlyIncomingChannel *chan;
+ int i;
+
+ QEMU_LOCK_GUARD(&mis->channels_early.mutex);
+
+ for (i = 0; i < channels->len; i++) {
+ chan = &g_array_index(channels, MigEarlyIncomingChannel, i);
+ if (chan->ioc != ioc) {
+ continue;
+ }
+ migration_incoming_early_channel_free(channels, i);
+ return true;
+ }
+
+ return false;
+}
+
+void migration_incoming_free_early_channels(MigrationIncomingState *mis)
+{
+ GArray *channels = mis->channels_early.channels;
+
+ QEMU_LOCK_GUARD(&mis->channels_early.mutex);
+
+ while (channels->len) {
+ migration_incoming_early_channel_free(channels, 0);
+ }
+}
+
+static bool migration_incoming_setup_channel(QIOChannel *ioc,
+ MigChannelType ch,
+ Error **errp)
+{
+ trace_migration_incoming_channel_set(ioc,
+ object_get_typename(OBJECT(ioc)),
+ mig_channel_str[ch]);
+ migration_ioc_register_yank(ioc);
+ /* TODO: make this return the success status instead */
+ migration_incoming_setup(ioc, ch, errp);
+
+ return *errp == NULL;
+}
+
static bool migration_incoming_channel_install(MigrationIncomingState *mis,
QIOChannel *ioc,
Error **errp)
{
- MigChannelType ch = migration_channel_identify(mis, ioc, errp);
+ MigChannelType ch;
+ bool ret;
+
+ if (qio_channel_is_peekable(ioc)) {
+ ch = migration_channel_peek(mis, ioc, errp);
+ } else {
+ ch = migration_channel_identify(mis, ioc, errp);
+ }
if (!ch) {
- assert(*errp);
return false;
}
- trace_migration_set_incoming_channel(ioc,
- object_get_typename(OBJECT(ioc)),
- mig_channel_str[ch]);
- migration_ioc_register_yank(ioc);
+ ret = migration_incoming_setup_channel(ioc, ch, errp);
+ if (!ret) {
+ return false;
+ }
- if (migration_incoming_setup(ioc, ch, errp)) {
+ /* Installation succeeded, kickoff migration if needed */
+ if (migration_has_main_and_multifd_channels()) {
migration_start_incoming();
}
- if (*errp) {
- return false;
+ return true;
+}
+
+static void
+migration_incoming_channel_preempt_setup(QIOChannel *ioc)
+{
+ assert(migrate_postcopy_preempt());
+ /* Installation of preempt channel should never fail */
+ migration_incoming_setup_channel(ioc, CH_POSTCOPY, &error_abort);
+}
+
+static void
+migration_incoming_detect_preempt_channel(MigrationIncomingState *mis)
+{
+ GArray *channels = mis->channels_early.channels;
+ MigEarlyIncomingChannel *chan;
+
+ QEMU_LOCK_GUARD(&mis->channels_early.mutex);
+
+ /* When preempt mode not enabled, nothing to detect.. */
+ if (!migrate_postcopy_preempt()) {
+ /*
+ * .. but if we found something pending, throw an error only, which
+ * should not happen. Even if it happens, resources will still be
+ * released after incoming migration is completedly.
+ */
+ if (channels->len) {
+ error_report("%s: Found %u unused channels",
+ __func__, channels->len);
+ }
+ return;
}
- return true;
+ /* Preempt channel hasn't yet arrived? Process it later */
+ if (!channels->len) {
+ return;
+ }
+
+ /*
+ * More than one channel should never happen.. capture it in case if
+ * it happens, then there's not much we can do.
+ */
+ if (channels->len > 1) {
+ error_report("%s: Found %u unused channels, "
+ "can't identify preempt channel",
+ __func__, channels->len);
+ return;
+ }
+
+ assert(channels->len == 1);
+ /* This is the preempt channel, install it directly */
+ chan = &g_array_index(channels, MigEarlyIncomingChannel, 0);
+ migration_incoming_channel_preempt_setup(chan->ioc);
+ migration_incoming_early_channel_free(channels, 0);
+}
+
+static gboolean migration_incoming_channel_readable(QIOChannel *ioc,
+ GIOCondition condition,
+ gpointer opaque)
+{
+ MigrationIncomingState *mis = opaque;
+ Error *local_err = NULL;
+
+ /*
+ * No need to monitor this channel anymore as long as anything arrived,
+ * remove it from tracking.
+ *
+ * NOTE: this means if partial data arrived we may still block here,
+ * but it shouldn't happen in production, only malicious stream. Since
+ * migration stream is trusted (either due to trusted network, or TLS),
+ * that's non-issue.
+ *
+ * NOTE2: this will also release the ioc ref that we used to hold, but
+ * it's fine since we have at least one more refcount in the current
+ * event handler.
+ *
+ * NOTE3: it's theoretically possible that this entry is gone reaching
+ * here. Example: the main thread is doing incoming cleanup having this
+ * one removed, while this watch can be registered on the monitor
+ * iothread's context and fired at the exact same time but in the
+ * iothread instead. If it happens, skip the rest. I'm not sure if
+ * this could happen at all, may depend on iothread lifespan management
+ * in the main thread, but be prepared.
+ */
+ if (!migration_incoming_early_channel_remove(mis, ioc)) {
+ goto out;
+ }
+
+ if (!migration_incoming_channel_install(mis, ioc, &local_err)) {
+ goto out;
+ }
+
+ if (migration_has_main_and_multifd_channels()) {
+ /*
+ * Possibilities when reaching here:
+ *
+ * (1) if preempt not enabled, this should be no-op, all done,
+ * (2) if preempt enabled,
+ * (2.a) preempt channel arrived @channels_early, handle it now
+ * (2.b) preempt channel not arrived, to be handled in
+ * migration_channel_process_incoming() later
+ */
+ migration_incoming_detect_preempt_channel(mis);
+ }
+
+out:
+ if (local_err) {
+ migration_incoming_error_propagate(mis, local_err);
+ }
+
+ /*
+ * NOTE: we should have already detached the GSource, returning
+ * G_SOURCE_REMOVE to be logically consistent only.
+ */
+ return G_SOURCE_REMOVE;
+}
+
+static void migration_incoming_channel_watch(MigrationIncomingState *mis,
+ QIOChannel *ioc)
+{
+ GMainContext *context = g_main_context_get_thread_default();
+ GSource *source;
+ guint io_tag;
+
+ trace_migration_incoming_channel_watch(ioc,
+ object_get_typename(OBJECT(ioc)));
+
+ /*
+ * Careful: this can be run from either the main thread or the monitor
+ * iothread when migrate_recover is used with OOB=on, so we need to
+ * take the lock and use the full version to specify the correct
+ * context.
+ */
+ QEMU_LOCK_GUARD(&mis->channels_early.mutex);
+
+ /*
+ * We should never watch an @ioc that is not peekable, because there's
+ * no point. What is worse is we lose the real order of accept()s via
+ * the asynchronous IO watch operation.
+ *
+ * Another note is TLS channel (non-peekable) may or may not work
+ * properly with IO watch due to its current .io_create_watch() impl,
+ * which is another story. Just guard both points.
+ */
+ assert(qio_channel_is_peekable(ioc));
+ io_tag = qio_channel_add_watch_full(ioc, G_IO_IN,
+ migration_incoming_channel_readable,
+ mis, NULL, context);
+
+ /*
+ * Replace this if one day qio_channel_add_watch*() API can directly
+ * return the GSource*.. for now, stick with it.
+ */
+ source = g_main_context_find_source_by_id(context, io_tag);
+ /*
+ * Nothing can race with adding the IO watch, aka, concurrent removal
+ * is not possible when we have the lock. So it must be present.
+ */
+ assert(source);
+
+ migration_incoming_early_channel_insert(mis, ioc, source);
}
/**
@@ -254,13 +523,44 @@ void migration_channel_process_incoming(QIOChannel *ioc)
MigrationIncomingState *mis = migration_incoming_get_current();
Error *local_err = NULL;
- trace_migration_channel_process_incoming(
+ trace_migration_incoming_channel_process(
ioc, object_get_typename(OBJECT(ioc)));
if (migrate_channel_requires_tls_upgrade(ioc)) {
migration_tls_channel_process_incoming(ioc, &local_err);
} else {
- migration_incoming_channel_install(mis, ioc, &local_err);
+ if (migration_has_main_and_multifd_channels()) {
+ /*
+ * If all main+multifd channels are present already, this must
+ * be the preempt channel.
+ *
+ * QEMU can't register an IO watch for it if there is only the
+ * last preempt channel left, because it means the IO watch
+ * will never fire and nobody will pick it up: we rely on the
+ * one before the last one to pick both.
+ *
+ * See comment in migration_incoming_channel_readable() on
+ * the migration_incoming_detect_preempt_channel() call.
+ */
+ migration_incoming_channel_preempt_setup(ioc);
+ } else {
+ /*
+ * Register an IO watch for peekable channels, so that channels
+ * can be accept()ed with any order.
+ *
+ * Non-peekable channels (file, TLS, etc.) cannot register IO
+ * watch, not only because there's no data to look at to help
+ * making the decision, but also because after registering we
+ * will lose the real ordering we get from accept(), which is
+ * still so far the only source of truth to identify a channel
+ * in such case.
+ */
+ if (qio_channel_is_peekable(ioc)) {
+ migration_incoming_channel_watch(mis, ioc);
+ } else {
+ migration_incoming_channel_install(mis, ioc, &local_err);
+ }
+ }
}
if (local_err) {
@@ -270,7 +570,7 @@ void migration_channel_process_incoming(QIOChannel *ioc)
void migration_channel_connect_outgoing(MigrationState *s, QIOChannel *ioc)
{
- trace_migration_set_outgoing_channel(ioc, object_get_typename(OBJECT(ioc)));
+ trace_migration_outgoing_channel_set(ioc, object_get_typename(OBJECT(ioc)));
if (migrate_channel_requires_tls_upgrade(ioc)) {
Error *local_err = NULL;
diff --git a/migration/migration.c b/migration/migration.c
index cfadcc79c2..4cc4077a76 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -334,6 +334,10 @@ void migration_object_init(void)
current_incoming->page_requested = g_tree_new(page_request_addr_cmp);
current_incoming->exit_on_error = INMIGRATE_DEFAULT_EXIT_ON_ERROR;
+ /* zero_terminated=false, clear_=true */
+ current_incoming->channels_early.channels =
+ g_array_new(FALSE, TRUE, sizeof(MigEarlyIncomingChannel));
+ qemu_mutex_init(¤t_incoming->channels_early.mutex);
migration_object_check(current_migration, &error_fatal);
@@ -447,6 +451,24 @@ void migration_incoming_state_destroy(void)
MigrationIncomingState *mis = migration_incoming_get_current();
PostcopyState ps = postcopy_state_get();
+ /* Cleanup listener to make sure no further accept() for sockets */
+ migration_incoming_transport_cleanup(mis);
+
+ /*
+ * It's safer to free channel watches earlier than most of the rest, in
+ * case the IO watches could fire in the monitor iothread concurrently
+ * against this function.
+ *
+ * Above migration_incoming_transport_cleanup() should have disarmed
+ * anything that we could accept() new sockets.
+ *
+ * Here return of migration_incoming_free_early_channels() makes sure
+ * even if something already fired concurrently, it won't really do
+ * anything but return - see migration_incoming_early_channel_remove()
+ * and its return code for details.
+ */
+ migration_incoming_free_early_channels(mis);
+
multifd_recv_cleanup();
if (ps != POSTCOPY_INCOMING_NONE) {
@@ -491,7 +513,6 @@ void migration_incoming_state_destroy(void)
mis->postcopy_remote_fds = NULL;
}
- migration_incoming_transport_cleanup(mis);
qemu_event_reset(&mis->main_thread_load_event);
if (mis->page_requested) {
diff --git a/migration/trace-events b/migration/trace-events
index 9ef42f54d1..c408deeb72 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -207,9 +207,10 @@ migration_start_incoming(void) ""
migration_transferred_bytes(uint64_t qemu_file, uint64_t multifd, uint64_t rdma) "qemu_file %" PRIu64 " multifd %" PRIu64 " RDMA %" PRIu64
# channel.c
-migration_channel_process_incoming(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
-migration_set_incoming_channel(void *ioc, const char *ioctype, const char *type) "ioc=%p ioctype=%s type=%s"
-migration_set_outgoing_channel(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
+migration_outgoing_channel_set(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
+migration_incoming_channel_process(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
+migration_incoming_channel_set(void *ioc, const char *ioctype, const char *type) "ioc=%p ioctype=%s type=%s"
+migration_incoming_channel_watch(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
# global_state.c
migrate_state_too_big(void) ""
--
2.55.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 7/7] migration: Postpone the outgoing preempt channel for preempt_pre_7_2
2026-09-16 21:35 [PATCH 0/7] migration: Fix multifd+postcopy break on qemu-7.2 machine type Peter Xu
` (5 preceding siblings ...)
2026-09-16 21:35 ` [PATCH 6/7] migration: Fix incoming channel race with multifd and preempt_pre_7_2 Peter Xu
@ 2026-09-16 21:35 ` Peter Xu
2026-09-22 23:34 ` Fabiano Rosas
6 siblings, 1 reply; 18+ messages in thread
From: Peter Xu @ 2026-09-16 21:35 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Xu, Fabiano Rosas, Akash Kulhalli, Juraj Marcin
This is the corresponding outgoing fix for the same problem mentioned in
the previous patch.
The idea is simple: either migration to an old QEMU or when TLS is enabled,
we rely on correct ordering of channels to make it work: first main, then
multifd, finally preempt.
This patch re-orders multifd and postcopy preempt channel on outgoing side,
but only for the old machine types where preempt_pre_7_2 set, to make it
follow the right orders to create the channels.
Keep the resume path alone because the resume path never involve multifd
channels, even if multifd is enabled. For that, fun fact: when multifd is
enabled with postcopy preempt, network interruption will break all multifd
channels, but they're never re-connected, until they got recycled at the
end of postcopy migration. OTOH, multifd_recv_all_channels_created()
reports true even after postcopy network down, as multifd_recv_state->count
is never decremented.
Fixes: e27418861288 ("migration: enable multifd and postcopy together")
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/migration.c | 32 +++++++++++++++++++++++---------
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 4cc4077a76..f8d664808f 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -3733,6 +3733,20 @@ static void *migration_thread(void *opaque)
goto out;
}
+ /*
+ * Only for old 7.1/7.2 machine types running on new binaries (that
+ * supports multifd+postcopy+preempt). Makes sure to initiate the
+ * connect() after multifd channels because the old (broken) binaries
+ * assumes the order of channels, which we cannot fix anymore.
+ *
+ * multifd_send_setup() will make sure all multifd channels will be
+ * connected first, then initiate preempt channel here guarantees the
+ * ordering to those old binaries.
+ */
+ if (migrate_postcopy_preempt() && s->preempt_pre_7_2) {
+ postcopy_preempt_setup(s);
+ }
+
bql_lock();
qemu_savevm_state_header(s->to_dst_file);
bql_unlock();
@@ -4013,16 +4027,16 @@ void migration_start_outgoing(MigrationState *s)
open_return_path_on_source(s);
}
- /*
- * This needs to be done before resuming a postcopy. Note: for newer
- * QEMUs we will delay the channel creation until postcopy_start(), to
- * avoid disorder of channel creations.
- */
- if (migrate_postcopy_preempt() && s->preempt_pre_7_2) {
- postcopy_preempt_setup(s);
- }
-
if (resume) {
+ /*
+ * This needs to be done before resuming a postcopy. Note: for newer
+ * QEMUs we will delay the channel creation until postcopy_start(), to
+ * avoid disorder of channel creations.
+ */
+ if (migrate_postcopy_preempt() && s->preempt_pre_7_2) {
+ postcopy_preempt_setup(s);
+ }
+
/* Wakeup the main migration thread to do the recovery */
migrate_set_state(&s->state, MIGRATION_STATUS_POSTCOPY_RECOVER_SETUP,
MIGRATION_STATUS_POSTCOPY_RECOVER);
--
2.55.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 7/7] migration: Postpone the outgoing preempt channel for preempt_pre_7_2
2026-09-16 21:35 ` [PATCH 7/7] migration: Postpone the outgoing preempt channel for preempt_pre_7_2 Peter Xu
@ 2026-09-22 23:34 ` Fabiano Rosas
2026-09-23 20:24 ` Peter Xu
0 siblings, 1 reply; 18+ messages in thread
From: Fabiano Rosas @ 2026-09-22 23:34 UTC (permalink / raw)
To: Peter Xu, qemu-devel; +Cc: Peter Xu, Akash Kulhalli, Juraj Marcin
Peter Xu <peterx@redhat.com> writes:
> This is the corresponding outgoing fix for the same problem mentioned in
> the previous patch.
>
> The idea is simple: either migration to an old QEMU or when TLS is enabled,
> we rely on correct ordering of channels to make it work: first main, then
> multifd, finally preempt.
>
> This patch re-orders multifd and postcopy preempt channel on outgoing side,
> but only for the old machine types where preempt_pre_7_2 set, to make it
> follow the right orders to create the channels.
>
> Keep the resume path alone because the resume path never involve multifd
> channels, even if multifd is enabled. For that, fun fact: when multifd is
> enabled with postcopy preempt, network interruption will break all multifd
> channels, but they're never re-connected, until they got recycled at the
> end of postcopy migration.
Is this a separate bug? Do we need to add some cleanup?
> OTOH, multifd_recv_all_channels_created()
> reports true even after postcopy network down, as multifd_recv_state->count
> is never decremented.
>
Seems normal to me. We're not even trying to reconnect multifd.
> Fixes: e27418861288 ("migration: enable multifd and postcopy together")
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
> migration/migration.c | 32 +++++++++++++++++++++++---------
> 1 file changed, 23 insertions(+), 9 deletions(-)
>
> diff --git a/migration/migration.c b/migration/migration.c
> index 4cc4077a76..f8d664808f 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -3733,6 +3733,20 @@ static void *migration_thread(void *opaque)
> goto out;
> }
>
> + /*
> + * Only for old 7.1/7.2 machine types running on new binaries (that
> + * supports multifd+postcopy+preempt). Makes sure to initiate the
> + * connect() after multifd channels because the old (broken) binaries
> + * assumes the order of channels, which we cannot fix anymore.
> + *
> + * multifd_send_setup() will make sure all multifd channels will be
> + * connected first, then initiate preempt channel here guarantees the
> + * ordering to those old binaries.
> + */
It's a bit confusing what's old binary, what's new binary here. Old/new
don't really apply I think as there are more than two cases when we look
at the global picture. There's before 7.1, before 7.2, before the
preempt_pre_7_2 flag, before the multifd+postcopy support, before this
series, etc. Specially since this code is exactly the same as the one
under if (resume), but there we're talking about a different new/old.
Also, maybe we should avoid framing the assumption on the order of
channels as "broken", that's how it always worked and is just a case of
unimaginative assumptions, i.e. not knowing multifd would ever run along
preempt. The real bug is that v10.1 added a "new" channel to the mix
without working on compatibility.
In this series you're doing both: fixing the bug that v10.1 introduced
and improving the code to not assume the order of channels.
> + if (migrate_postcopy_preempt() && s->preempt_pre_7_2) {
> + postcopy_preempt_setup(s);
> + }
Don't you want to check for multifd as well and apply this fix only to
the case that can actually trigger it? To avoid inadvertently changing
the normal postcopy case.
> +
> bql_lock();
> qemu_savevm_state_header(s->to_dst_file);
> bql_unlock();
> @@ -4013,16 +4027,16 @@ void migration_start_outgoing(MigrationState *s)
> open_return_path_on_source(s);
> }
>
> - /*
> - * This needs to be done before resuming a postcopy. Note: for newer
> - * QEMUs we will delay the channel creation until postcopy_start(), to
> - * avoid disorder of channel creations.
> - */
> - if (migrate_postcopy_preempt() && s->preempt_pre_7_2) {
> - postcopy_preempt_setup(s);
> - }
> -
Hm, this used to happen before qmp_migrate() returns. Now it's in the
migration thread and after multifd channels connect, there's a big
window there. We added a lot of code to ensure cleanup of multifd
happens properly and without races with TLS thread creation, etc. Have
you considered such issues?
> if (resume) {
> + /*
> + * This needs to be done before resuming a postcopy. Note: for newer
> + * QEMUs we will delay the channel creation until postcopy_start(), to
> + * avoid disorder of channel creations.
> + */
> + if (migrate_postcopy_preempt() && s->preempt_pre_7_2) {
> + postcopy_preempt_setup(s);
> + }
> +
> /* Wakeup the main migration thread to do the recovery */
> migrate_set_state(&s->state, MIGRATION_STATUS_POSTCOPY_RECOVER_SETUP,
> MIGRATION_STATUS_POSTCOPY_RECOVER);
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 6/7] migration: Fix incoming channel race with multifd and preempt_pre_7_2
2026-09-16 21:35 ` [PATCH 6/7] migration: Fix incoming channel race with multifd and preempt_pre_7_2 Peter Xu
@ 2026-09-23 15:54 ` Fabiano Rosas
2026-09-23 21:04 ` Peter Xu
2026-09-24 21:54 ` Fabiano Rosas
1 sibling, 1 reply; 18+ messages in thread
From: Fabiano Rosas @ 2026-09-23 15:54 UTC (permalink / raw)
To: Peter Xu, qemu-devel; +Cc: Peter Xu, Akash Kulhalli, Juraj Marcin
Peter Xu <peterx@redhat.com> writes:
> PROBLEM
> =======
>
> Migration reliably hangs with old machine types (7.2-) when these migration
> capabilities are enabled: multifd, postcopy-ram, postcopy-preempt.
Is there a way to make this patch unrelated to the 7.2 issue? I think
this muddles the discussion a bit. This is a real improvement despite
any bug.
>
> Simplest reproducer :
>
> $ QTEST_QEMU_MACHINE_TYPE=pc-q35-7.2 \
> QTEST_QEMU_BINARY=./qemu-system-x86_64 \
> ./tests/qtest/migration-test --full \
> -r /x86_64/migration/multifd+postcopy/preempt/plain
>
> Current workaround is to kill destination QEMU, cancel the migration on
> source (with/without yank), disable one or more of the features, and retry.
>
> The hang is caused by receiving preempt channel before most of the multifd
> channels, the peek buffer operation will stuck forever.
>
> Incoming side QEMU hang (with relevant tracepoints enabled):
>
> migrate_set_state new state setup
> migration_socket_incoming_accepted
> migration_set_incoming_channel ioc=0x557d82c1caa0 ioctype=qio-channel-socket
> migration_socket_incoming_accepted
> migration_set_incoming_channel ioc=0x557d83023840 ioctype=qio-channel-socket
> multifd_recv_new_channel channel 1
> migration_socket_incoming_accepted
> migration_set_incoming_channel ioc=0x557d830c08c0 ioctype=qio-channel-socket
> multifd_recv_new_channel channel 0
> multifd_recv_thread_start 1
> migration_socket_incoming_accepted
> migration_set_incoming_channel ioc=0x557d8284a010 ioctype=qio-channel-socket
> multifd_recv_thread_start 0
> multifd_recv_unfill channel 0 packet_num 0 flags 0x1 next packet size 0
> multifd_recv_unfill channel 1 packet_num 1 flags 0x1 next packet size 0
> [dest qemu hangs here]
>
> Incoming side backtrace:
>
> __syscall_cancel_arch
> __internal_syscall_cancel
> __syscall_cancel
> recvmsg
> qio_channel_socket_readv
> qio_channel_readv_full
> migration_channel_read_peek
> migration_channel_identify
> migration_channel_process_incoming
> socket_accept_incoming_migration
> qio_net_listener_channel_func
> qio_channel_fd_source_dispatch
> g_main_context_dispatch_unlocked.lto_priv
> g_main_context_dispatch
> glib_pollfds_poll
> os_host_main_loop_wait
> main_loop_wait
> qemu_main_loop
> qemu_default_main
> main
>
> This patch tries to fix it, from incoming side first. This patch alone
> should enable single-direction migration to this new QEMU. The next patch
> will propose a fix for the outgoing path, fixing new->old migrations.
>
> BACKGROUND
> ==========
>
> preempt_pre_7_2 used to be a flag marking QEMU releases 7.1/7.2 only
> because they have a flaw on channel establishment on preempt channel.
>
> Now, after we have multifd + postcopy support, new QEMU binaries can
> migrate old machine types with both features enabled. Juraj reported
> constant migration hang at the very beginning for those old machine types
> in our downstream systems with such setup. Juraj found it's because of
> this flag.
>
> QEMU source initiates channels in this order on current master when both
> features enabled with postcopy-preempt mode:
>
> - First, main channel connect() happens,
> - Second, postcopy_preempt_setup() invokes connect() for preempt channel,
> - Last, in migration_thread(), multifd_send_setup() invokes connect()s
> for all the multifd channels
Other way around, no?
(master/11.1/src) only starts preempt when postcopy starts.
(master/11.1/dst) peeks main, peeks multifd, preempt comes when main and
multifd have already been found, so it is assumed to be preempt.
>
> However on an old QEMU, it expect the channels arrive in order of
> "main"->"multifd"->"preempt". Even on a new QEMU, the destination expects
> the same order of arrival on the channels when the channels are not
> peekable.
>
(master/7.2/src) starts main, then preempt, then multifd.
(master/7.2 or 11.1/dst) peeks main, peeks multifd then hangs because preempt is
peekable but doesn't send data right away.
> For peekable channels (non-tls sockets), this time we'll likely see preempt
> channel appearing very soon, peeking at it causing main thread hang, like
> mentioned in the PROBLEM section above.
>
Yes.
> SOLUTION
> ========
>
> One major problem of current hang is we try to peek at preempt channel,
> which offers nothing at the beginning.
>
> Since we'll need to accept stream from old binaries, arrival of preempt
> channel early is unavoidable.
>
No, because old binary doesn't support multifd+postcopy, so there's only
either main + multifd or main + preempt.
New binary with old machine type is the only one that can send preempt
early.
> What we can do, though, is to allow concurrent monitoring of all channels
> rather than one. Meanwhile, we shouldn't peek at anything that has no
> data.
>
I wonder why do we need to peek at all. Can't we start n threads and
recv() a data chunk of fixed size (smaller than the preempt request) on
every channel that comes up? Each thread puts the (data chunk + ioc) on
a list and exits. The channels that don't send data would just sit there
until something comes up.
Most channels would have data with a magic value right away so we'd
empty the list before the preempt request comes up. But having a list
means we can just iterate it when a consumer that has not yet received a
channel asks for a piece of data.
We could also check that the data in the supposed preempt channel is a
page request.
> migration_channel_read_peek() almost does the wait, but it's too late.
> This patch proposes to watch all channels from the start without reading at
> them at all, relying on an IO watch attached. This will make sure (1) for
> preempt channel, we never read on it (watch can be gracefully disarmed when
> we know it's preempt channel later) (2) since we have one IO watch for each
> channel, then we can allow accept() to happen in almost any order, process
> only when there's some header to read.
>
> To maintain these watches, a new GArray @channels_early is introduced, with
> each element to be a (ioc, GSource) tuple (@MigEarlyIncomingChannel), so
> that QEMU can manage all the IO watches later with it. Here I used GSource
> rather than io_tag because the GSource may or may not be attached to the
> default main thread gcontext: when OOB is used, it may be the iothread
> context instead. IOW, g_source_remove() on io_tags stops working, which
> only works for default main context.
>
> The trick this patch used is when we have the ability to wait on all
> channel headers at the same time, we pick one by one from main and multifd
> channels (since both of the types will contain headers dumped right at the
> very beginning), leave preempt channel alone. It means, after dest QEMU
> finds all main and multifd channels, there are three possibilities:
>
> - If preempt not enabled, we finished full channel establishment, done.
>
I don't see why we need "channel establishment" at all. We're simply
taking iochannels and putting them into named QEMUFiles, this means
nothing. We could keep a list of unknown channels around indefinitely
and fetch them lazily when the data is needed. By that point, the
channels that have magic values would have already been identified and
what's left is the unindentified channel.
This would allow us add new channels with a proper header without
interfering with the old channels. As long as the new channels are not
to be consumed too soon.
> - If preempt enabled,
>
> - If we have one registered IO watch with the IOC, it must be the
> preempt channel,
>
> - If we have no further IO watch, wait for the next accept(), which
> must be the preempt channel.
>
Ok, so watch all connections concurrently and pick the last one as
preempt.
> This will make channel establish work on incoming side even with the old
> QEMU binaries.
>
> While working on it, I managed to refactor the peeking logic quite a bit:
> we used to have a very convoluted migration_channel_identify() function,
> taking care of two different cases:
>
> (1) when the channel is peekable (like normal socket channels),
> (2) when the channel is not peekable (like TLS or file migrations).
>
> This patch refactored that part to make it crystal clear on how we make
> decisions on which channel is which, and split the peek/identify paths.
>
I'm still bothered about the peek. The data is all intended for the
destination machine, it owns it all, it can just consume it and put it
in the pocket.
> One example incoming migration from pc-q35-7.2 after this patch applied,
> and with relevant tracepoints set (8 multifd channels, 1 preempt channel):
>
> migrate_set_state new state setup
> migration_channel_process_incoming ioc=0x557dc8af4e20 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc8af4e20 ioctype=qio-channel-socket
> migration_channel_process_incoming ioc=0x557dc8abc5d0 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc8abc5d0 ioctype=qio-channel-socket
> migration_channel_process_incoming ioc=0x557dc953d680 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc953d680 ioctype=qio-channel-socket
> migration_set_incoming_channel ioc=0x557dc8abc5d0 ioctype=qio-channel-socket type=MULTIFD
> migration_channel_process_incoming ioc=0x557dc898a820 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc898a820 ioctype=qio-channel-socket
> migration_set_incoming_channel ioc=0x557dc953d680 ioctype=qio-channel-socket type=MULTIFD
> migration_channel_process_incoming ioc=0x557dc919bd70 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc919bd70 ioctype=qio-channel-socket
> migration_set_incoming_channel ioc=0x557dc898a820 ioctype=qio-channel-socket type=MULTIFD
> migration_channel_process_incoming ioc=0x557dc8734b20 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc8734b20 ioctype=qio-channel-socket
> migration_set_incoming_channel ioc=0x557dc919bd70 ioctype=qio-channel-socket type=MULTIFD
> migration_channel_process_incoming ioc=0x557dc898bdf0 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc898bdf0 ioctype=qio-channel-socket
> migration_set_incoming_channel ioc=0x557dc8734b20 ioctype=qio-channel-socket type=MULTIFD
> migration_channel_process_incoming ioc=0x557dc968cfd0 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc968cfd0 ioctype=qio-channel-socket
> migration_set_incoming_channel ioc=0x557dc898bdf0 ioctype=qio-channel-socket type=MULTIFD
> migration_channel_process_incoming ioc=0x557dc8c31810 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc8c31810 ioctype=qio-channel-socket
> migration_set_incoming_channel ioc=0x557dc968cfd0 ioctype=qio-channel-socket type=MULTIFD
> migration_set_incoming_channel ioc=0x557dc8c31810 ioctype=qio-channel-socket type=MULTIFD
> migration_set_incoming_channel ioc=0x557dc8af4e20 ioctype=qio-channel-socket type=MAIN
Hm, multifd came first? Have you registered watches in reverse order or
something? Not sure if it matters much.
> migration_start_incoming
> migrate_set_state new state active
> migration_channel_process_incoming ioc=0x557dc8966160 ioctype=qio-channel-socket
> migration_set_incoming_channel ioc=0x557dc8966160 ioctype=qio-channel-socket type=PREEMPT
>
> While at it, I renamed the four channel incoming/outgoing tracepoints, make
> all to follow migration_[incoming|outgoing]_channel_*(). Especially for
> incoming, then we can enable migration_incoming_channel* for incoming
> channel debuggings.
>
> FINAL NOTE ON TLS
> =================
>
> Note that this solution isn't a magic bullet fixing everything. TLS is not
> fixable with this approach because TLS isn't peekable channel, hence the
> watch won't help.
>
> We can have other ways to hack it to make it work, e.g. we can make TLS
> channels peekable too, but I don't want to pollute the TLS iochannel only
> for this: let's hope handshake will arrive soon so we can drop these code.
>
> For now, when TLS is involved with such old machine type (7.2-), one needs
> to migrate it out with any combination of features except enabling all
> four (multifd + TLS + postcopy + preempt) to a patched binary, after that,
> all combinations will start working.
>
I don't understand where TLS comes into this. You mean TLS is not
peekable so if we use TLS for the multifd channels, then we cannot
tell them apart from preempt?
> BugLink: https://redhat.atlassian.net/browse/RHEL-254933
> Fixes: e27418861288 ("migration: enable multifd and postcopy together")
> Reported-by: Juraj Marcin <jmarcin@redhat.com>
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
> migration/channel.h | 3 +
> migration/migration.h | 35 ++++
> migration/channel.c | 414 +++++++++++++++++++++++++++++++++++------
> migration/migration.c | 23 ++-
> migration/trace-events | 7 +-
> 5 files changed, 421 insertions(+), 61 deletions(-)
>
I'll wait for your replies before reviewing the code in detail.
> diff --git a/migration/channel.h b/migration/channel.h
> index 678712f291..40bd339a3e 100644
> --- a/migration/channel.h
> +++ b/migration/channel.h
> @@ -49,4 +49,7 @@ bool migration_channel_parse_input(const char *uri,
> MigrationChannel **main_channelp,
> MigrationChannel **cpr_channelp,
> Error **errp);
> +
> +void migration_incoming_free_early_channels(MigrationIncomingState *mis);
> +
> #endif
> diff --git a/migration/migration.h b/migration/migration.h
> index 683bc7bdd5..6f23e1805b 100644
> --- a/migration/migration.h
> +++ b/migration/migration.h
> @@ -90,6 +90,28 @@ typedef enum {
> PREEMPT_THREAD_QUIT,
> } PreemptThreadStatus;
>
> +typedef struct {
> + /*
> + * The GSource we have allocated to track G_IO_IN events for the
> + * channel. Note: it may not be attached to the default main gcontext,
> + * for example, when in case of io watch created during an OOB
> + * migrate-recover command.
> + */
> + GSource *source;
> + /* The channel we will identify later after getting some buffers to read */
> + QIOChannel *ioc;
> +} MigEarlyIncomingChannel;
> +
> +typedef struct {
> + GArray *channels;
> + /*
> + * In most cases, channels are only operated with BQl, but since we
> + * have OOB command support, don't assume it, just use a standalone
> + * mutex to protect any access to the channels array.
> + */
> + QemuMutex mutex;
> +} MigEarlyIncomingChannels;
> +
> /* State for the incoming migration */
> struct MigrationIncomingState {
> QEMUFile *from_src_file;
> @@ -255,6 +277,19 @@ struct MigrationIncomingState {
>
> /* Do exit on incoming migration failure */
> bool exit_on_error;
> +
> + /*
> + * Maintains all channels only at early stage. After incoming
> + * migration started, this should be an empty array and no use anymore.
> + *
> + * TODO: we logically only need this to make new QEMU binaries work for
> + * old machines who have @preempt_pre_7_2 set on the source, but it's
> + * also good to have this early stage anyway, making sure when peek the
> + * channel there will be something in the channel. Ideally, we should
> + * manage all migration channels in the future with proper headers,
> + * then we can drop this.
> + */
> + MigEarlyIncomingChannels channels_early;
> };
>
> MigrationIncomingState *migration_incoming_get_current(void);
> diff --git a/migration/channel.c b/migration/channel.c
> index b9065efd03..acb7ef5206 100644
> --- a/migration/channel.c
> +++ b/migration/channel.c
> @@ -12,6 +12,8 @@
>
> #include "qemu/osdep.h"
> #include "qemu/cutils.h"
> +#include "qemu/main-loop.h"
> +#include "qemu/error-report.h"
> #include "channel.h"
> #include "exec.h"
> #include "fd.h"
> @@ -146,61 +148,84 @@ bool migration_has_all_channels(void)
> return true;
> }
>
> -static MigChannelType migration_channel_identify(MigrationIncomingState *mis,
> - QIOChannel *ioc, Error **errp)
> +static bool qio_channel_is_peekable(QIOChannel *ioc)
> +{
> + return qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_READ_MSG_PEEK);
> +}
> +
> +/*
> + * With multiple channels, it is possible that we receive channels out of
> + * order on destination side, causing incorrect mapping of source channels
> + * on destination side.
> + *
> + * When the channel is peekable (e.g. non-TLS socket channels), check
> + * channel MAGIC to decide type of channel.
> + *
> + * Please note this is best effort, postcopy preempt channel does not send
> + * any magic number so avoid it for postcopy live migration.
> + *
> + * Returns: >0 if success, ==0 (CH_NONE) if error. If error happened,
> + * *errp must be set.
> + */
> +static MigChannelType migration_channel_peek(MigrationIncomingState *mis,
> + QIOChannel *ioc,
> + Error **errp)
> {
> MigChannelType channel = CH_NONE;
> uint32_t channel_magic = 0;
> int ret = 0;
>
> - if (!migration_has_main_and_multifd_channels()) {
> - if (qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_READ_MSG_PEEK)) {
> - /*
> - * With multiple channels, it is possible that we receive channels
> - * out of order on destination side, causing incorrect mapping of
> - * source channels on destination side. Check channel MAGIC to
> - * decide type of channel. Please note this is best effort,
> - * postcopy preempt channel does not send any magic number so
> - * avoid it for postcopy live migration. Also tls live migration
> - * already does tls handshake while initializing main channel so
> - * with tls this issue is not possible.
> - */
> - ret = migration_channel_read_peek(ioc, (void *)&channel_magic,
> - sizeof(channel_magic), errp);
> - if (ret != 0) {
> - goto out;
> - }
> + assert(qio_channel_is_peekable(ioc));
>
> - channel_magic = be32_to_cpu(channel_magic);
> - if (channel_magic == QEMU_VM_FILE_MAGIC) {
> - channel = CH_MAIN;
> - } else if (channel_magic == MULTIFD_MAGIC) {
> - assert(migrate_multifd());
> - channel = CH_MULTIFD;
> - } else if (!mis->from_src_file &&
> - mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {
> - /* reconnect main channel for postcopy recovery */
> - channel = CH_MAIN;
> - } else {
> - error_setg(errp, "unknown channel magic: %u", channel_magic);
> - }
> - } else if (mis->from_src_file && migrate_multifd()) {
> - /*
> - * Non-peekable channels like tls/file are processed as
> - * multifd channels when multifd is enabled.
> - */
> - channel = CH_MULTIFD;
> - } else if (!mis->from_src_file) {
> - channel = CH_MAIN;
> - } else {
> - error_setg(errp, "non-peekable channel used without multifd");
> - }
> + ret = migration_channel_read_peek(ioc, (void *)&channel_magic,
> + sizeof(channel_magic), errp);
> + if (ret != 0) {
> + /* Failed */
> + return channel;
> + }
> +
> + channel_magic = be32_to_cpu(channel_magic);
> +
> + if (channel_magic == QEMU_VM_FILE_MAGIC) {
> + channel = CH_MAIN;
> + } else if (channel_magic == MULTIFD_MAGIC) {
> + assert(migrate_multifd());
> + channel = CH_MULTIFD;
> + } else if (!mis->from_src_file &&
> + mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {
> + /* reconnect main channel for postcopy recovery */
> + channel = CH_MAIN;
> } else {
> + error_setg(errp, "Unknown channel magic: %u", channel_magic);
> + }
> +
> + return channel;
> +}
> +
> +/*
> + * Returns: >0 if success, ==0 (CH_NONE) if error. If error happened,
> + * *errp must be set.
> + */
> +static MigChannelType migration_channel_identify(MigrationIncomingState *mis,
> + QIOChannel *ioc, Error **errp)
> +{
> + MigChannelType channel = CH_NONE;
> +
> + if (migration_has_main_and_multifd_channels()) {
> assert(migrate_postcopy_preempt());
> channel = CH_POSTCOPY;
> + } else if (!mis->from_src_file) {
> + channel = CH_MAIN;
> + } else if (migrate_multifd()) {
> + /*
> + * Non-peekable channels like tls/file are processed as
> + * multifd channels when multifd is enabled.
> + */
> + channel = CH_MULTIFD;
> + } else {
> + error_setg(errp, "Unexpected non-peekable channel observed");
> }
>
> -out:
> return channel;
> }
>
> @@ -214,31 +239,275 @@ static void migration_incoming_error_propagate(MigrationIncomingState *mis,
> }
> }
>
> +/* Must be with mis->channels_early.mutex held */
> +static void
> +migration_incoming_early_channel_insert(MigrationIncomingState *mis,
> + QIOChannel *ioc,
> + GSource *source)
> +{
> + MigEarlyIncomingChannel chan = {
> + .source = source,
> + .ioc = ioc,
> + };
> +
> + object_ref(OBJECT(ioc));
> + g_source_ref(source);
> +
> + g_array_append_val(mis->channels_early.channels, chan);
> +}
> +
> +static void migration_incoming_early_channel_free(GArray *channels, int i)
> +{
> + MigEarlyIncomingChannel *chan;
> +
> + chan = &g_array_index(channels, MigEarlyIncomingChannel, i);
> +
> + g_source_destroy(chan->source);
> + g_source_unref(chan->source);
> + object_unref(OBJECT(chan->ioc));
> +
> + g_array_remove_index_fast(channels, i);
> +}
> +
> +/*
> + * Remove this channel from the monitoring of @channels_early array.
> + * Return true if found and successful, false otherwise.
> + */
> +static bool
> +migration_incoming_early_channel_remove(MigrationIncomingState *mis,
> + QIOChannel *ioc)
> +{
> + GArray *channels = mis->channels_early.channels;
> + MigEarlyIncomingChannel *chan;
> + int i;
> +
> + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
> +
> + for (i = 0; i < channels->len; i++) {
> + chan = &g_array_index(channels, MigEarlyIncomingChannel, i);
> + if (chan->ioc != ioc) {
> + continue;
> + }
> + migration_incoming_early_channel_free(channels, i);
> + return true;
> + }
> +
> + return false;
> +}
> +
> +void migration_incoming_free_early_channels(MigrationIncomingState *mis)
> +{
> + GArray *channels = mis->channels_early.channels;
> +
> + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
> +
> + while (channels->len) {
> + migration_incoming_early_channel_free(channels, 0);
> + }
> +}
> +
> +static bool migration_incoming_setup_channel(QIOChannel *ioc,
> + MigChannelType ch,
> + Error **errp)
> +{
> + trace_migration_incoming_channel_set(ioc,
> + object_get_typename(OBJECT(ioc)),
> + mig_channel_str[ch]);
> + migration_ioc_register_yank(ioc);
> + /* TODO: make this return the success status instead */
> + migration_incoming_setup(ioc, ch, errp);
> +
> + return *errp == NULL;
> +}
> +
> static bool migration_incoming_channel_install(MigrationIncomingState *mis,
> QIOChannel *ioc,
> Error **errp)
> {
> - MigChannelType ch = migration_channel_identify(mis, ioc, errp);
> + MigChannelType ch;
> + bool ret;
> +
> + if (qio_channel_is_peekable(ioc)) {
> + ch = migration_channel_peek(mis, ioc, errp);
> + } else {
> + ch = migration_channel_identify(mis, ioc, errp);
> + }
>
> if (!ch) {
> - assert(*errp);
> return false;
> }
>
> - trace_migration_set_incoming_channel(ioc,
> - object_get_typename(OBJECT(ioc)),
> - mig_channel_str[ch]);
> - migration_ioc_register_yank(ioc);
> + ret = migration_incoming_setup_channel(ioc, ch, errp);
> + if (!ret) {
> + return false;
> + }
>
> - if (migration_incoming_setup(ioc, ch, errp)) {
> + /* Installation succeeded, kickoff migration if needed */
> + if (migration_has_main_and_multifd_channels()) {
> migration_start_incoming();
> }
>
> - if (*errp) {
> - return false;
> + return true;
> +}
> +
> +static void
> +migration_incoming_channel_preempt_setup(QIOChannel *ioc)
> +{
> + assert(migrate_postcopy_preempt());
> + /* Installation of preempt channel should never fail */
> + migration_incoming_setup_channel(ioc, CH_POSTCOPY, &error_abort);
> +}
> +
> +static void
> +migration_incoming_detect_preempt_channel(MigrationIncomingState *mis)
> +{
> + GArray *channels = mis->channels_early.channels;
> + MigEarlyIncomingChannel *chan;
> +
> + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
> +
> + /* When preempt mode not enabled, nothing to detect.. */
> + if (!migrate_postcopy_preempt()) {
> + /*
> + * .. but if we found something pending, throw an error only, which
> + * should not happen. Even if it happens, resources will still be
> + * released after incoming migration is completedly.
> + */
> + if (channels->len) {
> + error_report("%s: Found %u unused channels",
> + __func__, channels->len);
> + }
> + return;
> }
>
> - return true;
> + /* Preempt channel hasn't yet arrived? Process it later */
> + if (!channels->len) {
> + return;
> + }
> +
> + /*
> + * More than one channel should never happen.. capture it in case if
> + * it happens, then there's not much we can do.
> + */
> + if (channels->len > 1) {
> + error_report("%s: Found %u unused channels, "
> + "can't identify preempt channel",
> + __func__, channels->len);
> + return;
> + }
> +
> + assert(channels->len == 1);
> + /* This is the preempt channel, install it directly */
> + chan = &g_array_index(channels, MigEarlyIncomingChannel, 0);
> + migration_incoming_channel_preempt_setup(chan->ioc);
> + migration_incoming_early_channel_free(channels, 0);
> +}
> +
> +static gboolean migration_incoming_channel_readable(QIOChannel *ioc,
> + GIOCondition condition,
> + gpointer opaque)
> +{
> + MigrationIncomingState *mis = opaque;
> + Error *local_err = NULL;
> +
> + /*
> + * No need to monitor this channel anymore as long as anything arrived,
> + * remove it from tracking.
> + *
> + * NOTE: this means if partial data arrived we may still block here,
> + * but it shouldn't happen in production, only malicious stream. Since
> + * migration stream is trusted (either due to trusted network, or TLS),
> + * that's non-issue.
> + *
> + * NOTE2: this will also release the ioc ref that we used to hold, but
> + * it's fine since we have at least one more refcount in the current
> + * event handler.
> + *
> + * NOTE3: it's theoretically possible that this entry is gone reaching
> + * here. Example: the main thread is doing incoming cleanup having this
> + * one removed, while this watch can be registered on the monitor
> + * iothread's context and fired at the exact same time but in the
> + * iothread instead. If it happens, skip the rest. I'm not sure if
> + * this could happen at all, may depend on iothread lifespan management
> + * in the main thread, but be prepared.
> + */
> + if (!migration_incoming_early_channel_remove(mis, ioc)) {
> + goto out;
> + }
> +
> + if (!migration_incoming_channel_install(mis, ioc, &local_err)) {
> + goto out;
> + }
> +
> + if (migration_has_main_and_multifd_channels()) {
> + /*
> + * Possibilities when reaching here:
> + *
> + * (1) if preempt not enabled, this should be no-op, all done,
> + * (2) if preempt enabled,
> + * (2.a) preempt channel arrived @channels_early, handle it now
> + * (2.b) preempt channel not arrived, to be handled in
> + * migration_channel_process_incoming() later
> + */
> + migration_incoming_detect_preempt_channel(mis);
> + }
> +
> +out:
> + if (local_err) {
> + migration_incoming_error_propagate(mis, local_err);
> + }
> +
> + /*
> + * NOTE: we should have already detached the GSource, returning
> + * G_SOURCE_REMOVE to be logically consistent only.
> + */
> + return G_SOURCE_REMOVE;
> +}
> +
> +static void migration_incoming_channel_watch(MigrationIncomingState *mis,
> + QIOChannel *ioc)
> +{
> + GMainContext *context = g_main_context_get_thread_default();
> + GSource *source;
> + guint io_tag;
> +
> + trace_migration_incoming_channel_watch(ioc,
> + object_get_typename(OBJECT(ioc)));
> +
> + /*
> + * Careful: this can be run from either the main thread or the monitor
> + * iothread when migrate_recover is used with OOB=on, so we need to
> + * take the lock and use the full version to specify the correct
> + * context.
> + */
> + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
> +
> + /*
> + * We should never watch an @ioc that is not peekable, because there's
> + * no point. What is worse is we lose the real order of accept()s via
> + * the asynchronous IO watch operation.
> + *
> + * Another note is TLS channel (non-peekable) may or may not work
> + * properly with IO watch due to its current .io_create_watch() impl,
> + * which is another story. Just guard both points.
> + */
> + assert(qio_channel_is_peekable(ioc));
> + io_tag = qio_channel_add_watch_full(ioc, G_IO_IN,
> + migration_incoming_channel_readable,
> + mis, NULL, context);
> +
> + /*
> + * Replace this if one day qio_channel_add_watch*() API can directly
> + * return the GSource*.. for now, stick with it.
> + */
> + source = g_main_context_find_source_by_id(context, io_tag);
> + /*
> + * Nothing can race with adding the IO watch, aka, concurrent removal
> + * is not possible when we have the lock. So it must be present.
> + */
> + assert(source);
> +
> + migration_incoming_early_channel_insert(mis, ioc, source);
> }
>
> /**
> @@ -254,13 +523,44 @@ void migration_channel_process_incoming(QIOChannel *ioc)
> MigrationIncomingState *mis = migration_incoming_get_current();
> Error *local_err = NULL;
>
> - trace_migration_channel_process_incoming(
> + trace_migration_incoming_channel_process(
> ioc, object_get_typename(OBJECT(ioc)));
>
> if (migrate_channel_requires_tls_upgrade(ioc)) {
> migration_tls_channel_process_incoming(ioc, &local_err);
> } else {
> - migration_incoming_channel_install(mis, ioc, &local_err);
> + if (migration_has_main_and_multifd_channels()) {
> + /*
> + * If all main+multifd channels are present already, this must
> + * be the preempt channel.
> + *
> + * QEMU can't register an IO watch for it if there is only the
> + * last preempt channel left, because it means the IO watch
> + * will never fire and nobody will pick it up: we rely on the
> + * one before the last one to pick both.
> + *
> + * See comment in migration_incoming_channel_readable() on
> + * the migration_incoming_detect_preempt_channel() call.
> + */
> + migration_incoming_channel_preempt_setup(ioc);
> + } else {
> + /*
> + * Register an IO watch for peekable channels, so that channels
> + * can be accept()ed with any order.
> + *
> + * Non-peekable channels (file, TLS, etc.) cannot register IO
> + * watch, not only because there's no data to look at to help
> + * making the decision, but also because after registering we
> + * will lose the real ordering we get from accept(), which is
> + * still so far the only source of truth to identify a channel
> + * in such case.
> + */
> + if (qio_channel_is_peekable(ioc)) {
> + migration_incoming_channel_watch(mis, ioc);
> + } else {
> + migration_incoming_channel_install(mis, ioc, &local_err);
> + }
> + }
> }
>
> if (local_err) {
> @@ -270,7 +570,7 @@ void migration_channel_process_incoming(QIOChannel *ioc)
>
> void migration_channel_connect_outgoing(MigrationState *s, QIOChannel *ioc)
> {
> - trace_migration_set_outgoing_channel(ioc, object_get_typename(OBJECT(ioc)));
> + trace_migration_outgoing_channel_set(ioc, object_get_typename(OBJECT(ioc)));
>
> if (migrate_channel_requires_tls_upgrade(ioc)) {
> Error *local_err = NULL;
> diff --git a/migration/migration.c b/migration/migration.c
> index cfadcc79c2..4cc4077a76 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -334,6 +334,10 @@ void migration_object_init(void)
> current_incoming->page_requested = g_tree_new(page_request_addr_cmp);
>
> current_incoming->exit_on_error = INMIGRATE_DEFAULT_EXIT_ON_ERROR;
> + /* zero_terminated=false, clear_=true */
> + current_incoming->channels_early.channels =
> + g_array_new(FALSE, TRUE, sizeof(MigEarlyIncomingChannel));
> + qemu_mutex_init(¤t_incoming->channels_early.mutex);
>
> migration_object_check(current_migration, &error_fatal);
>
> @@ -447,6 +451,24 @@ void migration_incoming_state_destroy(void)
> MigrationIncomingState *mis = migration_incoming_get_current();
> PostcopyState ps = postcopy_state_get();
>
> + /* Cleanup listener to make sure no further accept() for sockets */
> + migration_incoming_transport_cleanup(mis);
> +
> + /*
> + * It's safer to free channel watches earlier than most of the rest, in
> + * case the IO watches could fire in the monitor iothread concurrently
> + * against this function.
> + *
> + * Above migration_incoming_transport_cleanup() should have disarmed
> + * anything that we could accept() new sockets.
> + *
> + * Here return of migration_incoming_free_early_channels() makes sure
> + * even if something already fired concurrently, it won't really do
> + * anything but return - see migration_incoming_early_channel_remove()
> + * and its return code for details.
> + */
> + migration_incoming_free_early_channels(mis);
> +
> multifd_recv_cleanup();
>
> if (ps != POSTCOPY_INCOMING_NONE) {
> @@ -491,7 +513,6 @@ void migration_incoming_state_destroy(void)
> mis->postcopy_remote_fds = NULL;
> }
>
> - migration_incoming_transport_cleanup(mis);
> qemu_event_reset(&mis->main_thread_load_event);
>
> if (mis->page_requested) {
> diff --git a/migration/trace-events b/migration/trace-events
> index 9ef42f54d1..c408deeb72 100644
> --- a/migration/trace-events
> +++ b/migration/trace-events
> @@ -207,9 +207,10 @@ migration_start_incoming(void) ""
> migration_transferred_bytes(uint64_t qemu_file, uint64_t multifd, uint64_t rdma) "qemu_file %" PRIu64 " multifd %" PRIu64 " RDMA %" PRIu64
>
> # channel.c
> -migration_channel_process_incoming(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
> -migration_set_incoming_channel(void *ioc, const char *ioctype, const char *type) "ioc=%p ioctype=%s type=%s"
> -migration_set_outgoing_channel(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
> +migration_outgoing_channel_set(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
> +migration_incoming_channel_process(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
> +migration_incoming_channel_set(void *ioc, const char *ioctype, const char *type) "ioc=%p ioctype=%s type=%s"
> +migration_incoming_channel_watch(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
>
> # global_state.c
> migrate_state_too_big(void) ""
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 7/7] migration: Postpone the outgoing preempt channel for preempt_pre_7_2
2026-09-22 23:34 ` Fabiano Rosas
@ 2026-09-23 20:24 ` Peter Xu
2026-09-23 22:30 ` Fabiano Rosas
0 siblings, 1 reply; 18+ messages in thread
From: Peter Xu @ 2026-09-23 20:24 UTC (permalink / raw)
To: Fabiano Rosas; +Cc: qemu-devel, Akash Kulhalli, Juraj Marcin
On Tue, Sep 22, 2026 at 08:34:41PM -0300, Fabiano Rosas wrote:
> Peter Xu <peterx@redhat.com> writes:
>
> > This is the corresponding outgoing fix for the same problem mentioned in
> > the previous patch.
> >
> > The idea is simple: either migration to an old QEMU or when TLS is enabled,
> > we rely on correct ordering of channels to make it work: first main, then
> > multifd, finally preempt.
> >
> > This patch re-orders multifd and postcopy preempt channel on outgoing side,
> > but only for the old machine types where preempt_pre_7_2 set, to make it
> > follow the right orders to create the channels.
> >
> > Keep the resume path alone because the resume path never involve multifd
> > channels, even if multifd is enabled. For that, fun fact: when multifd is
> > enabled with postcopy preempt, network interruption will break all multifd
> > channels, but they're never re-connected, until they got recycled at the
> > end of postcopy migration.
>
> Is this a separate bug? Do we need to add some cleanup?
Not a bug? The resume path only happens during postcopy phase, during
which multifd (even if enabled) is ignored.
>
> > OTOH, multifd_recv_all_channels_created()
> > reports true even after postcopy network down, as multifd_recv_state->count
> > is never decremented.
> >
>
> Seems normal to me. We're not even trying to reconnect multifd.
The clean way to do this is, whenever we recycled all the channels we reset
it. Ideally they should have been recycled when switching to postcopy, but
that's non-issue, I agree. It's just not that intuitive, IMHO. But I can
definitely drop this paragraph if it caused confusions.
>
> > Fixes: e27418861288 ("migration: enable multifd and postcopy together")
> > Signed-off-by: Peter Xu <peterx@redhat.com>
> > ---
> > migration/migration.c | 32 +++++++++++++++++++++++---------
> > 1 file changed, 23 insertions(+), 9 deletions(-)
> >
> > diff --git a/migration/migration.c b/migration/migration.c
> > index 4cc4077a76..f8d664808f 100644
> > --- a/migration/migration.c
> > +++ b/migration/migration.c
> > @@ -3733,6 +3733,20 @@ static void *migration_thread(void *opaque)
> > goto out;
> > }
> >
> > + /*
> > + * Only for old 7.1/7.2 machine types running on new binaries (that
> > + * supports multifd+postcopy+preempt). Makes sure to initiate the
> > + * connect() after multifd channels because the old (broken) binaries
> > + * assumes the order of channels, which we cannot fix anymore.
> > + *
> > + * multifd_send_setup() will make sure all multifd channels will be
> > + * connected first, then initiate preempt channel here guarantees the
> > + * ordering to those old binaries.
> > + */
>
> It's a bit confusing what's old binary, what's new binary here. Old/new
Yeah, I used "new binaries" to reference 10.1+ on the first line (while in
context of 7.1/7.2 machine types, they're "new"), but then used "old
(broken) binaries" on the 3rd line (while in context of after fixing
incoming side after previous patch, in which case not-fixed ones are
"old").
My bad, it's probably confusing whoever reads it.
I wrote a new comment:
/*
* Only for old 7.1/7.2 machine types (preempt mode supported since
* 7.1). Connect the preempt channel only after multifd channels,
* because some QEMU versions (v10.1 to v11.1) will assume the order of
* channels to be: (1) main, then (2) multifd channels, then (3)
* preempt channel. IOW, (3) must be after (2).
*
* multifd_send_setup() makes sure all multifd channels be connected
* first, then initiate preempt channel here guarantees the ordering to
* those QEMU binaries.
*/
> don't really apply I think as there are more than two cases when we look
> at the global picture. There's before 7.1, before 7.2, before the
> preempt_pre_7_2 flag, before the multifd+postcopy support, before this
Most things before multifd+postcopy work do not matter much, because as you
also mentioned these binaries can't enable both features, so it is not a
concern in term of channel misorders.
> series, etc. Specially since this code is exactly the same as the one
> under if (resume), but there we're talking about a different new/old.
Just to mention, we need that separate connection for resuming case below
in migration_start_outgoing(), because the resuming case doesn't start a
new migration_thread but reuse the old one. It means that's the only place
we can reconnect the preempt channel in resume case.
>
> Also, maybe we should avoid framing the assumption on the order of
> channels as "broken", that's how it always worked and is just a case of
> unimaginative assumptions, i.e. not knowing multifd would ever run along
> preempt. The real bug is that v10.1 added a "new" channel to the mix
> without working on compatibility.
Yes, I feel like we're on the same page. I think it was used to how it
always worked before multifd+postcopy merged. After it merged, it's not
how it worked, it should never worked, IIUC, hence "broken" after 10.1+.
>
> In this series you're doing both: fixing the bug that v10.1 introduced
> and improving the code to not assume the order of channels.
Note that relying on order of channels are actually OK in 99.9% cases.. So
that's why I tend to make it a "fix", even if it smells like a feature.
Or say, I'll backport this whole series, when ready, to our zstream, as a
fix too. This is the smallest change set I can come up with even if it
contains something looks like a feature..
>
> > + if (migrate_postcopy_preempt() && s->preempt_pre_7_2) {
> > + postcopy_preempt_setup(s);
> > + }
>
> Don't you want to check for multifd as well and apply this fix only to
> the case that can actually trigger it? To avoid inadvertently changing
> the normal postcopy case.
It's my intention to move this for both cases when multifd is enabled or
not, because I think it's simpler and cleaner.
If I check multifd here, I'll need to move the migration_start_outgoing()
code below to check !multifd instead, it'll look like:
migration_start_outgoing()
...
if (resume || !multifd)
connect_preempt();
if (resume)
...
It looks uglier, so I chose this path forward. It seems all safe.
>
> > +
> > bql_lock();
> > qemu_savevm_state_header(s->to_dst_file);
> > bql_unlock();
> > @@ -4013,16 +4027,16 @@ void migration_start_outgoing(MigrationState *s)
> > open_return_path_on_source(s);
> > }
> >
> > - /*
> > - * This needs to be done before resuming a postcopy. Note: for newer
> > - * QEMUs we will delay the channel creation until postcopy_start(), to
> > - * avoid disorder of channel creations.
> > - */
> > - if (migrate_postcopy_preempt() && s->preempt_pre_7_2) {
> > - postcopy_preempt_setup(s);
> > - }
> > -
>
> Hm, this used to happen before qmp_migrate() returns. Now it's in the
I think qmp_migrate() should have returned already when creating preempt
channel, either on master or after applying this patch?
Only socket based URI can use preempt mode, so when reaching here (say, on
master branch), it should be part of socket_outgoing_migration(), async
operation of qio_channel_socket_connect_async().
> migration thread and after multifd channels connect, there's a big
> window there. We added a lot of code to ensure cleanup of multifd
> happens properly and without races with TLS thread creation, etc. Have
> you considered such issues?
Hmm, I'm not aware of the races with TLS thread issue.
/me asks for more hints..
>
> > if (resume) {
> > + /*
> > + * This needs to be done before resuming a postcopy. Note: for newer
> > + * QEMUs we will delay the channel creation until postcopy_start(), to
> > + * avoid disorder of channel creations.
> > + */
> > + if (migrate_postcopy_preempt() && s->preempt_pre_7_2) {
> > + postcopy_preempt_setup(s);
> > + }
> > +
> > /* Wakeup the main migration thread to do the recovery */
> > migrate_set_state(&s->state, MIGRATION_STATUS_POSTCOPY_RECOVER_SETUP,
> > MIGRATION_STATUS_POSTCOPY_RECOVER);
>
--
Peter Xu
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 6/7] migration: Fix incoming channel race with multifd and preempt_pre_7_2
2026-09-23 15:54 ` Fabiano Rosas
@ 2026-09-23 21:04 ` Peter Xu
2026-09-23 22:15 ` Fabiano Rosas
0 siblings, 1 reply; 18+ messages in thread
From: Peter Xu @ 2026-09-23 21:04 UTC (permalink / raw)
To: Fabiano Rosas; +Cc: qemu-devel, Akash Kulhalli, Juraj Marcin
On Wed, Sep 23, 2026 at 12:54:07PM -0300, Fabiano Rosas wrote:
> Peter Xu <peterx@redhat.com> writes:
>
> > PROBLEM
> > =======
> >
> > Migration reliably hangs with old machine types (7.2-) when these migration
> > capabilities are enabled: multifd, postcopy-ram, postcopy-preempt.
>
> Is there a way to make this patch unrelated to the 7.2 issue? I think
> this muddles the discussion a bit. This is a real improvement despite
> any bug.
I agree this change will make the channel mgmt also more flexible, but
logically we almost don't need it if there's no such bug [*].. at very
minimum, I can add some paragraph before the problem describing this too.
Would that help?
[*] NOTE: I still agree iowatch is in general always good, but then after
we have handshake feature ready, we don't need iowatch anymore because we
can simply attach header for all channels including preempt channel, then
it's readable too (not only peekable). I plan to work on handshake feature
after I came back from kvm forum. If that can land, after 6 years we
should be able to revert this whole thing include old channel mgmt. No
peek / iowatch / ... needed here for channel establishments.
>
> >
> > Simplest reproducer :
> >
> > $ QTEST_QEMU_MACHINE_TYPE=pc-q35-7.2 \
> > QTEST_QEMU_BINARY=./qemu-system-x86_64 \
> > ./tests/qtest/migration-test --full \
> > -r /x86_64/migration/multifd+postcopy/preempt/plain
> >
> > Current workaround is to kill destination QEMU, cancel the migration on
> > source (with/without yank), disable one or more of the features, and retry.
> >
> > The hang is caused by receiving preempt channel before most of the multifd
> > channels, the peek buffer operation will stuck forever.
> >
> > Incoming side QEMU hang (with relevant tracepoints enabled):
> >
> > migrate_set_state new state setup
> > migration_socket_incoming_accepted
> > migration_set_incoming_channel ioc=0x557d82c1caa0 ioctype=qio-channel-socket
> > migration_socket_incoming_accepted
> > migration_set_incoming_channel ioc=0x557d83023840 ioctype=qio-channel-socket
> > multifd_recv_new_channel channel 1
> > migration_socket_incoming_accepted
> > migration_set_incoming_channel ioc=0x557d830c08c0 ioctype=qio-channel-socket
> > multifd_recv_new_channel channel 0
> > multifd_recv_thread_start 1
> > migration_socket_incoming_accepted
> > migration_set_incoming_channel ioc=0x557d8284a010 ioctype=qio-channel-socket
> > multifd_recv_thread_start 0
> > multifd_recv_unfill channel 0 packet_num 0 flags 0x1 next packet size 0
> > multifd_recv_unfill channel 1 packet_num 1 flags 0x1 next packet size 0
> > [dest qemu hangs here]
> >
> > Incoming side backtrace:
> >
> > __syscall_cancel_arch
> > __internal_syscall_cancel
> > __syscall_cancel
> > recvmsg
> > qio_channel_socket_readv
> > qio_channel_readv_full
> > migration_channel_read_peek
> > migration_channel_identify
> > migration_channel_process_incoming
> > socket_accept_incoming_migration
> > qio_net_listener_channel_func
> > qio_channel_fd_source_dispatch
> > g_main_context_dispatch_unlocked.lto_priv
> > g_main_context_dispatch
> > glib_pollfds_poll
> > os_host_main_loop_wait
> > main_loop_wait
> > qemu_main_loop
> > qemu_default_main
> > main
> >
> > This patch tries to fix it, from incoming side first. This patch alone
> > should enable single-direction migration to this new QEMU. The next patch
> > will propose a fix for the outgoing path, fixing new->old migrations.
> >
> > BACKGROUND
> > ==========
> >
> > preempt_pre_7_2 used to be a flag marking QEMU releases 7.1/7.2 only
> > because they have a flaw on channel establishment on preempt channel.
> >
> > Now, after we have multifd + postcopy support, new QEMU binaries can
> > migrate old machine types with both features enabled. Juraj reported
> > constant migration hang at the very beginning for those old machine types
> > in our downstream systems with such setup. Juraj found it's because of
> > this flag.
> >
> > QEMU source initiates channels in this order on current master when both
> > features enabled with postcopy-preempt mode:
> >
> > - First, main channel connect() happens,
> > - Second, postcopy_preempt_setup() invokes connect() for preempt channel,
> > - Last, in migration_thread(), multifd_send_setup() invokes connect()s
> > for all the multifd channels
>
> Other way around, no?
>
> (master/11.1/src) only starts preempt when postcopy starts.
> (master/11.1/dst) peeks main, peeks multifd, preempt comes when main and
> multifd have already been found, so it is assumed to be preempt.
Yes, only when with newer machine types (8.0+). The statement here should
be correct for machine type 7.2, which is what this bug is about. How
about I update the previous sentence to be this instead?
QEMU source initiates channels in this order on current master when both
features enabled with postcopy-preempt mode (machine type 7.2, implies
preempt_pre_7_2=on):
>
> >
> > However on an old QEMU, it expect the channels arrive in order of
> > "main"->"multifd"->"preempt". Even on a new QEMU, the destination expects
> > the same order of arrival on the channels when the channels are not
> > peekable.
> >
>
> (master/7.2/src) starts main, then preempt, then multifd.
> (master/7.2 or 11.1/dst) peeks main, peeks multifd then hangs because preempt is
> peekable but doesn't send data right away.
Yes.
>
> > For peekable channels (non-tls sockets), this time we'll likely see preempt
> > channel appearing very soon, peeking at it causing main thread hang, like
> > mentioned in the PROBLEM section above.
> >
>
> Yes.
>
> > SOLUTION
> > ========
> >
> > One major problem of current hang is we try to peek at preempt channel,
> > which offers nothing at the beginning.
> >
> > Since we'll need to accept stream from old binaries, arrival of preempt
> > channel early is unavoidable.
> >
>
> No, because old binary doesn't support multifd+postcopy, so there's only
> either main + multifd or main + preempt.
>
> New binary with old machine type is the only one that can send preempt
> early.
I'll update this sentence to be:
Since we'll need to accept stream from old binaries (QEMU 10.1 to 11.1),
arrival of preempt channel early is unavoidable.
>
> > What we can do, though, is to allow concurrent monitoring of all channels
> > rather than one. Meanwhile, we shouldn't peek at anything that has no
> > data.
> >
>
> I wonder why do we need to peek at all. Can't we start n threads and
> recv() a data chunk of fixed size (smaller than the preempt request) on
> every channel that comes up? Each thread puts the (data chunk + ioc) on
> a list and exits. The channels that don't send data would just sit there
> until something comes up.
>
> Most channels would have data with a magic value right away so we'd
> empty the list before the preempt request comes up. But having a list
> means we can just iterate it when a consumer that has not yet received a
> channel asks for a piece of data.
>
> We could also check that the data in the supposed preempt channel is a
> page request.
I'm not sure I fully get your proposal here, just to mention: preempt
channel has no data, recv() on it hangs like what already happens with this
bug. Then, how do we recycle a hanged recv() thread with its ioc?
The other question is, anything else that wants to read from any migration
channel will need to take this (data chunk, ioc) info, because it needs to
read from "data chunk" first until depleted. That's awkward.
Actually, since this solution doesn't work for TLS, I wanted to do
something like this and make TLS iochannel peekable (basically we can keep
that data chunk inside ioc for tls only), then as long as peekable this
solution will work too for TLS. But I thought about it and I think it's
not worth it. It'll pollute tls code.
>
> > migration_channel_read_peek() almost does the wait, but it's too late.
> > This patch proposes to watch all channels from the start without reading at
> > them at all, relying on an IO watch attached. This will make sure (1) for
> > preempt channel, we never read on it (watch can be gracefully disarmed when
> > we know it's preempt channel later) (2) since we have one IO watch for each
> > channel, then we can allow accept() to happen in almost any order, process
> > only when there's some header to read.
> >
> > To maintain these watches, a new GArray @channels_early is introduced, with
> > each element to be a (ioc, GSource) tuple (@MigEarlyIncomingChannel), so
> > that QEMU can manage all the IO watches later with it. Here I used GSource
> > rather than io_tag because the GSource may or may not be attached to the
> > default main thread gcontext: when OOB is used, it may be the iothread
> > context instead. IOW, g_source_remove() on io_tags stops working, which
> > only works for default main context.
> >
> > The trick this patch used is when we have the ability to wait on all
> > channel headers at the same time, we pick one by one from main and multifd
> > channels (since both of the types will contain headers dumped right at the
> > very beginning), leave preempt channel alone. It means, after dest QEMU
> > finds all main and multifd channels, there are three possibilities:
> >
> > - If preempt not enabled, we finished full channel establishment, done.
> >
>
> I don't see why we need "channel establishment" at all. We're simply
> taking iochannels and putting them into named QEMUFiles, this means
> nothing. We could keep a list of unknown channels around indefinitely
> and fetch them lazily when the data is needed. By that point, the
> channels that have magic values would have already been identified and
> what's left is the unindentified channel.
Isn't that kind of what this iowatch does? It puts channels into the
MigEarlyIncomingChannel, until it has something to read. The only
difference is, this patch will wait for all magics arrived to continue
rather than continue then wait randomly at later points: I don't see how to
achieve that without modifying code later.
>
> This would allow us add new channels with a proper header without
> interfering with the old channels. As long as the new channels are not
> to be consumed too soon.
I hope we don't introduce new channels until we have the handshake feature
ready. Again, I'll prioritize that feature.
>
> > - If preempt enabled,
> >
> > - If we have one registered IO watch with the IOC, it must be the
> > preempt channel,
> >
> > - If we have no further IO watch, wait for the next accept(), which
> > must be the preempt channel.
> >
>
> Ok, so watch all connections concurrently and pick the last one as
> preempt.
Right.
>
> > This will make channel establish work on incoming side even with the old
> > QEMU binaries.
> >
> > While working on it, I managed to refactor the peeking logic quite a bit:
> > we used to have a very convoluted migration_channel_identify() function,
> > taking care of two different cases:
> >
> > (1) when the channel is peekable (like normal socket channels),
> > (2) when the channel is not peekable (like TLS or file migrations).
> >
> > This patch refactored that part to make it crystal clear on how we make
> > decisions on which channel is which, and split the peek/identify paths.
> >
>
> I'm still bothered about the peek. The data is all intended for the
> destination machine, it owns it all, it can just consume it and put it
> in the pocket.
With MSG_PEEK, such buffer doesn't help.
Without MSG_PEEK (TLS's case) it may help, but again, I decided to not go
with it, and I'll just prioritize the handshake feature instead.
>
> > One example incoming migration from pc-q35-7.2 after this patch applied,
> > and with relevant tracepoints set (8 multifd channels, 1 preempt channel):
> >
> > migrate_set_state new state setup
> > migration_channel_process_incoming ioc=0x557dc8af4e20 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc8af4e20 ioctype=qio-channel-socket
> > migration_channel_process_incoming ioc=0x557dc8abc5d0 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc8abc5d0 ioctype=qio-channel-socket
> > migration_channel_process_incoming ioc=0x557dc953d680 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc953d680 ioctype=qio-channel-socket
> > migration_set_incoming_channel ioc=0x557dc8abc5d0 ioctype=qio-channel-socket type=MULTIFD
> > migration_channel_process_incoming ioc=0x557dc898a820 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc898a820 ioctype=qio-channel-socket
> > migration_set_incoming_channel ioc=0x557dc953d680 ioctype=qio-channel-socket type=MULTIFD
> > migration_channel_process_incoming ioc=0x557dc919bd70 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc919bd70 ioctype=qio-channel-socket
> > migration_set_incoming_channel ioc=0x557dc898a820 ioctype=qio-channel-socket type=MULTIFD
> > migration_channel_process_incoming ioc=0x557dc8734b20 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc8734b20 ioctype=qio-channel-socket
> > migration_set_incoming_channel ioc=0x557dc919bd70 ioctype=qio-channel-socket type=MULTIFD
> > migration_channel_process_incoming ioc=0x557dc898bdf0 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc898bdf0 ioctype=qio-channel-socket
> > migration_set_incoming_channel ioc=0x557dc8734b20 ioctype=qio-channel-socket type=MULTIFD
> > migration_channel_process_incoming ioc=0x557dc968cfd0 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc968cfd0 ioctype=qio-channel-socket
> > migration_set_incoming_channel ioc=0x557dc898bdf0 ioctype=qio-channel-socket type=MULTIFD
> > migration_channel_process_incoming ioc=0x557dc8c31810 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc8c31810 ioctype=qio-channel-socket
> > migration_set_incoming_channel ioc=0x557dc968cfd0 ioctype=qio-channel-socket type=MULTIFD
> > migration_set_incoming_channel ioc=0x557dc8c31810 ioctype=qio-channel-socket type=MULTIFD
> > migration_set_incoming_channel ioc=0x557dc8af4e20 ioctype=qio-channel-socket type=MAIN
>
> Hm, multifd came first? Have you registered watches in reverse order or
> something? Not sure if it matters much.
This is after the patchset applied. Multifd channels should come first
because I changed preempt channel to be after multifd in the next patch.
So this is expected behavior.
>
> > migration_start_incoming
> > migrate_set_state new state active
> > migration_channel_process_incoming ioc=0x557dc8966160 ioctype=qio-channel-socket
> > migration_set_incoming_channel ioc=0x557dc8966160 ioctype=qio-channel-socket type=PREEMPT
> >
> > While at it, I renamed the four channel incoming/outgoing tracepoints, make
> > all to follow migration_[incoming|outgoing]_channel_*(). Especially for
> > incoming, then we can enable migration_incoming_channel* for incoming
> > channel debuggings.
> >
> > FINAL NOTE ON TLS
> > =================
> >
> > Note that this solution isn't a magic bullet fixing everything. TLS is not
> > fixable with this approach because TLS isn't peekable channel, hence the
> > watch won't help.
> >
> > We can have other ways to hack it to make it work, e.g. we can make TLS
> > channels peekable too, but I don't want to pollute the TLS iochannel only
> > for this: let's hope handshake will arrive soon so we can drop these code.
> >
> > For now, when TLS is involved with such old machine type (7.2-), one needs
> > to migrate it out with any combination of features except enabling all
> > four (multifd + TLS + postcopy + preempt) to a patched binary, after that,
> > all combinations will start working.
> >
>
> I don't understand where TLS comes into this. You mean TLS is not
> peekable so if we use TLS for the multifd channels, then we cannot
> tell them apart from preempt?
Yep. TLS channels doesn't set QIO_CHANNEL_FEATURE_READ_MSG_PEEK, so it's
not peekable. Internally, it's simply because there's no simple MSG_PEEK
equivalent for gnutls facilities, IIUC.
>
> > BugLink: https://redhat.atlassian.net/browse/RHEL-254933
> > Fixes: e27418861288 ("migration: enable multifd and postcopy together")
> > Reported-by: Juraj Marcin <jmarcin@redhat.com>
> > Signed-off-by: Peter Xu <peterx@redhat.com>
> > ---
> > migration/channel.h | 3 +
> > migration/migration.h | 35 ++++
> > migration/channel.c | 414 +++++++++++++++++++++++++++++++++++------
> > migration/migration.c | 23 ++-
> > migration/trace-events | 7 +-
> > 5 files changed, 421 insertions(+), 61 deletions(-)
> >
>
> I'll wait for your replies before reviewing the code in detail.
Sure, the change is slightly involved indeed, it makes more sense we
clarify problems and high level things before going into details if there's
anything unclear. Let me know if there're more things you'd ask, or things
I overlooked.
--
Peter Xu
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 6/7] migration: Fix incoming channel race with multifd and preempt_pre_7_2
2026-09-23 21:04 ` Peter Xu
@ 2026-09-23 22:15 ` Fabiano Rosas
0 siblings, 0 replies; 18+ messages in thread
From: Fabiano Rosas @ 2026-09-23 22:15 UTC (permalink / raw)
To: Peter Xu; +Cc: qemu-devel, Akash Kulhalli, Juraj Marcin
Peter Xu <peterx@redhat.com> writes:
> On Wed, Sep 23, 2026 at 12:54:07PM -0300, Fabiano Rosas wrote:
>> Peter Xu <peterx@redhat.com> writes:
>>
>> > PROBLEM
>> > =======
>> >
>> > Migration reliably hangs with old machine types (7.2-) when these migration
>> > capabilities are enabled: multifd, postcopy-ram, postcopy-preempt.
>>
>> Is there a way to make this patch unrelated to the 7.2 issue? I think
>> this muddles the discussion a bit. This is a real improvement despite
>> any bug.
>
> I agree this change will make the channel mgmt also more flexible, but
> logically we almost don't need it if there's no such bug [*].. at very
> minimum, I can add some paragraph before the problem describing this too.
> Would that help?
>
> [*] NOTE: I still agree iowatch is in general always good, but then after
> we have handshake feature ready, we don't need iowatch anymore because we
> can simply attach header for all channels including preempt channel, then
> it's readable too (not only peekable). I plan to work on handshake feature
> after I came back from kvm forum. If that can land, after 6 years we
> should be able to revert this whole thing include old channel mgmt. No
> peek / iowatch / ... needed here for channel establishments.
>
>>
>> >
>> > Simplest reproducer :
>> >
>> > $ QTEST_QEMU_MACHINE_TYPE=pc-q35-7.2 \
>> > QTEST_QEMU_BINARY=./qemu-system-x86_64 \
>> > ./tests/qtest/migration-test --full \
>> > -r /x86_64/migration/multifd+postcopy/preempt/plain
>> >
>> > Current workaround is to kill destination QEMU, cancel the migration on
>> > source (with/without yank), disable one or more of the features, and retry.
>> >
>> > The hang is caused by receiving preempt channel before most of the multifd
>> > channels, the peek buffer operation will stuck forever.
>> >
>> > Incoming side QEMU hang (with relevant tracepoints enabled):
>> >
>> > migrate_set_state new state setup
>> > migration_socket_incoming_accepted
>> > migration_set_incoming_channel ioc=0x557d82c1caa0 ioctype=qio-channel-socket
>> > migration_socket_incoming_accepted
>> > migration_set_incoming_channel ioc=0x557d83023840 ioctype=qio-channel-socket
>> > multifd_recv_new_channel channel 1
>> > migration_socket_incoming_accepted
>> > migration_set_incoming_channel ioc=0x557d830c08c0 ioctype=qio-channel-socket
>> > multifd_recv_new_channel channel 0
>> > multifd_recv_thread_start 1
>> > migration_socket_incoming_accepted
>> > migration_set_incoming_channel ioc=0x557d8284a010 ioctype=qio-channel-socket
>> > multifd_recv_thread_start 0
>> > multifd_recv_unfill channel 0 packet_num 0 flags 0x1 next packet size 0
>> > multifd_recv_unfill channel 1 packet_num 1 flags 0x1 next packet size 0
>> > [dest qemu hangs here]
>> >
>> > Incoming side backtrace:
>> >
>> > __syscall_cancel_arch
>> > __internal_syscall_cancel
>> > __syscall_cancel
>> > recvmsg
>> > qio_channel_socket_readv
>> > qio_channel_readv_full
>> > migration_channel_read_peek
>> > migration_channel_identify
>> > migration_channel_process_incoming
>> > socket_accept_incoming_migration
>> > qio_net_listener_channel_func
>> > qio_channel_fd_source_dispatch
>> > g_main_context_dispatch_unlocked.lto_priv
>> > g_main_context_dispatch
>> > glib_pollfds_poll
>> > os_host_main_loop_wait
>> > main_loop_wait
>> > qemu_main_loop
>> > qemu_default_main
>> > main
>> >
>> > This patch tries to fix it, from incoming side first. This patch alone
>> > should enable single-direction migration to this new QEMU. The next patch
>> > will propose a fix for the outgoing path, fixing new->old migrations.
>> >
>> > BACKGROUND
>> > ==========
>> >
>> > preempt_pre_7_2 used to be a flag marking QEMU releases 7.1/7.2 only
>> > because they have a flaw on channel establishment on preempt channel.
>> >
>> > Now, after we have multifd + postcopy support, new QEMU binaries can
>> > migrate old machine types with both features enabled. Juraj reported
>> > constant migration hang at the very beginning for those old machine types
>> > in our downstream systems with such setup. Juraj found it's because of
>> > this flag.
>> >
>> > QEMU source initiates channels in this order on current master when both
>> > features enabled with postcopy-preempt mode:
>> >
>> > - First, main channel connect() happens,
>> > - Second, postcopy_preempt_setup() invokes connect() for preempt channel,
>> > - Last, in migration_thread(), multifd_send_setup() invokes connect()s
>> > for all the multifd channels
>>
>> Other way around, no?
>>
>> (master/11.1/src) only starts preempt when postcopy starts.
>> (master/11.1/dst) peeks main, peeks multifd, preempt comes when main and
>> multifd have already been found, so it is assumed to be preempt.
>
> Yes, only when with newer machine types (8.0+). The statement here should
> be correct for machine type 7.2, which is what this bug is about. How
> about I update the previous sentence to be this instead?
>
> QEMU source initiates channels in this order on current master when both
> features enabled with postcopy-preempt mode (machine type 7.2, implies
> preempt_pre_7_2=on):
>
Ok, but remember the patch affects all versions even if we just mention
7.2. We have this fresh now, but later down the line we might get
confused.
>>
>> >
>> > However on an old QEMU, it expect the channels arrive in order of
>> > "main"->"multifd"->"preempt". Even on a new QEMU, the destination expects
>> > the same order of arrival on the channels when the channels are not
>> > peekable.
>> >
>>
>> (master/7.2/src) starts main, then preempt, then multifd.
>> (master/7.2 or 11.1/dst) peeks main, peeks multifd then hangs because preempt is
>> peekable but doesn't send data right away.
>
> Yes.
>
>>
>> > For peekable channels (non-tls sockets), this time we'll likely see preempt
>> > channel appearing very soon, peeking at it causing main thread hang, like
>> > mentioned in the PROBLEM section above.
>> >
>>
>> Yes.
>>
>> > SOLUTION
>> > ========
>> >
>> > One major problem of current hang is we try to peek at preempt channel,
>> > which offers nothing at the beginning.
>> >
>> > Since we'll need to accept stream from old binaries, arrival of preempt
>> > channel early is unavoidable.
>> >
>>
>> No, because old binary doesn't support multifd+postcopy, so there's only
>> either main + multifd or main + preempt.
>>
>> New binary with old machine type is the only one that can send preempt
>> early.
>
> I'll update this sentence to be:
>
> Since we'll need to accept stream from old binaries (QEMU 10.1 to 11.1),
> arrival of preempt channel early is unavoidable.
>
I see, you mean not-so-old binaries =)
>>
>> > What we can do, though, is to allow concurrent monitoring of all channels
>> > rather than one. Meanwhile, we shouldn't peek at anything that has no
>> > data.
>> >
>>
>> I wonder why do we need to peek at all. Can't we start n threads and
>> recv() a data chunk of fixed size (smaller than the preempt request) on
>> every channel that comes up? Each thread puts the (data chunk + ioc) on
>> a list and exits. The channels that don't send data would just sit there
>> until something comes up.
>>
>> Most channels would have data with a magic value right away so we'd
>> empty the list before the preempt request comes up. But having a list
>> means we can just iterate it when a consumer that has not yet received a
>> channel asks for a piece of data.
>>
>> We could also check that the data in the supposed preempt channel is a
>> page request.
>
> I'm not sure I fully get your proposal here, just to mention: preempt
> channel has no data, recv() on it hangs like what already happens with this
> bug. Then, how do we recycle a hanged recv() thread with its ioc?
>
We let it hang. Preempt channel is only needed way later. We currently
go through this channel discovery just to do:
f = qemu_file_new_input(ioc);
qemu_file_set_blocking(file, true, &error_abort);
mis->postcopy_qemufile_dst = file;
qemu_sem_post(&mis->postcopy_qemufile_dst_done);
We need mis->postcopy_qemufile_dst just to pass it to
ram_load_postcopy(). But if we put a layer in between that manages the
ioc data, we could have the _very first_ recv() of ram_load_postcopy()
hang until the request comes. It's functionally almost the same as
waiting on postcopy_qemufile_dst_done.
> The other question is, anything else that wants to read from any migration
> channel will need to take this (data chunk, ioc) info, because it needs to
> read from "data chunk" first until depleted. That's awkward.
>
Well, "anything else" reading from "any migration channel" is exactly
why we're doing the channel discovery. It's just that today "anything
else" needs to wait for channel identification to happen.
Yes, it needs to be depleted, but it's just the first reads.
> Actually, since this solution doesn't work for TLS, I wanted to do
> something like this and make TLS iochannel peekable (basically we can keep
> that data chunk inside ioc for tls only), then as long as peekable this
> solution will work too for TLS. But I thought about it and I think it's
> not worth it. It'll pollute tls code.
>
I'm not sure how strong that argument is. We keep telling ourselves that
the migration code is missing something, but it's not like we need to
cross a bridge to touch any other subsystem. If we need it, we need it.
But fine, of course, if you don't want to touch that bee nest.
>>
>> > migration_channel_read_peek() almost does the wait, but it's too late.
>> > This patch proposes to watch all channels from the start without reading at
>> > them at all, relying on an IO watch attached. This will make sure (1) for
>> > preempt channel, we never read on it (watch can be gracefully disarmed when
>> > we know it's preempt channel later) (2) since we have one IO watch for each
>> > channel, then we can allow accept() to happen in almost any order, process
>> > only when there's some header to read.
>> >
>> > To maintain these watches, a new GArray @channels_early is introduced, with
>> > each element to be a (ioc, GSource) tuple (@MigEarlyIncomingChannel), so
>> > that QEMU can manage all the IO watches later with it. Here I used GSource
>> > rather than io_tag because the GSource may or may not be attached to the
>> > default main thread gcontext: when OOB is used, it may be the iothread
>> > context instead. IOW, g_source_remove() on io_tags stops working, which
>> > only works for default main context.
>> >
>> > The trick this patch used is when we have the ability to wait on all
>> > channel headers at the same time, we pick one by one from main and multifd
>> > channels (since both of the types will contain headers dumped right at the
>> > very beginning), leave preempt channel alone. It means, after dest QEMU
>> > finds all main and multifd channels, there are three possibilities:
>> >
>> > - If preempt not enabled, we finished full channel establishment, done.
>> >
>>
>> I don't see why we need "channel establishment" at all. We're simply
>> taking iochannels and putting them into named QEMUFiles, this means
>> nothing. We could keep a list of unknown channels around indefinitely
>> and fetch them lazily when the data is needed. By that point, the
>> channels that have magic values would have already been identified and
>> what's left is the unindentified channel.
>
> Isn't that kind of what this iowatch does? It puts channels into the
> MigEarlyIncomingChannel, until it has something to read. The only
> difference is, this patch will wait for all magics arrived to continue
> rather than continue then wait randomly at later points: I don't see how to
> achieve that without modifying code later.
>
Right, I'm suggesting to modify the code later.
>>
>> This would allow us add new channels with a proper header without
>> interfering with the old channels. As long as the new channels are not
>> to be consumed too soon.
>
> I hope we don't introduce new channels until we have the handshake feature
> ready. Again, I'll prioritize that feature.
>
I support the handshake idea, I'm just thinking what can be done
incrementally.
I mean we could start sending a header on one of the existing channels
and keep a non-header version for compatibility. The updated code would
pick the new version and ignore the old one, the old code (but still
with this change) would pick the channel without header.
>>
>> > - If preempt enabled,
>> >
>> > - If we have one registered IO watch with the IOC, it must be the
>> > preempt channel,
>> >
>> > - If we have no further IO watch, wait for the next accept(), which
>> > must be the preempt channel.
>> >
>>
>> Ok, so watch all connections concurrently and pick the last one as
>> preempt.
>
> Right.
>
>>
>> > This will make channel establish work on incoming side even with the old
>> > QEMU binaries.
>> >
>> > While working on it, I managed to refactor the peeking logic quite a bit:
>> > we used to have a very convoluted migration_channel_identify() function,
>> > taking care of two different cases:
>> >
>> > (1) when the channel is peekable (like normal socket channels),
>> > (2) when the channel is not peekable (like TLS or file migrations).
>> >
>> > This patch refactored that part to make it crystal clear on how we make
>> > decisions on which channel is which, and split the peek/identify paths.
>> >
>>
>> I'm still bothered about the peek. The data is all intended for the
>> destination machine, it owns it all, it can just consume it and put it
>> in the pocket.
>
> With MSG_PEEK, such buffer doesn't help.
>
Right, but the politeness in not touching data that is not meant for you
by peeking is unnecessary, we could put a temporary orchestrator in
front of it and let it dispatch the first few bytes of data until every
channel is properly identified.
> Without MSG_PEEK (TLS's case) it may help, but again, I decided to not go
> with it, and I'll just prioritize the handshake feature instead.
>
Ok, then I'll continue review of the code in the morning.
>>
>> > One example incoming migration from pc-q35-7.2 after this patch applied,
>> > and with relevant tracepoints set (8 multifd channels, 1 preempt channel):
>> >
>> > migrate_set_state new state setup
>> > migration_channel_process_incoming ioc=0x557dc8af4e20 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc8af4e20 ioctype=qio-channel-socket
>> > migration_channel_process_incoming ioc=0x557dc8abc5d0 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc8abc5d0 ioctype=qio-channel-socket
>> > migration_channel_process_incoming ioc=0x557dc953d680 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc953d680 ioctype=qio-channel-socket
>> > migration_set_incoming_channel ioc=0x557dc8abc5d0 ioctype=qio-channel-socket type=MULTIFD
>> > migration_channel_process_incoming ioc=0x557dc898a820 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc898a820 ioctype=qio-channel-socket
>> > migration_set_incoming_channel ioc=0x557dc953d680 ioctype=qio-channel-socket type=MULTIFD
>> > migration_channel_process_incoming ioc=0x557dc919bd70 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc919bd70 ioctype=qio-channel-socket
>> > migration_set_incoming_channel ioc=0x557dc898a820 ioctype=qio-channel-socket type=MULTIFD
>> > migration_channel_process_incoming ioc=0x557dc8734b20 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc8734b20 ioctype=qio-channel-socket
>> > migration_set_incoming_channel ioc=0x557dc919bd70 ioctype=qio-channel-socket type=MULTIFD
>> > migration_channel_process_incoming ioc=0x557dc898bdf0 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc898bdf0 ioctype=qio-channel-socket
>> > migration_set_incoming_channel ioc=0x557dc8734b20 ioctype=qio-channel-socket type=MULTIFD
>> > migration_channel_process_incoming ioc=0x557dc968cfd0 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc968cfd0 ioctype=qio-channel-socket
>> > migration_set_incoming_channel ioc=0x557dc898bdf0 ioctype=qio-channel-socket type=MULTIFD
>> > migration_channel_process_incoming ioc=0x557dc8c31810 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc8c31810 ioctype=qio-channel-socket
>> > migration_set_incoming_channel ioc=0x557dc968cfd0 ioctype=qio-channel-socket type=MULTIFD
>> > migration_set_incoming_channel ioc=0x557dc8c31810 ioctype=qio-channel-socket type=MULTIFD
>> > migration_set_incoming_channel ioc=0x557dc8af4e20 ioctype=qio-channel-socket type=MAIN
>>
>> Hm, multifd came first? Have you registered watches in reverse order or
>> something? Not sure if it matters much.
>
> This is after the patchset applied. Multifd channels should come first
> because I changed preempt channel to be after multifd in the next patch.
> So this is expected behavior.
>
I mean they came before MAIN, PREEMPT is down below.
>>
>> > migration_start_incoming
>> > migrate_set_state new state active
>> > migration_channel_process_incoming ioc=0x557dc8966160 ioctype=qio-channel-socket
>> > migration_set_incoming_channel ioc=0x557dc8966160 ioctype=qio-channel-socket type=PREEMPT
>> >
>> > While at it, I renamed the four channel incoming/outgoing tracepoints, make
>> > all to follow migration_[incoming|outgoing]_channel_*(). Especially for
>> > incoming, then we can enable migration_incoming_channel* for incoming
>> > channel debuggings.
>> >
>> > FINAL NOTE ON TLS
>> > =================
>> >
>> > Note that this solution isn't a magic bullet fixing everything. TLS is not
>> > fixable with this approach because TLS isn't peekable channel, hence the
>> > watch won't help.
>> >
>> > We can have other ways to hack it to make it work, e.g. we can make TLS
>> > channels peekable too, but I don't want to pollute the TLS iochannel only
>> > for this: let's hope handshake will arrive soon so we can drop these code.
>> >
>> > For now, when TLS is involved with such old machine type (7.2-), one needs
>> > to migrate it out with any combination of features except enabling all
>> > four (multifd + TLS + postcopy + preempt) to a patched binary, after that,
>> > all combinations will start working.
>> >
>>
>> I don't understand where TLS comes into this. You mean TLS is not
>> peekable so if we use TLS for the multifd channels, then we cannot
>> tell them apart from preempt?
>
> Yep. TLS channels doesn't set QIO_CHANNEL_FEATURE_READ_MSG_PEEK, so it's
> not peekable. Internally, it's simply because there's no simple MSG_PEEK
> equivalent for gnutls facilities, IIUC.
>
Ok, but let me understand this, the data still goes through the peekable
iochannel, right?
ret = qio_channel_read(tioc->master, buf, len, errp);
So wouldn't it be simple to implement a peek operation? Mostly the io/
layer boilerplate.
>>
>> > BugLink: https://redhat.atlassian.net/browse/RHEL-254933
>> > Fixes: e27418861288 ("migration: enable multifd and postcopy together")
>> > Reported-by: Juraj Marcin <jmarcin@redhat.com>
>> > Signed-off-by: Peter Xu <peterx@redhat.com>
>> > ---
>> > migration/channel.h | 3 +
>> > migration/migration.h | 35 ++++
>> > migration/channel.c | 414 +++++++++++++++++++++++++++++++++++------
>> > migration/migration.c | 23 ++-
>> > migration/trace-events | 7 +-
>> > 5 files changed, 421 insertions(+), 61 deletions(-)
>> >
>>
>> I'll wait for your replies before reviewing the code in detail.
>
> Sure, the change is slightly involved indeed, it makes more sense we
> clarify problems and high level things before going into details if there's
> anything unclear. Let me know if there're more things you'd ask, or things
> I overlooked.
I'm fine with it design-wise and functionality-wise. I'm a bit concerned
about memory management, we start messing with GSource, we start having
leaks all over the place. But I haven't looked at it in detail, let's
not worry in advance, I'll tell you tomorrow when I review it properly.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 7/7] migration: Postpone the outgoing preempt channel for preempt_pre_7_2
2026-09-23 20:24 ` Peter Xu
@ 2026-09-23 22:30 ` Fabiano Rosas
0 siblings, 0 replies; 18+ messages in thread
From: Fabiano Rosas @ 2026-09-23 22:30 UTC (permalink / raw)
To: Peter Xu; +Cc: qemu-devel, Akash Kulhalli, Juraj Marcin
Peter Xu <peterx@redhat.com> writes:
> On Tue, Sep 22, 2026 at 08:34:41PM -0300, Fabiano Rosas wrote:
>> Peter Xu <peterx@redhat.com> writes:
>>
>> > This is the corresponding outgoing fix for the same problem mentioned in
>> > the previous patch.
>> >
>> > The idea is simple: either migration to an old QEMU or when TLS is enabled,
>> > we rely on correct ordering of channels to make it work: first main, then
>> > multifd, finally preempt.
>> >
>> > This patch re-orders multifd and postcopy preempt channel on outgoing side,
>> > but only for the old machine types where preempt_pre_7_2 set, to make it
>> > follow the right orders to create the channels.
>> >
>> > Keep the resume path alone because the resume path never involve multifd
>> > channels, even if multifd is enabled. For that, fun fact: when multifd is
>> > enabled with postcopy preempt, network interruption will break all multifd
>> > channels, but they're never re-connected, until they got recycled at the
>> > end of postcopy migration.
>>
>> Is this a separate bug? Do we need to add some cleanup?
>
> Not a bug? The resume path only happens during postcopy phase, during
> which multifd (even if enabled) is ignored.
>
Ah, I though you meant multifd+postcopy could leave multifd channels
behind in case of network failure.
>>
>> > OTOH, multifd_recv_all_channels_created()
>> > reports true even after postcopy network down, as multifd_recv_state->count
>> > is never decremented.
>> >
>>
>> Seems normal to me. We're not even trying to reconnect multifd.
>
> The clean way to do this is, whenever we recycled all the channels we reset
> it. Ideally they should have been recycled when switching to postcopy, but
> that's non-issue, I agree. It's just not that intuitive, IMHO. But I can
> definitely drop this paragraph if it caused confusions.
>
You're not wrong, but we can very well have something that counts up
when channels are created and doesn't count down when they are removed.
>>
>> > Fixes: e27418861288 ("migration: enable multifd and postcopy together")
>> > Signed-off-by: Peter Xu <peterx@redhat.com>
>> > ---
>> > migration/migration.c | 32 +++++++++++++++++++++++---------
>> > 1 file changed, 23 insertions(+), 9 deletions(-)
>> >
>> > diff --git a/migration/migration.c b/migration/migration.c
>> > index 4cc4077a76..f8d664808f 100644
>> > --- a/migration/migration.c
>> > +++ b/migration/migration.c
>> > @@ -3733,6 +3733,20 @@ static void *migration_thread(void *opaque)
>> > goto out;
>> > }
>> >
>> > + /*
>> > + * Only for old 7.1/7.2 machine types running on new binaries (that
>> > + * supports multifd+postcopy+preempt). Makes sure to initiate the
>> > + * connect() after multifd channels because the old (broken) binaries
>> > + * assumes the order of channels, which we cannot fix anymore.
>> > + *
>> > + * multifd_send_setup() will make sure all multifd channels will be
>> > + * connected first, then initiate preempt channel here guarantees the
>> > + * ordering to those old binaries.
>> > + */
>>
>> It's a bit confusing what's old binary, what's new binary here. Old/new
>
> Yeah, I used "new binaries" to reference 10.1+ on the first line (while in
> context of 7.1/7.2 machine types, they're "new"), but then used "old
> (broken) binaries" on the 3rd line (while in context of after fixing
> incoming side after previous patch, in which case not-fixed ones are
> "old").
>
> My bad, it's probably confusing whoever reads it.
>
> I wrote a new comment:
>
> /*
> * Only for old 7.1/7.2 machine types (preempt mode supported since
s/old//
> * 7.1). Connect the preempt channel only after multifd channels,
> * because some QEMU versions (v10.1 to v11.1) will assume the order of
> * channels to be: (1) main, then (2) multifd channels, then (3)
> * preempt channel. IOW, (3) must be after (2).
The last part is not necessary.
> *
> * multifd_send_setup() makes sure all multifd channels be connected
> * first, then initiate preempt channel here guarantees the ordering to
> * those QEMU binaries.
> */
>
Thanks, that's better.
>> don't really apply I think as there are more than two cases when we look
>> at the global picture. There's before 7.1, before 7.2, before the
>> preempt_pre_7_2 flag, before the multifd+postcopy support, before this
>
> Most things before multifd+postcopy work do not matter much, because as you
> also mentioned these binaries can't enable both features, so it is not a
> concern in term of channel misorders.
>
>> series, etc. Specially since this code is exactly the same as the one
>> under if (resume), but there we're talking about a different new/old.
>
> Just to mention, we need that separate connection for resuming case below
> in migration_start_outgoing(), because the resuming case doesn't start a
> new migration_thread but reuse the old one. It means that's the only place
> we can reconnect the preempt channel in resume case.
>
>>
>> Also, maybe we should avoid framing the assumption on the order of
>> channels as "broken", that's how it always worked and is just a case of
>> unimaginative assumptions, i.e. not knowing multifd would ever run along
>> preempt. The real bug is that v10.1 added a "new" channel to the mix
>> without working on compatibility.
>
> Yes, I feel like we're on the same page. I think it was used to how it
> always worked before multifd+postcopy merged. After it merged, it's not
> how it worked, it should never worked, IIUC, hence "broken" after 10.1+.
>
>>
>> In this series you're doing both: fixing the bug that v10.1 introduced
>> and improving the code to not assume the order of channels.
>
> Note that relying on order of channels are actually OK in 99.9% cases.. So
> that's why I tend to make it a "fix", even if it smells like a feature.
>
> Or say, I'll backport this whole series, when ready, to our zstream, as a
> fix too. This is the smallest change set I can come up with even if it
> contains something looks like a feature..
>
Yeah, I was trying to come up with a simple fix you could backport where
we could just check s->preempt_pre_7_2 during discovery and force the
order to be correct, but it didn't work.
>>
>> > + if (migrate_postcopy_preempt() && s->preempt_pre_7_2) {
>> > + postcopy_preempt_setup(s);
>> > + }
>>
>> Don't you want to check for multifd as well and apply this fix only to
>> the case that can actually trigger it? To avoid inadvertently changing
>> the normal postcopy case.
>
> It's my intention to move this for both cases when multifd is enabled or
> not, because I think it's simpler and cleaner.
>
> If I check multifd here, I'll need to move the migration_start_outgoing()
> code below to check !multifd instead, it'll look like:
>
> migration_start_outgoing()
> ...
> if (resume || !multifd)
> connect_preempt();
> if (resume)
> ...
>
> It looks uglier, so I chose this path forward. It seems all safe.
>
Ok, maybe add some words saying you intend to affect both cases.
>>
>> > +
>> > bql_lock();
>> > qemu_savevm_state_header(s->to_dst_file);
>> > bql_unlock();
>> > @@ -4013,16 +4027,16 @@ void migration_start_outgoing(MigrationState *s)
>> > open_return_path_on_source(s);
>> > }
>> >
>> > - /*
>> > - * This needs to be done before resuming a postcopy. Note: for newer
>> > - * QEMUs we will delay the channel creation until postcopy_start(), to
>> > - * avoid disorder of channel creations.
>> > - */
>> > - if (migrate_postcopy_preempt() && s->preempt_pre_7_2) {
>> > - postcopy_preempt_setup(s);
>> > - }
>> > -
>>
>> Hm, this used to happen before qmp_migrate() returns. Now it's in the
>
> I think qmp_migrate() should have returned already when creating preempt
> channel, either on master or after applying this patch?
>
> Only socket based URI can use preempt mode, so when reaching here (say, on
> master branch), it should be part of socket_outgoing_migration(), async
> operation of qio_channel_socket_connect_async().
>
Yes, of course, I forgot it's async.
>> migration thread and after multifd channels connect, there's a big
>> window there. We added a lot of code to ensure cleanup of multifd
>> happens properly and without races with TLS thread creation, etc. Have
>> you considered such issues?
>
> Hmm, I'm not aware of the races with TLS thread issue.
>
> /me asks for more hints..
>
Oh, the work we did to ensure cleanup doesn't happen before all threads
are up and running. The semaphore for multifd when creating channels I
added and the changes to tls_thread_created you did. Nevermind, I got
confused with the async part above.
>>
>> > if (resume) {
>> > + /*
>> > + * This needs to be done before resuming a postcopy. Note: for newer
>> > + * QEMUs we will delay the channel creation until postcopy_start(), to
>> > + * avoid disorder of channel creations.
>> > + */
>> > + if (migrate_postcopy_preempt() && s->preempt_pre_7_2) {
>> > + postcopy_preempt_setup(s);
>> > + }
>> > +
>> > /* Wakeup the main migration thread to do the recovery */
>> > migrate_set_state(&s->state, MIGRATION_STATUS_POSTCOPY_RECOVER_SETUP,
>> > MIGRATION_STATUS_POSTCOPY_RECOVER);
>>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 6/7] migration: Fix incoming channel race with multifd and preempt_pre_7_2
2026-09-16 21:35 ` [PATCH 6/7] migration: Fix incoming channel race with multifd and preempt_pre_7_2 Peter Xu
2026-09-23 15:54 ` Fabiano Rosas
@ 2026-09-24 21:54 ` Fabiano Rosas
2026-09-28 19:22 ` Peter Xu
1 sibling, 1 reply; 18+ messages in thread
From: Fabiano Rosas @ 2026-09-24 21:54 UTC (permalink / raw)
To: Peter Xu, qemu-devel; +Cc: Peter Xu, Akash Kulhalli, Juraj Marcin
Peter Xu <peterx@redhat.com> writes:
> PROBLEM
> =======
>
> Migration reliably hangs with old machine types (7.2-) when these migration
> capabilities are enabled: multifd, postcopy-ram, postcopy-preempt.
>
> Simplest reproducer :
>
> $ QTEST_QEMU_MACHINE_TYPE=pc-q35-7.2 \
> QTEST_QEMU_BINARY=./qemu-system-x86_64 \
> ./tests/qtest/migration-test --full \
> -r /x86_64/migration/multifd+postcopy/preempt/plain
>
> Current workaround is to kill destination QEMU, cancel the migration on
> source (with/without yank), disable one or more of the features, and retry.
>
> The hang is caused by receiving preempt channel before most of the multifd
> channels, the peek buffer operation will stuck forever.
>
> Incoming side QEMU hang (with relevant tracepoints enabled):
>
> migrate_set_state new state setup
> migration_socket_incoming_accepted
> migration_set_incoming_channel ioc=0x557d82c1caa0 ioctype=qio-channel-socket
> migration_socket_incoming_accepted
> migration_set_incoming_channel ioc=0x557d83023840 ioctype=qio-channel-socket
> multifd_recv_new_channel channel 1
> migration_socket_incoming_accepted
> migration_set_incoming_channel ioc=0x557d830c08c0 ioctype=qio-channel-socket
> multifd_recv_new_channel channel 0
> multifd_recv_thread_start 1
> migration_socket_incoming_accepted
> migration_set_incoming_channel ioc=0x557d8284a010 ioctype=qio-channel-socket
> multifd_recv_thread_start 0
> multifd_recv_unfill channel 0 packet_num 0 flags 0x1 next packet size 0
> multifd_recv_unfill channel 1 packet_num 1 flags 0x1 next packet size 0
> [dest qemu hangs here]
>
> Incoming side backtrace:
>
> __syscall_cancel_arch
> __internal_syscall_cancel
> __syscall_cancel
> recvmsg
> qio_channel_socket_readv
> qio_channel_readv_full
> migration_channel_read_peek
> migration_channel_identify
> migration_channel_process_incoming
> socket_accept_incoming_migration
> qio_net_listener_channel_func
> qio_channel_fd_source_dispatch
> g_main_context_dispatch_unlocked.lto_priv
> g_main_context_dispatch
> glib_pollfds_poll
> os_host_main_loop_wait
> main_loop_wait
> qemu_main_loop
> qemu_default_main
> main
>
> This patch tries to fix it, from incoming side first. This patch alone
> should enable single-direction migration to this new QEMU. The next patch
> will propose a fix for the outgoing path, fixing new->old migrations.
>
> BACKGROUND
> ==========
>
> preempt_pre_7_2 used to be a flag marking QEMU releases 7.1/7.2 only
> because they have a flaw on channel establishment on preempt channel.
>
> Now, after we have multifd + postcopy support, new QEMU binaries can
> migrate old machine types with both features enabled. Juraj reported
> constant migration hang at the very beginning for those old machine types
> in our downstream systems with such setup. Juraj found it's because of
> this flag.
>
> QEMU source initiates channels in this order on current master when both
> features enabled with postcopy-preempt mode:
>
> - First, main channel connect() happens,
> - Second, postcopy_preempt_setup() invokes connect() for preempt channel,
> - Last, in migration_thread(), multifd_send_setup() invokes connect()s
> for all the multifd channels
>
> However on an old QEMU, it expect the channels arrive in order of
> "main"->"multifd"->"preempt". Even on a new QEMU, the destination expects
> the same order of arrival on the channels when the channels are not
> peekable.
>
> For peekable channels (non-tls sockets), this time we'll likely see preempt
> channel appearing very soon, peeking at it causing main thread hang, like
> mentioned in the PROBLEM section above.
>
> SOLUTION
> ========
>
> One major problem of current hang is we try to peek at preempt channel,
> which offers nothing at the beginning.
>
> Since we'll need to accept stream from old binaries, arrival of preempt
> channel early is unavoidable.
>
> What we can do, though, is to allow concurrent monitoring of all channels
> rather than one. Meanwhile, we shouldn't peek at anything that has no
> data.
>
> migration_channel_read_peek() almost does the wait, but it's too late.
> This patch proposes to watch all channels from the start without reading at
> them at all, relying on an IO watch attached. This will make sure (1) for
> preempt channel, we never read on it (watch can be gracefully disarmed when
> we know it's preempt channel later) (2) since we have one IO watch for each
> channel, then we can allow accept() to happen in almost any order, process
> only when there's some header to read.
>
> To maintain these watches, a new GArray @channels_early is introduced, with
> each element to be a (ioc, GSource) tuple (@MigEarlyIncomingChannel), so
> that QEMU can manage all the IO watches later with it. Here I used GSource
> rather than io_tag because the GSource may or may not be attached to the
> default main thread gcontext: when OOB is used, it may be the iothread
> context instead. IOW, g_source_remove() on io_tags stops working, which
> only works for default main context.
>
> The trick this patch used is when we have the ability to wait on all
> channel headers at the same time, we pick one by one from main and multifd
> channels (since both of the types will contain headers dumped right at the
> very beginning), leave preempt channel alone. It means, after dest QEMU
> finds all main and multifd channels, there are three possibilities:
>
> - If preempt not enabled, we finished full channel establishment, done.
>
> - If preempt enabled,
>
> - If we have one registered IO watch with the IOC, it must be the
> preempt channel,
>
> - If we have no further IO watch, wait for the next accept(), which
> must be the preempt channel.
>
> This will make channel establish work on incoming side even with the old
> QEMU binaries.
>
> While working on it, I managed to refactor the peeking logic quite a bit:
> we used to have a very convoluted migration_channel_identify() function,
> taking care of two different cases:
>
> (1) when the channel is peekable (like normal socket channels),
> (2) when the channel is not peekable (like TLS or file migrations).
>
> This patch refactored that part to make it crystal clear on how we make
> decisions on which channel is which, and split the peek/identify paths.
>
> One example incoming migration from pc-q35-7.2 after this patch applied,
> and with relevant tracepoints set (8 multifd channels, 1 preempt channel):
>
> migrate_set_state new state setup
> migration_channel_process_incoming ioc=0x557dc8af4e20 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc8af4e20 ioctype=qio-channel-socket
> migration_channel_process_incoming ioc=0x557dc8abc5d0 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc8abc5d0 ioctype=qio-channel-socket
> migration_channel_process_incoming ioc=0x557dc953d680 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc953d680 ioctype=qio-channel-socket
> migration_set_incoming_channel ioc=0x557dc8abc5d0 ioctype=qio-channel-socket type=MULTIFD
> migration_channel_process_incoming ioc=0x557dc898a820 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc898a820 ioctype=qio-channel-socket
> migration_set_incoming_channel ioc=0x557dc953d680 ioctype=qio-channel-socket type=MULTIFD
> migration_channel_process_incoming ioc=0x557dc919bd70 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc919bd70 ioctype=qio-channel-socket
> migration_set_incoming_channel ioc=0x557dc898a820 ioctype=qio-channel-socket type=MULTIFD
> migration_channel_process_incoming ioc=0x557dc8734b20 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc8734b20 ioctype=qio-channel-socket
> migration_set_incoming_channel ioc=0x557dc919bd70 ioctype=qio-channel-socket type=MULTIFD
> migration_channel_process_incoming ioc=0x557dc898bdf0 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc898bdf0 ioctype=qio-channel-socket
> migration_set_incoming_channel ioc=0x557dc8734b20 ioctype=qio-channel-socket type=MULTIFD
> migration_channel_process_incoming ioc=0x557dc968cfd0 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc968cfd0 ioctype=qio-channel-socket
> migration_set_incoming_channel ioc=0x557dc898bdf0 ioctype=qio-channel-socket type=MULTIFD
> migration_channel_process_incoming ioc=0x557dc8c31810 ioctype=qio-channel-socket
> migration_incoming_channel_watch ioc=0x557dc8c31810 ioctype=qio-channel-socket
> migration_set_incoming_channel ioc=0x557dc968cfd0 ioctype=qio-channel-socket type=MULTIFD
> migration_set_incoming_channel ioc=0x557dc8c31810 ioctype=qio-channel-socket type=MULTIFD
> migration_set_incoming_channel ioc=0x557dc8af4e20 ioctype=qio-channel-socket type=MAIN
> migration_start_incoming
> migrate_set_state new state active
> migration_channel_process_incoming ioc=0x557dc8966160 ioctype=qio-channel-socket
> migration_set_incoming_channel ioc=0x557dc8966160 ioctype=qio-channel-socket type=PREEMPT
>
> While at it, I renamed the four channel incoming/outgoing tracepoints, make
> all to follow migration_[incoming|outgoing]_channel_*(). Especially for
> incoming, then we can enable migration_incoming_channel* for incoming
> channel debuggings.
>
> FINAL NOTE ON TLS
> =================
>
> Note that this solution isn't a magic bullet fixing everything. TLS is not
> fixable with this approach because TLS isn't peekable channel, hence the
> watch won't help.
>
> We can have other ways to hack it to make it work, e.g. we can make TLS
> channels peekable too, but I don't want to pollute the TLS iochannel only
> for this: let's hope handshake will arrive soon so we can drop these code.
>
> For now, when TLS is involved with such old machine type (7.2-), one needs
> to migrate it out with any combination of features except enabling all
> four (multifd + TLS + postcopy + preempt) to a patched binary, after that,
> all combinations will start working.
>
> BugLink: https://redhat.atlassian.net/browse/RHEL-254933
> Fixes: e27418861288 ("migration: enable multifd and postcopy together")
> Reported-by: Juraj Marcin <jmarcin@redhat.com>
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
> migration/channel.h | 3 +
> migration/migration.h | 35 ++++
> migration/channel.c | 414 +++++++++++++++++++++++++++++++++++------
> migration/migration.c | 23 ++-
> migration/trace-events | 7 +-
> 5 files changed, 421 insertions(+), 61 deletions(-)
Hi Peter, I think the code looks good, but there are some twists and
turns that I think we can get rid of. I put a fixup patch [1] at the end
with my suggestions and mentioned inline what I changed and why.
>
> diff --git a/migration/channel.h b/migration/channel.h
> index 678712f291..40bd339a3e 100644
> --- a/migration/channel.h
> +++ b/migration/channel.h
> @@ -49,4 +49,7 @@ bool migration_channel_parse_input(const char *uri,
> MigrationChannel **main_channelp,
> MigrationChannel **cpr_channelp,
> Error **errp);
> +
> +void migration_incoming_free_early_channels(MigrationIncomingState *mis);
> +
> #endif
> diff --git a/migration/migration.h b/migration/migration.h
> index 683bc7bdd5..6f23e1805b 100644
> --- a/migration/migration.h
> +++ b/migration/migration.h
> @@ -90,6 +90,28 @@ typedef enum {
> PREEMPT_THREAD_QUIT,
> } PreemptThreadStatus;
>
> +typedef struct {
> + /*
> + * The GSource we have allocated to track G_IO_IN events for the
> + * channel. Note: it may not be attached to the default main gcontext,
> + * for example, when in case of io watch created during an OOB
> + * migrate-recover command.
> + */
> + GSource *source;
> + /* The channel we will identify later after getting some buffers to read */
> + QIOChannel *ioc;
> +} MigEarlyIncomingChannel;
> +
> +typedef struct {
> + GArray *channels;
> + /*
> + * In most cases, channels are only operated with BQl, but since we
> + * have OOB command support, don't assume it, just use a standalone
> + * mutex to protect any access to the channels array.
> + */
> + QemuMutex mutex;
> +} MigEarlyIncomingChannels;
> +
> /* State for the incoming migration */
> struct MigrationIncomingState {
> QEMUFile *from_src_file;
> @@ -255,6 +277,19 @@ struct MigrationIncomingState {
>
> /* Do exit on incoming migration failure */
> bool exit_on_error;
> +
> + /*
> + * Maintains all channels only at early stage. After incoming
> + * migration started, this should be an empty array and no use anymore.
> + *
> + * TODO: we logically only need this to make new QEMU binaries work for
> + * old machines who have @preempt_pre_7_2 set on the source, but it's
> + * also good to have this early stage anyway, making sure when peek the
> + * channel there will be something in the channel. Ideally, we should
> + * manage all migration channels in the future with proper headers,
> + * then we can drop this.
> + */
> + MigEarlyIncomingChannels channels_early;
> };
>
> MigrationIncomingState *migration_incoming_get_current(void);
> diff --git a/migration/channel.c b/migration/channel.c
> index b9065efd03..acb7ef5206 100644
> --- a/migration/channel.c
> +++ b/migration/channel.c
> @@ -12,6 +12,8 @@
>
> #include "qemu/osdep.h"
> #include "qemu/cutils.h"
> +#include "qemu/main-loop.h"
> +#include "qemu/error-report.h"
> #include "channel.h"
> #include "exec.h"
> #include "fd.h"
> @@ -146,61 +148,84 @@ bool migration_has_all_channels(void)
> return true;
> }
>
> -static MigChannelType migration_channel_identify(MigrationIncomingState *mis,
> - QIOChannel *ioc, Error **errp)
> +static bool qio_channel_is_peekable(QIOChannel *ioc)
> +{
> + return qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_READ_MSG_PEEK);
> +}
> +
> +/*
> + * With multiple channels, it is possible that we receive channels out of
> + * order on destination side, causing incorrect mapping of source channels
> + * on destination side.
> + *
> + * When the channel is peekable (e.g. non-TLS socket channels), check
> + * channel MAGIC to decide type of channel.
> + *
> + * Please note this is best effort, postcopy preempt channel does not send
> + * any magic number so avoid it for postcopy live migration.
> + *
> + * Returns: >0 if success, ==0 (CH_NONE) if error. If error happened,
> + * *errp must be set.
> + */
> +static MigChannelType migration_channel_peek(MigrationIncomingState *mis,
> + QIOChannel *ioc,
> + Error **errp)
> {
> MigChannelType channel = CH_NONE;
> uint32_t channel_magic = 0;
> int ret = 0;
>
> - if (!migration_has_main_and_multifd_channels()) {
> - if (qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_READ_MSG_PEEK)) {
> - /*
> - * With multiple channels, it is possible that we receive channels
> - * out of order on destination side, causing incorrect mapping of
> - * source channels on destination side. Check channel MAGIC to
> - * decide type of channel. Please note this is best effort,
> - * postcopy preempt channel does not send any magic number so
> - * avoid it for postcopy live migration. Also tls live migration
> - * already does tls handshake while initializing main channel so
> - * with tls this issue is not possible.
> - */
> - ret = migration_channel_read_peek(ioc, (void *)&channel_magic,
> - sizeof(channel_magic), errp);
> - if (ret != 0) {
> - goto out;
> - }
> + assert(qio_channel_is_peekable(ioc));
>
> - channel_magic = be32_to_cpu(channel_magic);
> - if (channel_magic == QEMU_VM_FILE_MAGIC) {
> - channel = CH_MAIN;
> - } else if (channel_magic == MULTIFD_MAGIC) {
> - assert(migrate_multifd());
> - channel = CH_MULTIFD;
> - } else if (!mis->from_src_file &&
> - mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {
> - /* reconnect main channel for postcopy recovery */
> - channel = CH_MAIN;
> - } else {
> - error_setg(errp, "unknown channel magic: %u", channel_magic);
> - }
> - } else if (mis->from_src_file && migrate_multifd()) {
> - /*
> - * Non-peekable channels like tls/file are processed as
> - * multifd channels when multifd is enabled.
> - */
> - channel = CH_MULTIFD;
> - } else if (!mis->from_src_file) {
> - channel = CH_MAIN;
> - } else {
> - error_setg(errp, "non-peekable channel used without multifd");
> - }
> + ret = migration_channel_read_peek(ioc, (void *)&channel_magic,
> + sizeof(channel_magic), errp);
> + if (ret != 0) {
> + /* Failed */
> + return channel;
> + }
> +
> + channel_magic = be32_to_cpu(channel_magic);
> +
> + if (channel_magic == QEMU_VM_FILE_MAGIC) {
> + channel = CH_MAIN;
> + } else if (channel_magic == MULTIFD_MAGIC) {
> + assert(migrate_multifd());
> + channel = CH_MULTIFD;
> + } else if (!mis->from_src_file &&
> + mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {
> + /* reconnect main channel for postcopy recovery */
> + channel = CH_MAIN;
This is not peeking, maybe it should be somewhere else. Not this patch's
fault, we can think about it some other day.
> } else {
> + error_setg(errp, "Unknown channel magic: %u", channel_magic);
> + }
> +
> + return channel;
> +}
> +
> +/*
> + * Returns: >0 if success, ==0 (CH_NONE) if error. If error happened,
> + * *errp must be set.
> + */
> +static MigChannelType migration_channel_identify(MigrationIncomingState *mis,
> + QIOChannel *ioc, Error **errp)
> +{
> + MigChannelType channel = CH_NONE;
> +
> + if (migration_has_main_and_multifd_channels()) {
> assert(migrate_postcopy_preempt());
> channel = CH_POSTCOPY;
This check is the same as the one at
migration_channel_process_incoming(). I think we can simplify this.
See [1].
> + } else if (!mis->from_src_file) {
> + channel = CH_MAIN;
> + } else if (migrate_multifd()) {
> + /*
> + * Non-peekable channels like tls/file are processed as
> + * multifd channels when multifd is enabled.
> + */
> + channel = CH_MULTIFD;
> + } else {
> + error_setg(errp, "Unexpected non-peekable channel observed");
> }
>
> -out:
> return channel;
> }
>
> @@ -214,31 +239,275 @@ static void migration_incoming_error_propagate(MigrationIncomingState *mis,
> }
> }
>
> +/* Must be with mis->channels_early.mutex held */
> +static void
> +migration_incoming_early_channel_insert(MigrationIncomingState *mis,
> + QIOChannel *ioc,
> + GSource *source)
> +{
> + MigEarlyIncomingChannel chan = {
> + .source = source,
> + .ioc = ioc,
> + };
> +
> + object_ref(OBJECT(ioc));
> + g_source_ref(source);
> +
> + g_array_append_val(mis->channels_early.channels, chan);
> +}
> +
> +static void migration_incoming_early_channel_free(GArray *channels, int i)
> +{
> + MigEarlyIncomingChannel *chan;
> +
> + chan = &g_array_index(channels, MigEarlyIncomingChannel, i);
> +
> + g_source_destroy(chan->source);
> + g_source_unref(chan->source);
> + object_unref(OBJECT(chan->ioc));
> +
> + g_array_remove_index_fast(channels, i);
> +}
> +
> +/*
> + * Remove this channel from the monitoring of @channels_early array.
> + * Return true if found and successful, false otherwise.
> + */
> +static bool
> +migration_incoming_early_channel_remove(MigrationIncomingState *mis,
> + QIOChannel *ioc)
> +{
> + GArray *channels = mis->channels_early.channels;
> + MigEarlyIncomingChannel *chan;
> + int i;
> +
> + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
> +
> + for (i = 0; i < channels->len; i++) {
> + chan = &g_array_index(channels, MigEarlyIncomingChannel, i);
> + if (chan->ioc != ioc) {
> + continue;
> + }
> + migration_incoming_early_channel_free(channels, i);
> + return true;
> + }
> +
> + return false;
> +}
> +
> +void migration_incoming_free_early_channels(MigrationIncomingState *mis)
> +{
> + GArray *channels = mis->channels_early.channels;
> +
> + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
> +
> + while (channels->len) {
> + migration_incoming_early_channel_free(channels, 0);
> + }
> +}
> +
> +static bool migration_incoming_setup_channel(QIOChannel *ioc,
> + MigChannelType ch,
> + Error **errp)
> +{
> + trace_migration_incoming_channel_set(ioc,
> + object_get_typename(OBJECT(ioc)),
> + mig_channel_str[ch]);
> + migration_ioc_register_yank(ioc);
> + /* TODO: make this return the success status instead */
> + migration_incoming_setup(ioc, ch, errp);
I implemented this TODO. It allows us to skip the main+mfd check after
starting migration because migration_incoming_setup() already returns
that value. See [1].
> +
> + return *errp == NULL;
> +}
> +
> static bool migration_incoming_channel_install(MigrationIncomingState *mis,
> QIOChannel *ioc,
> Error **errp)
> {
> - MigChannelType ch = migration_channel_identify(mis, ioc, errp);
> + MigChannelType ch;
> + bool ret;
> +
> + if (qio_channel_is_peekable(ioc)) {
This check is redundant, we can only arrive here via the watch and we
checked peekable already at migration_channel_process_incoming. See [1].
> + ch = migration_channel_peek(mis, ioc, errp);
> + } else {
> + ch = migration_channel_identify(mis, ioc, errp);
> + }
>
> if (!ch) {
> - assert(*errp);
> return false;
> }
>
> - trace_migration_set_incoming_channel(ioc,
> - object_get_typename(OBJECT(ioc)),
> - mig_channel_str[ch]);
> - migration_ioc_register_yank(ioc);
> + ret = migration_incoming_setup_channel(ioc, ch, errp);
> + if (!ret) {
> + return false;
> + }
>
> - if (migration_incoming_setup(ioc, ch, errp)) {
> + /* Installation succeeded, kickoff migration if needed */
> + if (migration_has_main_and_multifd_channels()) {
> migration_start_incoming();
> }
>
> - if (*errp) {
> - return false;
> + return true;
> +}
> +
> +static void
> +migration_incoming_channel_preempt_setup(QIOChannel *ioc)
> +{
> + assert(migrate_postcopy_preempt());
> + /* Installation of preempt channel should never fail */
> + migration_incoming_setup_channel(ioc, CH_POSTCOPY, &error_abort);
> +}
> +
> +static void
> +migration_incoming_detect_preempt_channel(MigrationIncomingState *mis)
> +{
> + GArray *channels = mis->channels_early.channels;
> + MigEarlyIncomingChannel *chan;
> +
> + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
> +
> + /* When preempt mode not enabled, nothing to detect.. */
> + if (!migrate_postcopy_preempt()) {
> + /*
> + * .. but if we found something pending, throw an error only, which
> + * should not happen. Even if it happens, resources will still be
> + * released after incoming migration is completedly.
> + */
> + if (channels->len) {
> + error_report("%s: Found %u unused channels",
> + __func__, channels->len);
> + }
> + return;
> }
>
> - return true;
> + /* Preempt channel hasn't yet arrived? Process it later */
> + if (!channels->len) {
> + return;
> + }
> +
> + /*
> + * More than one channel should never happen.. capture it in case if
> + * it happens, then there's not much we can do.
> + */
> + if (channels->len > 1) {
> + error_report("%s: Found %u unused channels, "
> + "can't identify preempt channel",
> + __func__, channels->len);
> + return;
> + }
> +
> + assert(channels->len == 1);
> + /* This is the preempt channel, install it directly */
> + chan = &g_array_index(channels, MigEarlyIncomingChannel, 0);
> + migration_incoming_channel_preempt_setup(chan->ioc);
> + migration_incoming_early_channel_free(channels, 0);
> +}
> +
> +static gboolean migration_incoming_channel_readable(QIOChannel *ioc,
> + GIOCondition condition,
> + gpointer opaque)
> +{
> + MigrationIncomingState *mis = opaque;
> + Error *local_err = NULL;
> +
> + /*
> + * No need to monitor this channel anymore as long as anything arrived,
> + * remove it from tracking.
> + *
> + * NOTE: this means if partial data arrived we may still block here,
> + * but it shouldn't happen in production, only malicious stream. Since
> + * migration stream is trusted (either due to trusted network, or TLS),
> + * that's non-issue.
Could we check the amount of data and keep waiting?
> + *
> + * NOTE2: this will also release the ioc ref that we used to hold, but
> + * it's fine since we have at least one more refcount in the current
> + * event handler.
I don't understand "one more ref in the event handler". Looks like
you're trying to say the refcount is consistent, but why even mention
it? I may be missing something.
> + *
> + * NOTE3: it's theoretically possible that this entry is gone reaching
> + * here. Example: the main thread is doing incoming cleanup having this
> + * one removed, while this watch can be registered on the monitor
> + * iothread's context and fired at the exact same time but in the
> + * iothread instead. If it happens, skip the rest. I'm not sure if
> + * this could happen at all, may depend on iothread lifespan management
> + * in the main thread, but be prepared.
I wonder if we should extend the locking a bit further. Not because of
what you mentioned here^, but because everything the code running on the
monitor thread touches can race with changes from the main loop. All of
these migrate_foo_bar() helpers, the QEMUFiles, caps, params, etc.
> + */
> + if (!migration_incoming_early_channel_remove(mis, ioc)) {
> + goto out;
> + }
> +
I moved the peek into here and passed the already identified
channel into migration_incoming_channel_install(). See [1].
> + if (!migration_incoming_channel_install(mis, ioc, &local_err)) {
> + goto out;
> + }
> +
> + if (migration_has_main_and_multifd_channels()) {
This check became redundant because the _setup routine already returns
it. See [1].
> + /*
> + * Possibilities when reaching here:
> + *
> + * (1) if preempt not enabled, this should be no-op, all done,
> + * (2) if preempt enabled,
> + * (2.a) preempt channel arrived @channels_early, handle it now
> + * (2.b) preempt channel not arrived, to be handled in
> + * migration_channel_process_incoming() later
> + */
> + migration_incoming_detect_preempt_channel(mis);
Moved this into migration_incoming_channel_install(). See [1].
> + }
> +
> +out:
> + if (local_err) {
> + migration_incoming_error_propagate(mis, local_err);
> + }
> +
> + /*
> + * NOTE: we should have already detached the GSource, returning
> + * G_SOURCE_REMOVE to be logically consistent only.
> + */
> + return G_SOURCE_REMOVE;
> +}
> +
> +static void migration_incoming_channel_watch(MigrationIncomingState *mis,
> + QIOChannel *ioc)
> +{
> + GMainContext *context = g_main_context_get_thread_default();
> + GSource *source;
> + guint io_tag;
> +
> + trace_migration_incoming_channel_watch(ioc,
> + object_get_typename(OBJECT(ioc)));
> +
> + /*
> + * Careful: this can be run from either the main thread or the monitor
> + * iothread when migrate_recover is used with OOB=on, so we need to
> + * take the lock and use the full version to specify the correct
> + * context.
> + */
> + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
> +
> + /*
> + * We should never watch an @ioc that is not peekable, because there's
> + * no point. What is worse is we lose the real order of accept()s via
> + * the asynchronous IO watch operation.
> + *
> + * Another note is TLS channel (non-peekable) may or may not work
> + * properly with IO watch due to its current .io_create_watch() impl,
> + * which is another story. Just guard both points.
> + */
> + assert(qio_channel_is_peekable(ioc));
> + io_tag = qio_channel_add_watch_full(ioc, G_IO_IN,
> + migration_incoming_channel_readable,
> + mis, NULL, context);
> +
> + /*
> + * Replace this if one day qio_channel_add_watch*() API can directly
> + * return the GSource*.. for now, stick with it.
> + */
> + source = g_main_context_find_source_by_id(context, io_tag);
> + /*
> + * Nothing can race with adding the IO watch, aka, concurrent removal
> + * is not possible when we have the lock. So it must be present.
> + */
> + assert(source);
> +
> + migration_incoming_early_channel_insert(mis, ioc, source);
> }
>
> /**
> @@ -254,13 +523,44 @@ void migration_channel_process_incoming(QIOChannel *ioc)
> MigrationIncomingState *mis = migration_incoming_get_current();
> Error *local_err = NULL;
>
> - trace_migration_channel_process_incoming(
> + trace_migration_incoming_channel_process(
> ioc, object_get_typename(OBJECT(ioc)));
>
> if (migrate_channel_requires_tls_upgrade(ioc)) {
> migration_tls_channel_process_incoming(ioc, &local_err);
> } else {
> - migration_incoming_channel_install(mis, ioc, &local_err);
> + if (migration_has_main_and_multifd_channels()) {
The fact that this check must come before everything is a major
weirdness. In fact, this is conceptually the same case as the first
branch in migration_channel_identify(). I therefore moved that function
to this point and added a comment explaining why this must come
first. See [1].
> + /*
> + * If all main+multifd channels are present already, this must
> + * be the preempt channel.
> + *
> + * QEMU can't register an IO watch for it if there is only the
> + * last preempt channel left, because it means the IO watch
> + * will never fire and nobody will pick it up: we rely on the
> + * one before the last one to pick both.
> + *
> + * See comment in migration_incoming_channel_readable() on
> + * the migration_incoming_detect_preempt_channel() call.
> + */
> + migration_incoming_channel_preempt_setup(ioc);
> + } else {
> + /*
> + * Register an IO watch for peekable channels, so that channels
> + * can be accept()ed with any order.
> + *
> + * Non-peekable channels (file, TLS, etc.) cannot register IO
> + * watch, not only because there's no data to look at to help
> + * making the decision, but also because after registering we
> + * will lose the real ordering we get from accept(), which is
> + * still so far the only source of truth to identify a channel
> + * in such case.
> + */
> + if (qio_channel_is_peekable(ioc)) {
I moved this line into migration_channel_identify(). That way we ensure
the ordering regarding the main+mfd check. The watch is still installed
at this point. See [1].
> + migration_incoming_channel_watch(mis, ioc);
> + } else {
> + migration_incoming_channel_install(mis, ioc, &local_err);
This invocation of install does not check for the preempt channel after
it returns. Is this simply assuming that if a non-peekable channel is
present then there will be no preempt channel at all?
Or if main+TLS is the first channel, then the next channel will be
preempt and already enter the first branch?
> + }
> + }
> }
>
> if (local_err) {
> @@ -270,7 +570,7 @@ void migration_channel_process_incoming(QIOChannel *ioc)
>
> void migration_channel_connect_outgoing(MigrationState *s, QIOChannel *ioc)
> {
> - trace_migration_set_outgoing_channel(ioc, object_get_typename(OBJECT(ioc)));
> + trace_migration_outgoing_channel_set(ioc, object_get_typename(OBJECT(ioc)));
>
> if (migrate_channel_requires_tls_upgrade(ioc)) {
> Error *local_err = NULL;
> diff --git a/migration/migration.c b/migration/migration.c
> index cfadcc79c2..4cc4077a76 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -334,6 +334,10 @@ void migration_object_init(void)
> current_incoming->page_requested = g_tree_new(page_request_addr_cmp);
>
> current_incoming->exit_on_error = INMIGRATE_DEFAULT_EXIT_ON_ERROR;
> + /* zero_terminated=false, clear_=true */
There's an extra _ after 'clear' I think.
> + current_incoming->channels_early.channels =
> + g_array_new(FALSE, TRUE, sizeof(MigEarlyIncomingChannel));
> + qemu_mutex_init(¤t_incoming->channels_early.mutex);
>
> migration_object_check(current_migration, &error_fatal);
>
> @@ -447,6 +451,24 @@ void migration_incoming_state_destroy(void)
> MigrationIncomingState *mis = migration_incoming_get_current();
> PostcopyState ps = postcopy_state_get();
>
> + /* Cleanup listener to make sure no further accept() for sockets */
> + migration_incoming_transport_cleanup(mis);
> +
> + /*
> + * It's safer to free channel watches earlier than most of the rest, in
> + * case the IO watches could fire in the monitor iothread concurrently
> + * against this function.
Now I'm getting worried. Cleanup races are super annoying. This is
"just" about the recovery command, right?
> + *
> + * Above migration_incoming_transport_cleanup() should have disarmed
> + * anything that we could accept() new sockets.
> + *
> + * Here return of migration_incoming_free_early_channels() makes sure
> + * even if something already fired concurrently, it won't really do
> + * anything but return - see migration_incoming_early_channel_remove()
> + * and its return code for details.
> + */
> + migration_incoming_free_early_channels(mis);
> +
> multifd_recv_cleanup();
>
> if (ps != POSTCOPY_INCOMING_NONE) {
> @@ -491,7 +513,6 @@ void migration_incoming_state_destroy(void)
> mis->postcopy_remote_fds = NULL;
> }
>
> - migration_incoming_transport_cleanup(mis);
> qemu_event_reset(&mis->main_thread_load_event);
>
> if (mis->page_requested) {
> diff --git a/migration/trace-events b/migration/trace-events
> index 9ef42f54d1..c408deeb72 100644
> --- a/migration/trace-events
> +++ b/migration/trace-events
> @@ -207,9 +207,10 @@ migration_start_incoming(void) ""
> migration_transferred_bytes(uint64_t qemu_file, uint64_t multifd, uint64_t rdma) "qemu_file %" PRIu64 " multifd %" PRIu64 " RDMA %" PRIu64
>
> # channel.c
> -migration_channel_process_incoming(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
> -migration_set_incoming_channel(void *ioc, const char *ioctype, const char *type) "ioc=%p ioctype=%s type=%s"
> -migration_set_outgoing_channel(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
> +migration_outgoing_channel_set(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
> +migration_incoming_channel_process(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
> +migration_incoming_channel_set(void *ioc, const char *ioctype, const char *type) "ioc=%p ioctype=%s type=%s"
> +migration_incoming_channel_watch(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
>
> # global_state.c
> migrate_state_too_big(void) ""
[1] applies on top of the whole series. Tested:
make check
migration-test --full
multifd+postcopy/preempt/plain -M 7.2
multifd+postcopy/preempt/plain -M 8.2
multifd+postcopy/preempt/plain -M 11.1
multifd/tcp/uri/plain/none against 7.2 binary (src & dst)
multifd+postcopy/plain against 7.2 binary (src)
postcopy/preempt/plain against 7.2 binary (src)
compat against 11.1, 11.0 and 10.2.0
-- >8 --
From 72f4153d983334f63c7efb91b54fffef15828f7f Mon Sep 17 00:00:00 2001
From: Fabiano Rosas <farosas@suse.de>
Date: Thu, 24 Sep 2026 17:50:10 -0300
Subject: [PATCH] fixup! migration: Fix incoming channel race with multifd and
preempt_pre_7_2
---
migration/channel.c | 127 +++++++++++++++++++++-----------------------
1 file changed, 61 insertions(+), 66 deletions(-)
diff --git a/migration/channel.c b/migration/channel.c
index acb7ef5206..5c5a610d3c 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -43,6 +43,10 @@ static const char *const mig_channel_str[CH_NUM] = {
[CH_POSTCOPY] = "PREEMPT",
};
+static void
+migration_incoming_detect_preempt_channel(MigrationIncomingState *mis);
+
+
void migration_connect_outgoing(MigrationState *s, MigrationAddress *addr,
Error **errp)
{
@@ -203,27 +207,38 @@ static MigChannelType migration_channel_peek(MigrationIncomingState *mis,
}
/*
- * Returns: >0 if success, ==0 (CH_NONE) if error. If error happened,
- * *errp must be set.
+ * Returns: >0 if channel was identified, ==0 (CH_NONE) if channel
+ * needs to be peeked asynchronously before identification.
*/
static MigChannelType migration_channel_identify(MigrationIncomingState *mis,
- QIOChannel *ioc, Error **errp)
+ QIOChannel *ioc)
{
- MigChannelType channel = CH_NONE;
+ MigChannelType channel;
if (migration_has_main_and_multifd_channels()) {
+ /*
+ * If all main+multifd channels are present already, this must
+ * be the preempt channel. Note that this branch must come
+ * first because the preempt channel is peekable but QEMU
+ * can't register an IO watch for it because the channel only
+ * transfers data during postcopy, which is too late.
+ */
assert(migrate_postcopy_preempt());
channel = CH_POSTCOPY;
+
+ } else if (qio_channel_is_peekable(ioc)) {
+ /* Needs to be peeked first */
+ channel = CH_NONE;
+
} else if (!mis->from_src_file) {
channel = CH_MAIN;
+
} else if (migrate_multifd()) {
/*
* Non-peekable channels like tls/file are processed as
* multifd channels when multifd is enabled.
*/
channel = CH_MULTIFD;
- } else {
- error_setg(errp, "Unexpected non-peekable channel observed");
}
return channel;
@@ -314,40 +329,36 @@ static bool migration_incoming_setup_channel(QIOChannel *ioc,
object_get_typename(OBJECT(ioc)),
mig_channel_str[ch]);
migration_ioc_register_yank(ioc);
- /* TODO: make this return the success status instead */
- migration_incoming_setup(ioc, ch, errp);
-
- return *errp == NULL;
+ return migration_incoming_setup(ioc, ch, errp);
}
-static bool migration_incoming_channel_install(MigrationIncomingState *mis,
- QIOChannel *ioc,
+static void migration_incoming_channel_install(MigrationIncomingState *mis,
+ QIOChannel *ioc, MigChannelType ch,
Error **errp)
{
- MigChannelType ch;
- bool ret;
-
- if (qio_channel_is_peekable(ioc)) {
- ch = migration_channel_peek(mis, ioc, errp);
- } else {
- ch = migration_channel_identify(mis, ioc, errp);
- }
-
- if (!ch) {
- return false;
- }
-
- ret = migration_incoming_setup_channel(ioc, ch, errp);
- if (!ret) {
- return false;
- }
-
- /* Installation succeeded, kickoff migration if needed */
- if (migration_has_main_and_multifd_channels()) {
+ if (migration_incoming_setup_channel(ioc, ch, errp)) {
migration_start_incoming();
- }
- return true;
+ /*
+ * Due to different implementations among QEMU versions, the
+ * postcopy preempt channel may not have yet been
+ * identified. Although peekable, it's not possible to use an
+ * IO watch to detect it because it does not contain any early
+ * data. At this point the main and multifd channels have
+ * already been identified, if there is any channel left in
+ * @channels_early, that would be the preempt channel. Look
+ * for it now.
+ *
+ * Possibilities when reaching here:
+ *
+ * (1) if preempt not enabled, this should be no-op, all done,
+ * (2) if preempt enabled,
+ * (2.a) preempt channel arrived @channels_early, handle it now
+ * (2.b) preempt channel not arrived, to be handled in
+ * migration_channel_process_incoming() later
+ */
+ migration_incoming_detect_preempt_channel(mis);
+ }
}
static void
@@ -409,6 +420,9 @@ static gboolean migration_incoming_channel_readable(QIOChannel *ioc,
{
MigrationIncomingState *mis = opaque;
Error *local_err = NULL;
+ MigChannelType ch;
+
+ assert(qio_channel_is_peekable(ioc));
/*
* No need to monitor this channel anymore as long as anything arrived,
@@ -435,22 +449,12 @@ static gboolean migration_incoming_channel_readable(QIOChannel *ioc,
goto out;
}
- if (!migration_incoming_channel_install(mis, ioc, &local_err)) {
+ ch = migration_channel_peek(mis, ioc, &local_err);
+ if (!ch) {
goto out;
}
- if (migration_has_main_and_multifd_channels()) {
- /*
- * Possibilities when reaching here:
- *
- * (1) if preempt not enabled, this should be no-op, all done,
- * (2) if preempt enabled,
- * (2.a) preempt channel arrived @channels_early, handle it now
- * (2.b) preempt channel not arrived, to be handled in
- * migration_channel_process_incoming() later
- */
- migration_incoming_detect_preempt_channel(mis);
- }
+ migration_incoming_channel_install(mis, ioc, ch, &local_err);
out:
if (local_err) {
@@ -529,20 +533,10 @@ void migration_channel_process_incoming(QIOChannel *ioc)
if (migrate_channel_requires_tls_upgrade(ioc)) {
migration_tls_channel_process_incoming(ioc, &local_err);
} else {
- if (migration_has_main_and_multifd_channels()) {
- /*
- * If all main+multifd channels are present already, this must
- * be the preempt channel.
- *
- * QEMU can't register an IO watch for it if there is only the
- * last preempt channel left, because it means the IO watch
- * will never fire and nobody will pick it up: we rely on the
- * one before the last one to pick both.
- *
- * See comment in migration_incoming_channel_readable() on
- * the migration_incoming_detect_preempt_channel() call.
- */
- migration_incoming_channel_preempt_setup(ioc);
+ MigChannelType ch = migration_channel_identify(mis, ioc);
+
+ if (ch) {
+ migration_incoming_channel_install(mis, ioc, ch, &local_err);
} else {
/*
* Register an IO watch for peekable channels, so that channels
@@ -555,11 +549,12 @@ void migration_channel_process_incoming(QIOChannel *ioc)
* still so far the only source of truth to identify a channel
* in such case.
*/
- if (qio_channel_is_peekable(ioc)) {
- migration_incoming_channel_watch(mis, ioc);
- } else {
- migration_incoming_channel_install(mis, ioc, &local_err);
- }
+ migration_incoming_channel_watch(mis, ioc);
+ /*
+ * async: the above will call into
+ * migration_incoming_channel_install() when it has
+ * identified the channel.
+ */
}
}
--
2.53.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 6/7] migration: Fix incoming channel race with multifd and preempt_pre_7_2
2026-09-24 21:54 ` Fabiano Rosas
@ 2026-09-28 19:22 ` Peter Xu
2026-09-28 20:38 ` Fabiano Rosas
0 siblings, 1 reply; 18+ messages in thread
From: Peter Xu @ 2026-09-28 19:22 UTC (permalink / raw)
To: Fabiano Rosas; +Cc: qemu-devel, Akash Kulhalli, Juraj Marcin
On Thu, Sep 24, 2026 at 06:54:25PM -0300, Fabiano Rosas wrote:
> Peter Xu <peterx@redhat.com> writes:
>
> > PROBLEM
> > =======
> >
> > Migration reliably hangs with old machine types (7.2-) when these migration
> > capabilities are enabled: multifd, postcopy-ram, postcopy-preempt.
> >
> > Simplest reproducer :
> >
> > $ QTEST_QEMU_MACHINE_TYPE=pc-q35-7.2 \
> > QTEST_QEMU_BINARY=./qemu-system-x86_64 \
> > ./tests/qtest/migration-test --full \
> > -r /x86_64/migration/multifd+postcopy/preempt/plain
> >
> > Current workaround is to kill destination QEMU, cancel the migration on
> > source (with/without yank), disable one or more of the features, and retry.
> >
> > The hang is caused by receiving preempt channel before most of the multifd
> > channels, the peek buffer operation will stuck forever.
> >
> > Incoming side QEMU hang (with relevant tracepoints enabled):
> >
> > migrate_set_state new state setup
> > migration_socket_incoming_accepted
> > migration_set_incoming_channel ioc=0x557d82c1caa0 ioctype=qio-channel-socket
> > migration_socket_incoming_accepted
> > migration_set_incoming_channel ioc=0x557d83023840 ioctype=qio-channel-socket
> > multifd_recv_new_channel channel 1
> > migration_socket_incoming_accepted
> > migration_set_incoming_channel ioc=0x557d830c08c0 ioctype=qio-channel-socket
> > multifd_recv_new_channel channel 0
> > multifd_recv_thread_start 1
> > migration_socket_incoming_accepted
> > migration_set_incoming_channel ioc=0x557d8284a010 ioctype=qio-channel-socket
> > multifd_recv_thread_start 0
> > multifd_recv_unfill channel 0 packet_num 0 flags 0x1 next packet size 0
> > multifd_recv_unfill channel 1 packet_num 1 flags 0x1 next packet size 0
> > [dest qemu hangs here]
> >
> > Incoming side backtrace:
> >
> > __syscall_cancel_arch
> > __internal_syscall_cancel
> > __syscall_cancel
> > recvmsg
> > qio_channel_socket_readv
> > qio_channel_readv_full
> > migration_channel_read_peek
> > migration_channel_identify
> > migration_channel_process_incoming
> > socket_accept_incoming_migration
> > qio_net_listener_channel_func
> > qio_channel_fd_source_dispatch
> > g_main_context_dispatch_unlocked.lto_priv
> > g_main_context_dispatch
> > glib_pollfds_poll
> > os_host_main_loop_wait
> > main_loop_wait
> > qemu_main_loop
> > qemu_default_main
> > main
> >
> > This patch tries to fix it, from incoming side first. This patch alone
> > should enable single-direction migration to this new QEMU. The next patch
> > will propose a fix for the outgoing path, fixing new->old migrations.
> >
> > BACKGROUND
> > ==========
> >
> > preempt_pre_7_2 used to be a flag marking QEMU releases 7.1/7.2 only
> > because they have a flaw on channel establishment on preempt channel.
> >
> > Now, after we have multifd + postcopy support, new QEMU binaries can
> > migrate old machine types with both features enabled. Juraj reported
> > constant migration hang at the very beginning for those old machine types
> > in our downstream systems with such setup. Juraj found it's because of
> > this flag.
> >
> > QEMU source initiates channels in this order on current master when both
> > features enabled with postcopy-preempt mode:
> >
> > - First, main channel connect() happens,
> > - Second, postcopy_preempt_setup() invokes connect() for preempt channel,
> > - Last, in migration_thread(), multifd_send_setup() invokes connect()s
> > for all the multifd channels
> >
> > However on an old QEMU, it expect the channels arrive in order of
> > "main"->"multifd"->"preempt". Even on a new QEMU, the destination expects
> > the same order of arrival on the channels when the channels are not
> > peekable.
> >
> > For peekable channels (non-tls sockets), this time we'll likely see preempt
> > channel appearing very soon, peeking at it causing main thread hang, like
> > mentioned in the PROBLEM section above.
> >
> > SOLUTION
> > ========
> >
> > One major problem of current hang is we try to peek at preempt channel,
> > which offers nothing at the beginning.
> >
> > Since we'll need to accept stream from old binaries, arrival of preempt
> > channel early is unavoidable.
> >
> > What we can do, though, is to allow concurrent monitoring of all channels
> > rather than one. Meanwhile, we shouldn't peek at anything that has no
> > data.
> >
> > migration_channel_read_peek() almost does the wait, but it's too late.
> > This patch proposes to watch all channels from the start without reading at
> > them at all, relying on an IO watch attached. This will make sure (1) for
> > preempt channel, we never read on it (watch can be gracefully disarmed when
> > we know it's preempt channel later) (2) since we have one IO watch for each
> > channel, then we can allow accept() to happen in almost any order, process
> > only when there's some header to read.
> >
> > To maintain these watches, a new GArray @channels_early is introduced, with
> > each element to be a (ioc, GSource) tuple (@MigEarlyIncomingChannel), so
> > that QEMU can manage all the IO watches later with it. Here I used GSource
> > rather than io_tag because the GSource may or may not be attached to the
> > default main thread gcontext: when OOB is used, it may be the iothread
> > context instead. IOW, g_source_remove() on io_tags stops working, which
> > only works for default main context.
> >
> > The trick this patch used is when we have the ability to wait on all
> > channel headers at the same time, we pick one by one from main and multifd
> > channels (since both of the types will contain headers dumped right at the
> > very beginning), leave preempt channel alone. It means, after dest QEMU
> > finds all main and multifd channels, there are three possibilities:
> >
> > - If preempt not enabled, we finished full channel establishment, done.
> >
> > - If preempt enabled,
> >
> > - If we have one registered IO watch with the IOC, it must be the
> > preempt channel,
> >
> > - If we have no further IO watch, wait for the next accept(), which
> > must be the preempt channel.
> >
> > This will make channel establish work on incoming side even with the old
> > QEMU binaries.
> >
> > While working on it, I managed to refactor the peeking logic quite a bit:
> > we used to have a very convoluted migration_channel_identify() function,
> > taking care of two different cases:
> >
> > (1) when the channel is peekable (like normal socket channels),
> > (2) when the channel is not peekable (like TLS or file migrations).
> >
> > This patch refactored that part to make it crystal clear on how we make
> > decisions on which channel is which, and split the peek/identify paths.
> >
> > One example incoming migration from pc-q35-7.2 after this patch applied,
> > and with relevant tracepoints set (8 multifd channels, 1 preempt channel):
> >
> > migrate_set_state new state setup
> > migration_channel_process_incoming ioc=0x557dc8af4e20 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc8af4e20 ioctype=qio-channel-socket
> > migration_channel_process_incoming ioc=0x557dc8abc5d0 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc8abc5d0 ioctype=qio-channel-socket
> > migration_channel_process_incoming ioc=0x557dc953d680 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc953d680 ioctype=qio-channel-socket
> > migration_set_incoming_channel ioc=0x557dc8abc5d0 ioctype=qio-channel-socket type=MULTIFD
> > migration_channel_process_incoming ioc=0x557dc898a820 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc898a820 ioctype=qio-channel-socket
> > migration_set_incoming_channel ioc=0x557dc953d680 ioctype=qio-channel-socket type=MULTIFD
> > migration_channel_process_incoming ioc=0x557dc919bd70 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc919bd70 ioctype=qio-channel-socket
> > migration_set_incoming_channel ioc=0x557dc898a820 ioctype=qio-channel-socket type=MULTIFD
> > migration_channel_process_incoming ioc=0x557dc8734b20 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc8734b20 ioctype=qio-channel-socket
> > migration_set_incoming_channel ioc=0x557dc919bd70 ioctype=qio-channel-socket type=MULTIFD
> > migration_channel_process_incoming ioc=0x557dc898bdf0 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc898bdf0 ioctype=qio-channel-socket
> > migration_set_incoming_channel ioc=0x557dc8734b20 ioctype=qio-channel-socket type=MULTIFD
> > migration_channel_process_incoming ioc=0x557dc968cfd0 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc968cfd0 ioctype=qio-channel-socket
> > migration_set_incoming_channel ioc=0x557dc898bdf0 ioctype=qio-channel-socket type=MULTIFD
> > migration_channel_process_incoming ioc=0x557dc8c31810 ioctype=qio-channel-socket
> > migration_incoming_channel_watch ioc=0x557dc8c31810 ioctype=qio-channel-socket
> > migration_set_incoming_channel ioc=0x557dc968cfd0 ioctype=qio-channel-socket type=MULTIFD
> > migration_set_incoming_channel ioc=0x557dc8c31810 ioctype=qio-channel-socket type=MULTIFD
> > migration_set_incoming_channel ioc=0x557dc8af4e20 ioctype=qio-channel-socket type=MAIN
> > migration_start_incoming
> > migrate_set_state new state active
> > migration_channel_process_incoming ioc=0x557dc8966160 ioctype=qio-channel-socket
> > migration_set_incoming_channel ioc=0x557dc8966160 ioctype=qio-channel-socket type=PREEMPT
> >
> > While at it, I renamed the four channel incoming/outgoing tracepoints, make
> > all to follow migration_[incoming|outgoing]_channel_*(). Especially for
> > incoming, then we can enable migration_incoming_channel* for incoming
> > channel debuggings.
> >
> > FINAL NOTE ON TLS
> > =================
> >
> > Note that this solution isn't a magic bullet fixing everything. TLS is not
> > fixable with this approach because TLS isn't peekable channel, hence the
> > watch won't help.
> >
> > We can have other ways to hack it to make it work, e.g. we can make TLS
> > channels peekable too, but I don't want to pollute the TLS iochannel only
> > for this: let's hope handshake will arrive soon so we can drop these code.
> >
> > For now, when TLS is involved with such old machine type (7.2-), one needs
> > to migrate it out with any combination of features except enabling all
> > four (multifd + TLS + postcopy + preempt) to a patched binary, after that,
> > all combinations will start working.
> >
> > BugLink: https://redhat.atlassian.net/browse/RHEL-254933
> > Fixes: e27418861288 ("migration: enable multifd and postcopy together")
> > Reported-by: Juraj Marcin <jmarcin@redhat.com>
> > Signed-off-by: Peter Xu <peterx@redhat.com>
> > ---
> > migration/channel.h | 3 +
> > migration/migration.h | 35 ++++
> > migration/channel.c | 414 +++++++++++++++++++++++++++++++++++------
> > migration/migration.c | 23 ++-
> > migration/trace-events | 7 +-
> > 5 files changed, 421 insertions(+), 61 deletions(-)
>
> Hi Peter, I think the code looks good, but there are some twists and
> turns that I think we can get rid of. I put a fixup patch [1] at the end
> with my suggestions and mentioned inline what I changed and why.
Thanks, especially for covering the tests while suggesting.
I believe I agree with many of them, I'll comment on the rest, see inline.
>
> >
> > diff --git a/migration/channel.h b/migration/channel.h
> > index 678712f291..40bd339a3e 100644
> > --- a/migration/channel.h
> > +++ b/migration/channel.h
> > @@ -49,4 +49,7 @@ bool migration_channel_parse_input(const char *uri,
> > MigrationChannel **main_channelp,
> > MigrationChannel **cpr_channelp,
> > Error **errp);
> > +
> > +void migration_incoming_free_early_channels(MigrationIncomingState *mis);
> > +
> > #endif
> > diff --git a/migration/migration.h b/migration/migration.h
> > index 683bc7bdd5..6f23e1805b 100644
> > --- a/migration/migration.h
> > +++ b/migration/migration.h
> > @@ -90,6 +90,28 @@ typedef enum {
> > PREEMPT_THREAD_QUIT,
> > } PreemptThreadStatus;
> >
> > +typedef struct {
> > + /*
> > + * The GSource we have allocated to track G_IO_IN events for the
> > + * channel. Note: it may not be attached to the default main gcontext,
> > + * for example, when in case of io watch created during an OOB
> > + * migrate-recover command.
> > + */
> > + GSource *source;
> > + /* The channel we will identify later after getting some buffers to read */
> > + QIOChannel *ioc;
> > +} MigEarlyIncomingChannel;
> > +
> > +typedef struct {
> > + GArray *channels;
> > + /*
> > + * In most cases, channels are only operated with BQl, but since we
> > + * have OOB command support, don't assume it, just use a standalone
> > + * mutex to protect any access to the channels array.
> > + */
> > + QemuMutex mutex;
> > +} MigEarlyIncomingChannels;
> > +
> > /* State for the incoming migration */
> > struct MigrationIncomingState {
> > QEMUFile *from_src_file;
> > @@ -255,6 +277,19 @@ struct MigrationIncomingState {
> >
> > /* Do exit on incoming migration failure */
> > bool exit_on_error;
> > +
> > + /*
> > + * Maintains all channels only at early stage. After incoming
> > + * migration started, this should be an empty array and no use anymore.
> > + *
> > + * TODO: we logically only need this to make new QEMU binaries work for
> > + * old machines who have @preempt_pre_7_2 set on the source, but it's
> > + * also good to have this early stage anyway, making sure when peek the
> > + * channel there will be something in the channel. Ideally, we should
> > + * manage all migration channels in the future with proper headers,
> > + * then we can drop this.
> > + */
> > + MigEarlyIncomingChannels channels_early;
> > };
> >
> > MigrationIncomingState *migration_incoming_get_current(void);
> > diff --git a/migration/channel.c b/migration/channel.c
> > index b9065efd03..acb7ef5206 100644
> > --- a/migration/channel.c
> > +++ b/migration/channel.c
> > @@ -12,6 +12,8 @@
> >
> > #include "qemu/osdep.h"
> > #include "qemu/cutils.h"
> > +#include "qemu/main-loop.h"
> > +#include "qemu/error-report.h"
> > #include "channel.h"
> > #include "exec.h"
> > #include "fd.h"
> > @@ -146,61 +148,84 @@ bool migration_has_all_channels(void)
> > return true;
> > }
> >
> > -static MigChannelType migration_channel_identify(MigrationIncomingState *mis,
> > - QIOChannel *ioc, Error **errp)
> > +static bool qio_channel_is_peekable(QIOChannel *ioc)
> > +{
> > + return qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_READ_MSG_PEEK);
> > +}
> > +
> > +/*
> > + * With multiple channels, it is possible that we receive channels out of
> > + * order on destination side, causing incorrect mapping of source channels
> > + * on destination side.
> > + *
> > + * When the channel is peekable (e.g. non-TLS socket channels), check
> > + * channel MAGIC to decide type of channel.
> > + *
> > + * Please note this is best effort, postcopy preempt channel does not send
> > + * any magic number so avoid it for postcopy live migration.
> > + *
> > + * Returns: >0 if success, ==0 (CH_NONE) if error. If error happened,
> > + * *errp must be set.
> > + */
> > +static MigChannelType migration_channel_peek(MigrationIncomingState *mis,
> > + QIOChannel *ioc,
> > + Error **errp)
> > {
> > MigChannelType channel = CH_NONE;
> > uint32_t channel_magic = 0;
> > int ret = 0;
> >
> > - if (!migration_has_main_and_multifd_channels()) {
> > - if (qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_READ_MSG_PEEK)) {
> > - /*
> > - * With multiple channels, it is possible that we receive channels
> > - * out of order on destination side, causing incorrect mapping of
> > - * source channels on destination side. Check channel MAGIC to
> > - * decide type of channel. Please note this is best effort,
> > - * postcopy preempt channel does not send any magic number so
> > - * avoid it for postcopy live migration. Also tls live migration
> > - * already does tls handshake while initializing main channel so
> > - * with tls this issue is not possible.
> > - */
> > - ret = migration_channel_read_peek(ioc, (void *)&channel_magic,
> > - sizeof(channel_magic), errp);
> > - if (ret != 0) {
> > - goto out;
> > - }
> > + assert(qio_channel_is_peekable(ioc));
> >
> > - channel_magic = be32_to_cpu(channel_magic);
> > - if (channel_magic == QEMU_VM_FILE_MAGIC) {
> > - channel = CH_MAIN;
> > - } else if (channel_magic == MULTIFD_MAGIC) {
> > - assert(migrate_multifd());
> > - channel = CH_MULTIFD;
> > - } else if (!mis->from_src_file &&
> > - mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {
> > - /* reconnect main channel for postcopy recovery */
> > - channel = CH_MAIN;
> > - } else {
> > - error_setg(errp, "unknown channel magic: %u", channel_magic);
> > - }
> > - } else if (mis->from_src_file && migrate_multifd()) {
> > - /*
> > - * Non-peekable channels like tls/file are processed as
> > - * multifd channels when multifd is enabled.
> > - */
> > - channel = CH_MULTIFD;
> > - } else if (!mis->from_src_file) {
> > - channel = CH_MAIN;
> > - } else {
> > - error_setg(errp, "non-peekable channel used without multifd");
> > - }
> > + ret = migration_channel_read_peek(ioc, (void *)&channel_magic,
> > + sizeof(channel_magic), errp);
> > + if (ret != 0) {
> > + /* Failed */
> > + return channel;
> > + }
> > +
> > + channel_magic = be32_to_cpu(channel_magic);
> > +
> > + if (channel_magic == QEMU_VM_FILE_MAGIC) {
> > + channel = CH_MAIN;
> > + } else if (channel_magic == MULTIFD_MAGIC) {
> > + assert(migrate_multifd());
> > + channel = CH_MULTIFD;
> > + } else if (!mis->from_src_file &&
> > + mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {
> > + /* reconnect main channel for postcopy recovery */
> > + channel = CH_MAIN;
>
> This is not peeking, maybe it should be somewhere else. Not this patch's
> fault, we can think about it some other day.
If we separate "peek" from "identify", this one still falls into "peek".
Per my definition, the latter "identify" only does "pick channels by order
they arrive". Then this doesn't belong to that. As it needs to "peek for
at least something readable", rather than blindly rely on the order of
arrival.
But yeah, it'll be good we leave this for later regardless.
>
> > } else {
> > + error_setg(errp, "Unknown channel magic: %u", channel_magic);
> > + }
> > +
> > + return channel;
> > +}
> > +
> > +/*
> > + * Returns: >0 if success, ==0 (CH_NONE) if error. If error happened,
> > + * *errp must be set.
> > + */
> > +static MigChannelType migration_channel_identify(MigrationIncomingState *mis,
> > + QIOChannel *ioc, Error **errp)
> > +{
> > + MigChannelType channel = CH_NONE;
> > +
> > + if (migration_has_main_and_multifd_channels()) {
> > assert(migrate_postcopy_preempt());
> > channel = CH_POSTCOPY;
>
> This check is the same as the one at
> migration_channel_process_incoming(). I think we can simplify this.
True, this path should be dead code when original patch applied. I have a
slight preference on keeping the other one instead (which I know you tend
to think "awkward"). I'll explain below, and we'll see.
>
> See [1].
>
> > + } else if (!mis->from_src_file) {
> > + channel = CH_MAIN;
> > + } else if (migrate_multifd()) {
> > + /*
> > + * Non-peekable channels like tls/file are processed as
> > + * multifd channels when multifd is enabled.
> > + */
> > + channel = CH_MULTIFD;
> > + } else {
> > + error_setg(errp, "Unexpected non-peekable channel observed");
> > }
> >
> > -out:
> > return channel;
> > }
> >
> > @@ -214,31 +239,275 @@ static void migration_incoming_error_propagate(MigrationIncomingState *mis,
> > }
> > }
> >
> > +/* Must be with mis->channels_early.mutex held */
> > +static void
> > +migration_incoming_early_channel_insert(MigrationIncomingState *mis,
> > + QIOChannel *ioc,
> > + GSource *source)
> > +{
> > + MigEarlyIncomingChannel chan = {
> > + .source = source,
> > + .ioc = ioc,
> > + };
> > +
> > + object_ref(OBJECT(ioc));
> > + g_source_ref(source);
> > +
> > + g_array_append_val(mis->channels_early.channels, chan);
> > +}
> > +
> > +static void migration_incoming_early_channel_free(GArray *channels, int i)
> > +{
> > + MigEarlyIncomingChannel *chan;
> > +
> > + chan = &g_array_index(channels, MigEarlyIncomingChannel, i);
> > +
> > + g_source_destroy(chan->source);
> > + g_source_unref(chan->source);
> > + object_unref(OBJECT(chan->ioc));
> > +
> > + g_array_remove_index_fast(channels, i);
> > +}
> > +
> > +/*
> > + * Remove this channel from the monitoring of @channels_early array.
> > + * Return true if found and successful, false otherwise.
> > + */
> > +static bool
> > +migration_incoming_early_channel_remove(MigrationIncomingState *mis,
> > + QIOChannel *ioc)
> > +{
> > + GArray *channels = mis->channels_early.channels;
> > + MigEarlyIncomingChannel *chan;
> > + int i;
> > +
> > + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
> > +
> > + for (i = 0; i < channels->len; i++) {
> > + chan = &g_array_index(channels, MigEarlyIncomingChannel, i);
> > + if (chan->ioc != ioc) {
> > + continue;
> > + }
> > + migration_incoming_early_channel_free(channels, i);
> > + return true;
> > + }
> > +
> > + return false;
> > +}
> > +
> > +void migration_incoming_free_early_channels(MigrationIncomingState *mis)
> > +{
> > + GArray *channels = mis->channels_early.channels;
> > +
> > + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
> > +
> > + while (channels->len) {
> > + migration_incoming_early_channel_free(channels, 0);
> > + }
> > +}
> > +
> > +static bool migration_incoming_setup_channel(QIOChannel *ioc,
> > + MigChannelType ch,
> > + Error **errp)
> > +{
> > + trace_migration_incoming_channel_set(ioc,
> > + object_get_typename(OBJECT(ioc)),
> > + mig_channel_str[ch]);
> > + migration_ioc_register_yank(ioc);
> > + /* TODO: make this return the success status instead */
> > + migration_incoming_setup(ioc, ch, errp);
>
> I implemented this TODO. It allows us to skip the main+mfd check after
> starting migration because migration_incoming_setup() already returns
> that value. See [1].
Actually now looking at this patch, this TODO is so trivial.. yes I'll do
it.
But when I do it, I think it too error prone to return a value returned
from migration_has_main_and_multifd_channels() for this function. I
changed it to simple true/false for success or not instead. I'll attach a
2nd version of the fixup patch at the end, applying most changes you
suggested but stick with returning true/false for this one.
>
> > +
> > + return *errp == NULL;
> > +}
> > +
> > static bool migration_incoming_channel_install(MigrationIncomingState *mis,
> > QIOChannel *ioc,
> > Error **errp)
> > {
> > - MigChannelType ch = migration_channel_identify(mis, ioc, errp);
> > + MigChannelType ch;
> > + bool ret;
> > +
> > + if (qio_channel_is_peekable(ioc)) {
>
> This check is redundant, we can only arrive here via the watch and we
> checked peekable already at migration_channel_process_incoming. See [1].
Shouldn't? Because the file path uses migration_incoming_channel_install()
too, afaict.
But I see how your question came, which I'm guessing: I used this function
in a peekable only path, so here what I can do minimum is I can move the
migration_channel_peek() to the peekable path, then move the other path of
migration_channel_identify() to the e.g. file path. I'll do that.
>
> > + ch = migration_channel_peek(mis, ioc, errp);
> > + } else {
> > + ch = migration_channel_identify(mis, ioc, errp);
> > + }
> >
> > if (!ch) {
> > - assert(*errp);
> > return false;
> > }
> >
> > - trace_migration_set_incoming_channel(ioc,
> > - object_get_typename(OBJECT(ioc)),
> > - mig_channel_str[ch]);
> > - migration_ioc_register_yank(ioc);
> > + ret = migration_incoming_setup_channel(ioc, ch, errp);
> > + if (!ret) {
> > + return false;
> > + }
> >
> > - if (migration_incoming_setup(ioc, ch, errp)) {
> > + /* Installation succeeded, kickoff migration if needed */
> > + if (migration_has_main_and_multifd_channels()) {
> > migration_start_incoming();
> > }
> >
> > - if (*errp) {
> > - return false;
> > + return true;
> > +}
> > +
> > +static void
> > +migration_incoming_channel_preempt_setup(QIOChannel *ioc)
> > +{
> > + assert(migrate_postcopy_preempt());
> > + /* Installation of preempt channel should never fail */
> > + migration_incoming_setup_channel(ioc, CH_POSTCOPY, &error_abort);
> > +}
> > +
> > +static void
> > +migration_incoming_detect_preempt_channel(MigrationIncomingState *mis)
> > +{
> > + GArray *channels = mis->channels_early.channels;
> > + MigEarlyIncomingChannel *chan;
> > +
> > + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
> > +
> > + /* When preempt mode not enabled, nothing to detect.. */
> > + if (!migrate_postcopy_preempt()) {
> > + /*
> > + * .. but if we found something pending, throw an error only, which
> > + * should not happen. Even if it happens, resources will still be
> > + * released after incoming migration is completedly.
> > + */
> > + if (channels->len) {
> > + error_report("%s: Found %u unused channels",
> > + __func__, channels->len);
> > + }
> > + return;
> > }
> >
> > - return true;
> > + /* Preempt channel hasn't yet arrived? Process it later */
> > + if (!channels->len) {
> > + return;
> > + }
> > +
> > + /*
> > + * More than one channel should never happen.. capture it in case if
> > + * it happens, then there's not much we can do.
> > + */
> > + if (channels->len > 1) {
> > + error_report("%s: Found %u unused channels, "
> > + "can't identify preempt channel",
> > + __func__, channels->len);
> > + return;
> > + }
> > +
> > + assert(channels->len == 1);
> > + /* This is the preempt channel, install it directly */
> > + chan = &g_array_index(channels, MigEarlyIncomingChannel, 0);
> > + migration_incoming_channel_preempt_setup(chan->ioc);
> > + migration_incoming_early_channel_free(channels, 0);
> > +}
> > +
> > +static gboolean migration_incoming_channel_readable(QIOChannel *ioc,
> > + GIOCondition condition,
> > + gpointer opaque)
> > +{
> > + MigrationIncomingState *mis = opaque;
> > + Error *local_err = NULL;
> > +
> > + /*
> > + * No need to monitor this channel anymore as long as anything arrived,
> > + * remove it from tracking.
> > + *
> > + * NOTE: this means if partial data arrived we may still block here,
> > + * but it shouldn't happen in production, only malicious stream. Since
> > + * migration stream is trusted (either due to trusted network, or TLS),
> > + * that's non-issue.
>
> Could we check the amount of data and keep waiting?
We could, but it is about the security side of things, I'd not bother in
this patch, and maybe we don't bother forever, hopping that at the end of
this year we enable handshake in next release, then this is a ioc read()
block reading, as simple as that.
>
> > + *
> > + * NOTE2: this will also release the ioc ref that we used to hold, but
> > + * it's fine since we have at least one more refcount in the current
> > + * event handler.
>
> I don't understand "one more ref in the event handler". Looks like
> you're trying to say the refcount is consistent, but why even mention
> it? I may be missing something.
Not about consistency, it's about holding at least one refcount to make sure
migration_incoming_early_channel_remove() won't already free the IOC.
But I think maybe you're right: likely nobody will notice the context of
this path processing the gsource, and maybe this sentence brings more
confusion than clarity? Let me know, I can drop this line.
>
> > + *
> > + * NOTE3: it's theoretically possible that this entry is gone reaching
> > + * here. Example: the main thread is doing incoming cleanup having this
> > + * one removed, while this watch can be registered on the monitor
> > + * iothread's context and fired at the exact same time but in the
> > + * iothread instead. If it happens, skip the rest. I'm not sure if
> > + * this could happen at all, may depend on iothread lifespan management
> > + * in the main thread, but be prepared.
>
> I wonder if we should extend the locking a bit further. Not because of
> what you mentioned here^, but because everything the code running on the
> monitor thread touches can race with changes from the main loop. All of
> these migrate_foo_bar() helpers, the QEMUFiles, caps, params, etc.
Is that about the new lock (mis->channels_early.mutex) or existing code?
Possible to do on top, or a new concern introduced from this patch?
>
> > + */
> > + if (!migration_incoming_early_channel_remove(mis, ioc)) {
> > + goto out;
> > + }
> > +
>
> I moved the peek into here and passed the already identified
> channel into migration_incoming_channel_install(). See [1].
Agree on this change, better.
>
> > + if (!migration_incoming_channel_install(mis, ioc, &local_err)) {
> > + goto out;
> > + }
> > +
> > + if (migration_has_main_and_multifd_channels()) {
>
> This check became redundant because the _setup routine already returns
> it. See [1].
I didn't adopt this in my new fixup, because I want to avoid returning that
info deep from stack. Let's continue the discussion in my fixup there as a
reply.
>
> > + /*
> > + * Possibilities when reaching here:
> > + *
> > + * (1) if preempt not enabled, this should be no-op, all done,
> > + * (2) if preempt enabled,
> > + * (2.a) preempt channel arrived @channels_early, handle it now
> > + * (2.b) preempt channel not arrived, to be handled in
> > + * migration_channel_process_incoming() later
> > + */
> > + migration_incoming_detect_preempt_channel(mis);
>
> Moved this into migration_incoming_channel_install(). See [1].
Since my version used migration_incoming_channel_install() for both
peekable and non-peekable, this path is not needed for non-peekable.
I still left it here, assuming it's clearer it's only needed for peekable.
But you can reply with your thought. I hope at least we can be more
focused with most of the rest addressed.
>
> > + }
> > +
> > +out:
> > + if (local_err) {
> > + migration_incoming_error_propagate(mis, local_err);
> > + }
> > +
> > + /*
> > + * NOTE: we should have already detached the GSource, returning
> > + * G_SOURCE_REMOVE to be logically consistent only.
> > + */
> > + return G_SOURCE_REMOVE;
> > +}
> > +
> > +static void migration_incoming_channel_watch(MigrationIncomingState *mis,
> > + QIOChannel *ioc)
> > +{
> > + GMainContext *context = g_main_context_get_thread_default();
> > + GSource *source;
> > + guint io_tag;
> > +
> > + trace_migration_incoming_channel_watch(ioc,
> > + object_get_typename(OBJECT(ioc)));
> > +
> > + /*
> > + * Careful: this can be run from either the main thread or the monitor
> > + * iothread when migrate_recover is used with OOB=on, so we need to
> > + * take the lock and use the full version to specify the correct
> > + * context.
> > + */
> > + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
> > +
> > + /*
> > + * We should never watch an @ioc that is not peekable, because there's
> > + * no point. What is worse is we lose the real order of accept()s via
> > + * the asynchronous IO watch operation.
> > + *
> > + * Another note is TLS channel (non-peekable) may or may not work
> > + * properly with IO watch due to its current .io_create_watch() impl,
> > + * which is another story. Just guard both points.
> > + */
> > + assert(qio_channel_is_peekable(ioc));
> > + io_tag = qio_channel_add_watch_full(ioc, G_IO_IN,
> > + migration_incoming_channel_readable,
> > + mis, NULL, context);
> > +
> > + /*
> > + * Replace this if one day qio_channel_add_watch*() API can directly
> > + * return the GSource*.. for now, stick with it.
> > + */
> > + source = g_main_context_find_source_by_id(context, io_tag);
> > + /*
> > + * Nothing can race with adding the IO watch, aka, concurrent removal
> > + * is not possible when we have the lock. So it must be present.
> > + */
> > + assert(source);
> > +
> > + migration_incoming_early_channel_insert(mis, ioc, source);
> > }
> >
> > /**
> > @@ -254,13 +523,44 @@ void migration_channel_process_incoming(QIOChannel *ioc)
> > MigrationIncomingState *mis = migration_incoming_get_current();
> > Error *local_err = NULL;
> >
> > - trace_migration_channel_process_incoming(
> > + trace_migration_incoming_channel_process(
> > ioc, object_get_typename(OBJECT(ioc)));
> >
> > if (migrate_channel_requires_tls_upgrade(ioc)) {
> > migration_tls_channel_process_incoming(ioc, &local_err);
> > } else {
> > - migration_incoming_channel_install(mis, ioc, &local_err);
> > + if (migration_has_main_and_multifd_channels()) {
>
> The fact that this check must come before everything is a major
> weirdness. In fact, this is conceptually the same case as the first
> branch in migration_channel_identify(). I therefore moved that function
> to this point and added a comment explaining why this must come
> first. See [1].
This is one part that I left alone so far. My reason is that preempt
channel needs special care at least for peekable, it's because it's not
peekable there when hitting this case. So we need to have this separate
path. This is also relevant to below, where..
>
> > + /*
> > + * If all main+multifd channels are present already, this must
> > + * be the preempt channel.
> > + *
> > + * QEMU can't register an IO watch for it if there is only the
> > + * last preempt channel left, because it means the IO watch
> > + * will never fire and nobody will pick it up: we rely on the
> > + * one before the last one to pick both.
> > + *
> > + * See comment in migration_incoming_channel_readable() on
> > + * the migration_incoming_detect_preempt_channel() call.
> > + */
> > + migration_incoming_channel_preempt_setup(ioc);
> > + } else {
> > + /*
> > + * Register an IO watch for peekable channels, so that channels
> > + * can be accept()ed with any order.
> > + *
> > + * Non-peekable channels (file, TLS, etc.) cannot register IO
> > + * watch, not only because there's no data to look at to help
> > + * making the decision, but also because after registering we
> > + * will lose the real ordering we get from accept(), which is
> > + * still so far the only source of truth to identify a channel
> > + * in such case.
> > + */
> > + if (qio_channel_is_peekable(ioc)) {
>
> I moved this line into migration_channel_identify(). That way we ensure
> the ordering regarding the main+mfd check. The watch is still installed
> at this point. See [1].
... you suggested moving this into migration_channel_identify().
Personally I think it's against my purpose of split: I wanted to make
migration_channel_identify() to only rely on order of arrival to identify
channels, nothing else. Then for all peekable handling, it should be
inside the _peek() function.
>
> > + migration_incoming_channel_watch(mis, ioc);
> > + } else {
> > + migration_incoming_channel_install(mis, ioc, &local_err);
>
> This invocation of install does not check for the preempt channel after
> it returns. Is this simply assuming that if a non-peekable channel is
> present then there will be no preempt channel at all?
>
> Or if main+TLS is the first channel, then the next channel will be
> preempt and already enter the first branch?
Yes. It's because for non-peekable, preempt channel is only processed
above (in my patch logic, with/without my new fixup to be attached).
For peekable, preempt channel may be picked up by the 2nd last channel,
which is not possible for non-peekable, so that is special way for peekable
channels only.
>
> > + }
> > + }
> > }
> >
> > if (local_err) {
> > @@ -270,7 +570,7 @@ void migration_channel_process_incoming(QIOChannel *ioc)
> >
> > void migration_channel_connect_outgoing(MigrationState *s, QIOChannel *ioc)
> > {
> > - trace_migration_set_outgoing_channel(ioc, object_get_typename(OBJECT(ioc)));
> > + trace_migration_outgoing_channel_set(ioc, object_get_typename(OBJECT(ioc)));
> >
> > if (migrate_channel_requires_tls_upgrade(ioc)) {
> > Error *local_err = NULL;
> > diff --git a/migration/migration.c b/migration/migration.c
> > index cfadcc79c2..4cc4077a76 100644
> > --- a/migration/migration.c
> > +++ b/migration/migration.c
> > @@ -334,6 +334,10 @@ void migration_object_init(void)
> > current_incoming->page_requested = g_tree_new(page_request_addr_cmp);
> >
> > current_incoming->exit_on_error = INMIGRATE_DEFAULT_EXIT_ON_ERROR;
> > + /* zero_terminated=false, clear_=true */
>
> There's an extra _ after 'clear' I think.
See? I know someone else will get confused too. :)
https://docs.gtk.org/glib/type_func.Array.new.html
GArray*
g_array_new (
gboolean zero_terminated,
gboolean clear_,
guint element_size
)
...
clear_
Type: gboolean
If true, GArray elements should be automatically cleared to 0 when they are allocated.
>
> > + current_incoming->channels_early.channels =
> > + g_array_new(FALSE, TRUE, sizeof(MigEarlyIncomingChannel));
> > + qemu_mutex_init(¤t_incoming->channels_early.mutex);
> >
> > migration_object_check(current_migration, &error_fatal);
> >
> > @@ -447,6 +451,24 @@ void migration_incoming_state_destroy(void)
> > MigrationIncomingState *mis = migration_incoming_get_current();
> > PostcopyState ps = postcopy_state_get();
> >
> > + /* Cleanup listener to make sure no further accept() for sockets */
> > + migration_incoming_transport_cleanup(mis);
> > +
> > + /*
> > + * It's safer to free channel watches earlier than most of the rest, in
> > + * case the IO watches could fire in the monitor iothread concurrently
> > + * against this function.
>
> Now I'm getting worried. Cleanup races are super annoying. This is
> "just" about the recovery command, right?
I think so.
Note: I didn't have any way to trigger any crash at all, this is something
when I had AI review my code and it pointed out this. I thought I should
be safe than sorry.
Below is my fixup. The hope is I addressed most of them but not all, with
reasonings inline above. Let me know.
===8<===
From eb03b1b648b91a317a8a7559240186c87d835b8c Mon Sep 17 00:00:00 2001
From: Peter Xu <peterx@redhat.com>
Date: Mon, 28 Sep 2026 11:35:20 -0400
Subject: [PATCH] fixup! migration: Fix incoming channel race with multifd and
preempt_pre_7_2
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/channel.c | 42 +++++++++++++++++-------------------------
migration/migration.c | 9 +++------
2 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/migration/channel.c b/migration/channel.c
index acb7ef5206..72de9c9778 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -204,17 +204,14 @@ static MigChannelType migration_channel_peek(MigrationIncomingState *mis,
/*
* Returns: >0 if success, ==0 (CH_NONE) if error. If error happened,
- * *errp must be set.
+ * *errp must be set. NOTE: preempt channel is done separately.
*/
static MigChannelType migration_channel_identify(MigrationIncomingState *mis,
QIOChannel *ioc, Error **errp)
{
MigChannelType channel = CH_NONE;
- if (migration_has_main_and_multifd_channels()) {
- assert(migrate_postcopy_preempt());
- channel = CH_POSTCOPY;
- } else if (!mis->from_src_file) {
+ if (!mis->from_src_file) {
channel = CH_MAIN;
} else if (migrate_multifd()) {
/*
@@ -314,31 +311,16 @@ static bool migration_incoming_setup_channel(QIOChannel *ioc,
object_get_typename(OBJECT(ioc)),
mig_channel_str[ch]);
migration_ioc_register_yank(ioc);
- /* TODO: make this return the success status instead */
- migration_incoming_setup(ioc, ch, errp);
- return *errp == NULL;
+ return migration_incoming_setup(ioc, ch, errp);
}
static bool migration_incoming_channel_install(MigrationIncomingState *mis,
QIOChannel *ioc,
+ MigChannelType ch,
Error **errp)
{
- MigChannelType ch;
- bool ret;
-
- if (qio_channel_is_peekable(ioc)) {
- ch = migration_channel_peek(mis, ioc, errp);
- } else {
- ch = migration_channel_identify(mis, ioc, errp);
- }
-
- if (!ch) {
- return false;
- }
-
- ret = migration_incoming_setup_channel(ioc, ch, errp);
- if (!ret) {
+ if (!migration_incoming_setup_channel(ioc, ch, errp)) {
return false;
}
@@ -409,6 +391,7 @@ static gboolean migration_incoming_channel_readable(QIOChannel *ioc,
{
MigrationIncomingState *mis = opaque;
Error *local_err = NULL;
+ MigChannelType ch;
/*
* No need to monitor this channel anymore as long as anything arrived,
@@ -435,7 +418,12 @@ static gboolean migration_incoming_channel_readable(QIOChannel *ioc,
goto out;
}
- if (!migration_incoming_channel_install(mis, ioc, &local_err)) {
+ ch = migration_channel_peek(mis, ioc, &local_err);
+ if (!ch) {
+ goto out;
+ }
+
+ if (!migration_incoming_channel_install(mis, ioc, ch, &local_err)) {
goto out;
}
@@ -522,6 +510,7 @@ void migration_channel_process_incoming(QIOChannel *ioc)
{
MigrationIncomingState *mis = migration_incoming_get_current();
Error *local_err = NULL;
+ MigChannelType ch;
trace_migration_incoming_channel_process(
ioc, object_get_typename(OBJECT(ioc)));
@@ -558,7 +547,10 @@ void migration_channel_process_incoming(QIOChannel *ioc)
if (qio_channel_is_peekable(ioc)) {
migration_incoming_channel_watch(mis, ioc);
} else {
- migration_incoming_channel_install(mis, ioc, &local_err);
+ ch = migration_channel_identify(mis, ioc, &local_err);
+ if (ch) {
+ migration_incoming_channel_install(mis, ioc, ch, &local_err);
+ }
}
}
}
diff --git a/migration/migration.c b/migration/migration.c
index adba154e46..242b8ed812 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -854,10 +854,7 @@ out:
migrate_incoming_unref_outgoing_state();
}
-/*
- * Returns whether all the necessary channels to proceed with the
- * incoming migration have been established without error.
- */
+/* Return true if success, false otherwise (with *errp set) */
bool migration_incoming_setup(QIOChannel *ioc, uint8_t channel, Error **errp)
{
MigrationIncomingState *mis = migration_incoming_get_current();
@@ -886,13 +883,13 @@ bool migration_incoming_setup(QIOChannel *ioc, uint8_t channel, Error **errp)
assert(!mis->postcopy_qemufile_dst);
f = qemu_file_new_input(ioc);
postcopy_preempt_new_channel(mis, f);
- return false;
+ break;
default:
g_assert_not_reached();
}
- return migration_has_main_and_multifd_channels();
+ return true;
}
void migration_outgoing_setup(QIOChannel *ioc)
--
2.55.0
--
Peter Xu
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 6/7] migration: Fix incoming channel race with multifd and preempt_pre_7_2
2026-09-28 19:22 ` Peter Xu
@ 2026-09-28 20:38 ` Fabiano Rosas
2026-09-29 20:00 ` Peter Xu
0 siblings, 1 reply; 18+ messages in thread
From: Fabiano Rosas @ 2026-09-28 20:38 UTC (permalink / raw)
To: Peter Xu; +Cc: qemu-devel, Akash Kulhalli, Juraj Marcin
Peter Xu <peterx@redhat.com> writes:
> On Thu, Sep 24, 2026 at 06:54:25PM -0300, Fabiano Rosas wrote:
>> Peter Xu <peterx@redhat.com> writes:
>>
>> > PROBLEM
>> > =======
>> >
>> > Migration reliably hangs with old machine types (7.2-) when these migration
>> > capabilities are enabled: multifd, postcopy-ram, postcopy-preempt.
>> >
>> > Simplest reproducer :
>> >
>> > $ QTEST_QEMU_MACHINE_TYPE=pc-q35-7.2 \
>> > QTEST_QEMU_BINARY=./qemu-system-x86_64 \
>> > ./tests/qtest/migration-test --full \
>> > -r /x86_64/migration/multifd+postcopy/preempt/plain
>> >
>> > Current workaround is to kill destination QEMU, cancel the migration on
>> > source (with/without yank), disable one or more of the features, and retry.
>> >
>> > The hang is caused by receiving preempt channel before most of the multifd
>> > channels, the peek buffer operation will stuck forever.
>> >
>> > Incoming side QEMU hang (with relevant tracepoints enabled):
>> >
>> > migrate_set_state new state setup
>> > migration_socket_incoming_accepted
>> > migration_set_incoming_channel ioc=0x557d82c1caa0 ioctype=qio-channel-socket
>> > migration_socket_incoming_accepted
>> > migration_set_incoming_channel ioc=0x557d83023840 ioctype=qio-channel-socket
>> > multifd_recv_new_channel channel 1
>> > migration_socket_incoming_accepted
>> > migration_set_incoming_channel ioc=0x557d830c08c0 ioctype=qio-channel-socket
>> > multifd_recv_new_channel channel 0
>> > multifd_recv_thread_start 1
>> > migration_socket_incoming_accepted
>> > migration_set_incoming_channel ioc=0x557d8284a010 ioctype=qio-channel-socket
>> > multifd_recv_thread_start 0
>> > multifd_recv_unfill channel 0 packet_num 0 flags 0x1 next packet size 0
>> > multifd_recv_unfill channel 1 packet_num 1 flags 0x1 next packet size 0
>> > [dest qemu hangs here]
>> >
>> > Incoming side backtrace:
>> >
>> > __syscall_cancel_arch
>> > __internal_syscall_cancel
>> > __syscall_cancel
>> > recvmsg
>> > qio_channel_socket_readv
>> > qio_channel_readv_full
>> > migration_channel_read_peek
>> > migration_channel_identify
>> > migration_channel_process_incoming
>> > socket_accept_incoming_migration
>> > qio_net_listener_channel_func
>> > qio_channel_fd_source_dispatch
>> > g_main_context_dispatch_unlocked.lto_priv
>> > g_main_context_dispatch
>> > glib_pollfds_poll
>> > os_host_main_loop_wait
>> > main_loop_wait
>> > qemu_main_loop
>> > qemu_default_main
>> > main
>> >
>> > This patch tries to fix it, from incoming side first. This patch alone
>> > should enable single-direction migration to this new QEMU. The next patch
>> > will propose a fix for the outgoing path, fixing new->old migrations.
>> >
>> > BACKGROUND
>> > ==========
>> >
>> > preempt_pre_7_2 used to be a flag marking QEMU releases 7.1/7.2 only
>> > because they have a flaw on channel establishment on preempt channel.
>> >
>> > Now, after we have multifd + postcopy support, new QEMU binaries can
>> > migrate old machine types with both features enabled. Juraj reported
>> > constant migration hang at the very beginning for those old machine types
>> > in our downstream systems with such setup. Juraj found it's because of
>> > this flag.
>> >
>> > QEMU source initiates channels in this order on current master when both
>> > features enabled with postcopy-preempt mode:
>> >
>> > - First, main channel connect() happens,
>> > - Second, postcopy_preempt_setup() invokes connect() for preempt channel,
>> > - Last, in migration_thread(), multifd_send_setup() invokes connect()s
>> > for all the multifd channels
>> >
>> > However on an old QEMU, it expect the channels arrive in order of
>> > "main"->"multifd"->"preempt". Even on a new QEMU, the destination expects
>> > the same order of arrival on the channels when the channels are not
>> > peekable.
>> >
>> > For peekable channels (non-tls sockets), this time we'll likely see preempt
>> > channel appearing very soon, peeking at it causing main thread hang, like
>> > mentioned in the PROBLEM section above.
>> >
>> > SOLUTION
>> > ========
>> >
>> > One major problem of current hang is we try to peek at preempt channel,
>> > which offers nothing at the beginning.
>> >
>> > Since we'll need to accept stream from old binaries, arrival of preempt
>> > channel early is unavoidable.
>> >
>> > What we can do, though, is to allow concurrent monitoring of all channels
>> > rather than one. Meanwhile, we shouldn't peek at anything that has no
>> > data.
>> >
>> > migration_channel_read_peek() almost does the wait, but it's too late.
>> > This patch proposes to watch all channels from the start without reading at
>> > them at all, relying on an IO watch attached. This will make sure (1) for
>> > preempt channel, we never read on it (watch can be gracefully disarmed when
>> > we know it's preempt channel later) (2) since we have one IO watch for each
>> > channel, then we can allow accept() to happen in almost any order, process
>> > only when there's some header to read.
>> >
>> > To maintain these watches, a new GArray @channels_early is introduced, with
>> > each element to be a (ioc, GSource) tuple (@MigEarlyIncomingChannel), so
>> > that QEMU can manage all the IO watches later with it. Here I used GSource
>> > rather than io_tag because the GSource may or may not be attached to the
>> > default main thread gcontext: when OOB is used, it may be the iothread
>> > context instead. IOW, g_source_remove() on io_tags stops working, which
>> > only works for default main context.
>> >
>> > The trick this patch used is when we have the ability to wait on all
>> > channel headers at the same time, we pick one by one from main and multifd
>> > channels (since both of the types will contain headers dumped right at the
>> > very beginning), leave preempt channel alone. It means, after dest QEMU
>> > finds all main and multifd channels, there are three possibilities:
>> >
>> > - If preempt not enabled, we finished full channel establishment, done.
>> >
>> > - If preempt enabled,
>> >
>> > - If we have one registered IO watch with the IOC, it must be the
>> > preempt channel,
>> >
>> > - If we have no further IO watch, wait for the next accept(), which
>> > must be the preempt channel.
>> >
>> > This will make channel establish work on incoming side even with the old
>> > QEMU binaries.
>> >
>> > While working on it, I managed to refactor the peeking logic quite a bit:
>> > we used to have a very convoluted migration_channel_identify() function,
>> > taking care of two different cases:
>> >
>> > (1) when the channel is peekable (like normal socket channels),
>> > (2) when the channel is not peekable (like TLS or file migrations).
>> >
>> > This patch refactored that part to make it crystal clear on how we make
>> > decisions on which channel is which, and split the peek/identify paths.
>> >
>> > One example incoming migration from pc-q35-7.2 after this patch applied,
>> > and with relevant tracepoints set (8 multifd channels, 1 preempt channel):
>> >
>> > migrate_set_state new state setup
>> > migration_channel_process_incoming ioc=0x557dc8af4e20 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc8af4e20 ioctype=qio-channel-socket
>> > migration_channel_process_incoming ioc=0x557dc8abc5d0 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc8abc5d0 ioctype=qio-channel-socket
>> > migration_channel_process_incoming ioc=0x557dc953d680 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc953d680 ioctype=qio-channel-socket
>> > migration_set_incoming_channel ioc=0x557dc8abc5d0 ioctype=qio-channel-socket type=MULTIFD
>> > migration_channel_process_incoming ioc=0x557dc898a820 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc898a820 ioctype=qio-channel-socket
>> > migration_set_incoming_channel ioc=0x557dc953d680 ioctype=qio-channel-socket type=MULTIFD
>> > migration_channel_process_incoming ioc=0x557dc919bd70 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc919bd70 ioctype=qio-channel-socket
>> > migration_set_incoming_channel ioc=0x557dc898a820 ioctype=qio-channel-socket type=MULTIFD
>> > migration_channel_process_incoming ioc=0x557dc8734b20 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc8734b20 ioctype=qio-channel-socket
>> > migration_set_incoming_channel ioc=0x557dc919bd70 ioctype=qio-channel-socket type=MULTIFD
>> > migration_channel_process_incoming ioc=0x557dc898bdf0 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc898bdf0 ioctype=qio-channel-socket
>> > migration_set_incoming_channel ioc=0x557dc8734b20 ioctype=qio-channel-socket type=MULTIFD
>> > migration_channel_process_incoming ioc=0x557dc968cfd0 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc968cfd0 ioctype=qio-channel-socket
>> > migration_set_incoming_channel ioc=0x557dc898bdf0 ioctype=qio-channel-socket type=MULTIFD
>> > migration_channel_process_incoming ioc=0x557dc8c31810 ioctype=qio-channel-socket
>> > migration_incoming_channel_watch ioc=0x557dc8c31810 ioctype=qio-channel-socket
>> > migration_set_incoming_channel ioc=0x557dc968cfd0 ioctype=qio-channel-socket type=MULTIFD
>> > migration_set_incoming_channel ioc=0x557dc8c31810 ioctype=qio-channel-socket type=MULTIFD
>> > migration_set_incoming_channel ioc=0x557dc8af4e20 ioctype=qio-channel-socket type=MAIN
>> > migration_start_incoming
>> > migrate_set_state new state active
>> > migration_channel_process_incoming ioc=0x557dc8966160 ioctype=qio-channel-socket
>> > migration_set_incoming_channel ioc=0x557dc8966160 ioctype=qio-channel-socket type=PREEMPT
>> >
>> > While at it, I renamed the four channel incoming/outgoing tracepoints, make
>> > all to follow migration_[incoming|outgoing]_channel_*(). Especially for
>> > incoming, then we can enable migration_incoming_channel* for incoming
>> > channel debuggings.
>> >
>> > FINAL NOTE ON TLS
>> > =================
>> >
>> > Note that this solution isn't a magic bullet fixing everything. TLS is not
>> > fixable with this approach because TLS isn't peekable channel, hence the
>> > watch won't help.
>> >
>> > We can have other ways to hack it to make it work, e.g. we can make TLS
>> > channels peekable too, but I don't want to pollute the TLS iochannel only
>> > for this: let's hope handshake will arrive soon so we can drop these code.
>> >
>> > For now, when TLS is involved with such old machine type (7.2-), one needs
>> > to migrate it out with any combination of features except enabling all
>> > four (multifd + TLS + postcopy + preempt) to a patched binary, after that,
>> > all combinations will start working.
>> >
>> > BugLink: https://redhat.atlassian.net/browse/RHEL-254933
>> > Fixes: e27418861288 ("migration: enable multifd and postcopy together")
>> > Reported-by: Juraj Marcin <jmarcin@redhat.com>
>> > Signed-off-by: Peter Xu <peterx@redhat.com>
>> > ---
>> > migration/channel.h | 3 +
>> > migration/migration.h | 35 ++++
>> > migration/channel.c | 414 +++++++++++++++++++++++++++++++++++------
>> > migration/migration.c | 23 ++-
>> > migration/trace-events | 7 +-
>> > 5 files changed, 421 insertions(+), 61 deletions(-)
>>
>> Hi Peter, I think the code looks good, but there are some twists and
>> turns that I think we can get rid of. I put a fixup patch [1] at the end
>> with my suggestions and mentioned inline what I changed and why.
>
> Thanks, especially for covering the tests while suggesting.
>
> I believe I agree with many of them, I'll comment on the rest, see inline.
>
>>
>> >
>> > diff --git a/migration/channel.h b/migration/channel.h
>> > index 678712f291..40bd339a3e 100644
>> > --- a/migration/channel.h
>> > +++ b/migration/channel.h
>> > @@ -49,4 +49,7 @@ bool migration_channel_parse_input(const char *uri,
>> > MigrationChannel **main_channelp,
>> > MigrationChannel **cpr_channelp,
>> > Error **errp);
>> > +
>> > +void migration_incoming_free_early_channels(MigrationIncomingState *mis);
>> > +
>> > #endif
>> > diff --git a/migration/migration.h b/migration/migration.h
>> > index 683bc7bdd5..6f23e1805b 100644
>> > --- a/migration/migration.h
>> > +++ b/migration/migration.h
>> > @@ -90,6 +90,28 @@ typedef enum {
>> > PREEMPT_THREAD_QUIT,
>> > } PreemptThreadStatus;
>> >
>> > +typedef struct {
>> > + /*
>> > + * The GSource we have allocated to track G_IO_IN events for the
>> > + * channel. Note: it may not be attached to the default main gcontext,
>> > + * for example, when in case of io watch created during an OOB
>> > + * migrate-recover command.
>> > + */
>> > + GSource *source;
>> > + /* The channel we will identify later after getting some buffers to read */
>> > + QIOChannel *ioc;
>> > +} MigEarlyIncomingChannel;
>> > +
>> > +typedef struct {
>> > + GArray *channels;
>> > + /*
>> > + * In most cases, channels are only operated with BQl, but since we
>> > + * have OOB command support, don't assume it, just use a standalone
>> > + * mutex to protect any access to the channels array.
>> > + */
>> > + QemuMutex mutex;
>> > +} MigEarlyIncomingChannels;
>> > +
>> > /* State for the incoming migration */
>> > struct MigrationIncomingState {
>> > QEMUFile *from_src_file;
>> > @@ -255,6 +277,19 @@ struct MigrationIncomingState {
>> >
>> > /* Do exit on incoming migration failure */
>> > bool exit_on_error;
>> > +
>> > + /*
>> > + * Maintains all channels only at early stage. After incoming
>> > + * migration started, this should be an empty array and no use anymore.
>> > + *
>> > + * TODO: we logically only need this to make new QEMU binaries work for
>> > + * old machines who have @preempt_pre_7_2 set on the source, but it's
>> > + * also good to have this early stage anyway, making sure when peek the
>> > + * channel there will be something in the channel. Ideally, we should
>> > + * manage all migration channels in the future with proper headers,
>> > + * then we can drop this.
>> > + */
>> > + MigEarlyIncomingChannels channels_early;
>> > };
>> >
>> > MigrationIncomingState *migration_incoming_get_current(void);
>> > diff --git a/migration/channel.c b/migration/channel.c
>> > index b9065efd03..acb7ef5206 100644
>> > --- a/migration/channel.c
>> > +++ b/migration/channel.c
>> > @@ -12,6 +12,8 @@
>> >
>> > #include "qemu/osdep.h"
>> > #include "qemu/cutils.h"
>> > +#include "qemu/main-loop.h"
>> > +#include "qemu/error-report.h"
>> > #include "channel.h"
>> > #include "exec.h"
>> > #include "fd.h"
>> > @@ -146,61 +148,84 @@ bool migration_has_all_channels(void)
>> > return true;
>> > }
>> >
>> > -static MigChannelType migration_channel_identify(MigrationIncomingState *mis,
>> > - QIOChannel *ioc, Error **errp)
>> > +static bool qio_channel_is_peekable(QIOChannel *ioc)
>> > +{
>> > + return qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_READ_MSG_PEEK);
>> > +}
>> > +
>> > +/*
>> > + * With multiple channels, it is possible that we receive channels out of
>> > + * order on destination side, causing incorrect mapping of source channels
>> > + * on destination side.
>> > + *
>> > + * When the channel is peekable (e.g. non-TLS socket channels), check
>> > + * channel MAGIC to decide type of channel.
>> > + *
>> > + * Please note this is best effort, postcopy preempt channel does not send
>> > + * any magic number so avoid it for postcopy live migration.
>> > + *
>> > + * Returns: >0 if success, ==0 (CH_NONE) if error. If error happened,
>> > + * *errp must be set.
>> > + */
>> > +static MigChannelType migration_channel_peek(MigrationIncomingState *mis,
>> > + QIOChannel *ioc,
>> > + Error **errp)
>> > {
>> > MigChannelType channel = CH_NONE;
>> > uint32_t channel_magic = 0;
>> > int ret = 0;
>> >
>> > - if (!migration_has_main_and_multifd_channels()) {
>> > - if (qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_READ_MSG_PEEK)) {
>> > - /*
>> > - * With multiple channels, it is possible that we receive channels
>> > - * out of order on destination side, causing incorrect mapping of
>> > - * source channels on destination side. Check channel MAGIC to
>> > - * decide type of channel. Please note this is best effort,
>> > - * postcopy preempt channel does not send any magic number so
>> > - * avoid it for postcopy live migration. Also tls live migration
>> > - * already does tls handshake while initializing main channel so
>> > - * with tls this issue is not possible.
>> > - */
>> > - ret = migration_channel_read_peek(ioc, (void *)&channel_magic,
>> > - sizeof(channel_magic), errp);
>> > - if (ret != 0) {
>> > - goto out;
>> > - }
>> > + assert(qio_channel_is_peekable(ioc));
>> >
>> > - channel_magic = be32_to_cpu(channel_magic);
>> > - if (channel_magic == QEMU_VM_FILE_MAGIC) {
>> > - channel = CH_MAIN;
>> > - } else if (channel_magic == MULTIFD_MAGIC) {
>> > - assert(migrate_multifd());
>> > - channel = CH_MULTIFD;
>> > - } else if (!mis->from_src_file &&
>> > - mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {
>> > - /* reconnect main channel for postcopy recovery */
>> > - channel = CH_MAIN;
>> > - } else {
>> > - error_setg(errp, "unknown channel magic: %u", channel_magic);
>> > - }
>> > - } else if (mis->from_src_file && migrate_multifd()) {
>> > - /*
>> > - * Non-peekable channels like tls/file are processed as
>> > - * multifd channels when multifd is enabled.
>> > - */
>> > - channel = CH_MULTIFD;
>> > - } else if (!mis->from_src_file) {
>> > - channel = CH_MAIN;
>> > - } else {
>> > - error_setg(errp, "non-peekable channel used without multifd");
>> > - }
>> > + ret = migration_channel_read_peek(ioc, (void *)&channel_magic,
>> > + sizeof(channel_magic), errp);
>> > + if (ret != 0) {
>> > + /* Failed */
>> > + return channel;
>> > + }
>> > +
>> > + channel_magic = be32_to_cpu(channel_magic);
>> > +
>> > + if (channel_magic == QEMU_VM_FILE_MAGIC) {
>> > + channel = CH_MAIN;
>> > + } else if (channel_magic == MULTIFD_MAGIC) {
>> > + assert(migrate_multifd());
>> > + channel = CH_MULTIFD;
>> > + } else if (!mis->from_src_file &&
>> > + mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {
>> > + /* reconnect main channel for postcopy recovery */
>> > + channel = CH_MAIN;
>>
>> This is not peeking, maybe it should be somewhere else. Not this patch's
>> fault, we can think about it some other day.
>
> If we separate "peek" from "identify", this one still falls into "peek".
>
> Per my definition, the latter "identify" only does "pick channels by order
> they arrive". Then this doesn't belong to that. As it needs to "peek for
> at least something readable", rather than blindly rely on the order of
> arrival.
>
> But yeah, it'll be good we leave this for later regardless.
>
>>
>> > } else {
>> > + error_setg(errp, "Unknown channel magic: %u", channel_magic);
>> > + }
>> > +
>> > + return channel;
>> > +}
>> > +
>> > +/*
>> > + * Returns: >0 if success, ==0 (CH_NONE) if error. If error happened,
>> > + * *errp must be set.
>> > + */
>> > +static MigChannelType migration_channel_identify(MigrationIncomingState *mis,
>> > + QIOChannel *ioc, Error **errp)
>> > +{
>> > + MigChannelType channel = CH_NONE;
>> > +
>> > + if (migration_has_main_and_multifd_channels()) {
>> > assert(migrate_postcopy_preempt());
>> > channel = CH_POSTCOPY;
>>
>> This check is the same as the one at
>> migration_channel_process_incoming(). I think we can simplify this.
>
> True, this path should be dead code when original patch applied. I have a
> slight preference on keeping the other one instead (which I know you tend
> to think "awkward"). I'll explain below, and we'll see.
>
>>
>> See [1].
>>
>> > + } else if (!mis->from_src_file) {
>> > + channel = CH_MAIN;
>> > + } else if (migrate_multifd()) {
>> > + /*
>> > + * Non-peekable channels like tls/file are processed as
>> > + * multifd channels when multifd is enabled.
>> > + */
>> > + channel = CH_MULTIFD;
>> > + } else {
>> > + error_setg(errp, "Unexpected non-peekable channel observed");
>> > }
>> >
>> > -out:
>> > return channel;
>> > }
>> >
>> > @@ -214,31 +239,275 @@ static void migration_incoming_error_propagate(MigrationIncomingState *mis,
>> > }
>> > }
>> >
>> > +/* Must be with mis->channels_early.mutex held */
>> > +static void
>> > +migration_incoming_early_channel_insert(MigrationIncomingState *mis,
>> > + QIOChannel *ioc,
>> > + GSource *source)
>> > +{
>> > + MigEarlyIncomingChannel chan = {
>> > + .source = source,
>> > + .ioc = ioc,
>> > + };
>> > +
>> > + object_ref(OBJECT(ioc));
>> > + g_source_ref(source);
>> > +
>> > + g_array_append_val(mis->channels_early.channels, chan);
>> > +}
>> > +
>> > +static void migration_incoming_early_channel_free(GArray *channels, int i)
>> > +{
>> > + MigEarlyIncomingChannel *chan;
>> > +
>> > + chan = &g_array_index(channels, MigEarlyIncomingChannel, i);
>> > +
>> > + g_source_destroy(chan->source);
>> > + g_source_unref(chan->source);
>> > + object_unref(OBJECT(chan->ioc));
>> > +
>> > + g_array_remove_index_fast(channels, i);
>> > +}
>> > +
>> > +/*
>> > + * Remove this channel from the monitoring of @channels_early array.
>> > + * Return true if found and successful, false otherwise.
>> > + */
>> > +static bool
>> > +migration_incoming_early_channel_remove(MigrationIncomingState *mis,
>> > + QIOChannel *ioc)
>> > +{
>> > + GArray *channels = mis->channels_early.channels;
>> > + MigEarlyIncomingChannel *chan;
>> > + int i;
>> > +
>> > + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
>> > +
>> > + for (i = 0; i < channels->len; i++) {
>> > + chan = &g_array_index(channels, MigEarlyIncomingChannel, i);
>> > + if (chan->ioc != ioc) {
>> > + continue;
>> > + }
>> > + migration_incoming_early_channel_free(channels, i);
>> > + return true;
>> > + }
>> > +
>> > + return false;
>> > +}
>> > +
>> > +void migration_incoming_free_early_channels(MigrationIncomingState *mis)
>> > +{
>> > + GArray *channels = mis->channels_early.channels;
>> > +
>> > + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
>> > +
>> > + while (channels->len) {
>> > + migration_incoming_early_channel_free(channels, 0);
>> > + }
>> > +}
>> > +
>> > +static bool migration_incoming_setup_channel(QIOChannel *ioc,
>> > + MigChannelType ch,
>> > + Error **errp)
>> > +{
>> > + trace_migration_incoming_channel_set(ioc,
>> > + object_get_typename(OBJECT(ioc)),
>> > + mig_channel_str[ch]);
>> > + migration_ioc_register_yank(ioc);
>> > + /* TODO: make this return the success status instead */
>> > + migration_incoming_setup(ioc, ch, errp);
>>
>> I implemented this TODO. It allows us to skip the main+mfd check after
>> starting migration because migration_incoming_setup() already returns
>> that value. See [1].
>
> Actually now looking at this patch, this TODO is so trivial.. yes I'll do
> it.
>
> But when I do it, I think it too error prone to return a value returned
> from migration_has_main_and_multifd_channels() for this function. I
> changed it to simple true/false for success or not instead. I'll attach a
> 2nd version of the fixup patch at the end, applying most changes you
> suggested but stick with returning true/false for this one.
>
>>
>> > +
>> > + return *errp == NULL;
>> > +}
>> > +
>> > static bool migration_incoming_channel_install(MigrationIncomingState *mis,
>> > QIOChannel *ioc,
>> > Error **errp)
>> > {
>> > - MigChannelType ch = migration_channel_identify(mis, ioc, errp);
>> > + MigChannelType ch;
>> > + bool ret;
>> > +
>> > + if (qio_channel_is_peekable(ioc)) {
>>
>> This check is redundant, we can only arrive here via the watch and we
>> checked peekable already at migration_channel_process_incoming. See [1].
>
> Shouldn't? Because the file path uses migration_incoming_channel_install()
> too, afaict.
>
> But I see how your question came, which I'm guessing: I used this function
> in a peekable only path, so here what I can do minimum is I can move the
> migration_channel_peek() to the peekable path, then move the other path of
> migration_channel_identify() to the e.g. file path. I'll do that.
>
>>
>> > + ch = migration_channel_peek(mis, ioc, errp);
>> > + } else {
>> > + ch = migration_channel_identify(mis, ioc, errp);
>> > + }
>> >
>> > if (!ch) {
>> > - assert(*errp);
>> > return false;
>> > }
>> >
>> > - trace_migration_set_incoming_channel(ioc,
>> > - object_get_typename(OBJECT(ioc)),
>> > - mig_channel_str[ch]);
>> > - migration_ioc_register_yank(ioc);
>> > + ret = migration_incoming_setup_channel(ioc, ch, errp);
>> > + if (!ret) {
>> > + return false;
>> > + }
>> >
>> > - if (migration_incoming_setup(ioc, ch, errp)) {
>> > + /* Installation succeeded, kickoff migration if needed */
>> > + if (migration_has_main_and_multifd_channels()) {
>> > migration_start_incoming();
>> > }
>> >
>> > - if (*errp) {
>> > - return false;
>> > + return true;
>> > +}
>> > +
>> > +static void
>> > +migration_incoming_channel_preempt_setup(QIOChannel *ioc)
>> > +{
>> > + assert(migrate_postcopy_preempt());
>> > + /* Installation of preempt channel should never fail */
>> > + migration_incoming_setup_channel(ioc, CH_POSTCOPY, &error_abort);
>> > +}
>> > +
>> > +static void
>> > +migration_incoming_detect_preempt_channel(MigrationIncomingState *mis)
>> > +{
>> > + GArray *channels = mis->channels_early.channels;
>> > + MigEarlyIncomingChannel *chan;
>> > +
>> > + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
>> > +
>> > + /* When preempt mode not enabled, nothing to detect.. */
>> > + if (!migrate_postcopy_preempt()) {
>> > + /*
>> > + * .. but if we found something pending, throw an error only, which
>> > + * should not happen. Even if it happens, resources will still be
>> > + * released after incoming migration is completedly.
>> > + */
>> > + if (channels->len) {
>> > + error_report("%s: Found %u unused channels",
>> > + __func__, channels->len);
>> > + }
>> > + return;
>> > }
>> >
>> > - return true;
>> > + /* Preempt channel hasn't yet arrived? Process it later */
>> > + if (!channels->len) {
>> > + return;
>> > + }
>> > +
>> > + /*
>> > + * More than one channel should never happen.. capture it in case if
>> > + * it happens, then there's not much we can do.
>> > + */
>> > + if (channels->len > 1) {
>> > + error_report("%s: Found %u unused channels, "
>> > + "can't identify preempt channel",
>> > + __func__, channels->len);
>> > + return;
>> > + }
>> > +
>> > + assert(channels->len == 1);
>> > + /* This is the preempt channel, install it directly */
>> > + chan = &g_array_index(channels, MigEarlyIncomingChannel, 0);
>> > + migration_incoming_channel_preempt_setup(chan->ioc);
>> > + migration_incoming_early_channel_free(channels, 0);
>> > +}
>> > +
>> > +static gboolean migration_incoming_channel_readable(QIOChannel *ioc,
>> > + GIOCondition condition,
>> > + gpointer opaque)
>> > +{
>> > + MigrationIncomingState *mis = opaque;
>> > + Error *local_err = NULL;
>> > +
>> > + /*
>> > + * No need to monitor this channel anymore as long as anything arrived,
>> > + * remove it from tracking.
>> > + *
>> > + * NOTE: this means if partial data arrived we may still block here,
>> > + * but it shouldn't happen in production, only malicious stream. Since
>> > + * migration stream is trusted (either due to trusted network, or TLS),
>> > + * that's non-issue.
>>
>> Could we check the amount of data and keep waiting?
>
> We could, but it is about the security side of things, I'd not bother in
> this patch, and maybe we don't bother forever, hopping that at the end of
> this year we enable handshake in next release, then this is a ioc read()
> block reading, as simple as that.
>
Ok, no worries.
>>
>> > + *
>> > + * NOTE2: this will also release the ioc ref that we used to hold, but
>> > + * it's fine since we have at least one more refcount in the current
>> > + * event handler.
>>
>> I don't understand "one more ref in the event handler". Looks like
>> you're trying to say the refcount is consistent, but why even mention
>> it? I may be missing something.
>
> Not about consistency, it's about holding at least one refcount to make sure
> migration_incoming_early_channel_remove() won't already free the IOC.
>
> But I think maybe you're right: likely nobody will notice the context of
> this path processing the gsource, and maybe this sentence brings more
> confusion than clarity? Let me know, I can drop this line.
>
You mean the inc at qio_channel_create_fd_watch()? Then we don't need
this comment.
>>
>> > + *
>> > + * NOTE3: it's theoretically possible that this entry is gone reaching
>> > + * here. Example: the main thread is doing incoming cleanup having this
>> > + * one removed, while this watch can be registered on the monitor
>> > + * iothread's context and fired at the exact same time but in the
>> > + * iothread instead. If it happens, skip the rest. I'm not sure if
>> > + * this could happen at all, may depend on iothread lifespan management
>> > + * in the main thread, but be prepared.
>>
>> I wonder if we should extend the locking a bit further. Not because of
>> what you mentioned here^, but because everything the code running on the
>> monitor thread touches can race with changes from the main loop. All of
>> these migrate_foo_bar() helpers, the QEMUFiles, caps, params, etc.
>
> Is that about the new lock (mis->channels_early.mutex) or existing code?
> Possible to do on top, or a new concern introduced from this patch?
>
If we can reach migration_channel_process_incoming() via OOB command,
then everything below it needs to be audited to ensure we're not
changing global state concurrently. Mostly pre-existing, but you are
adding more code inside the danger window.
>>
>> > + */
>> > + if (!migration_incoming_early_channel_remove(mis, ioc)) {
>> > + goto out;
>> > + }
>> > +
>>
>> I moved the peek into here and passed the already identified
>> channel into migration_incoming_channel_install(). See [1].
>
> Agree on this change, better.
>
>>
>> > + if (!migration_incoming_channel_install(mis, ioc, &local_err)) {
>> > + goto out;
>> > + }
>> > +
>> > + if (migration_has_main_and_multifd_channels()) {
>>
>> This check became redundant because the _setup routine already returns
>> it. See [1].
>
> I didn't adopt this in my new fixup, because I want to avoid returning that
> info deep from stack. Let's continue the discussion in my fixup there as a
> reply.
>
I wrote a migration_can_start() routine and tried to incorporate some
preempt channel knowledge into it, but it didn't work so well. I find it
a bit opaque to look only at main+mfd channels to start the
migration. Since nothing better came up so far, I agree you keep this
here.
>>
>> > + /*
>> > + * Possibilities when reaching here:
>> > + *
>> > + * (1) if preempt not enabled, this should be no-op, all done,
>> > + * (2) if preempt enabled,
>> > + * (2.a) preempt channel arrived @channels_early, handle it now
>> > + * (2.b) preempt channel not arrived, to be handled in
>> > + * migration_channel_process_incoming() later
>> > + */
>> > + migration_incoming_detect_preempt_channel(mis);
>>
>> Moved this into migration_incoming_channel_install(). See [1].
>
> Since my version used migration_incoming_channel_install() for both
> peekable and non-peekable, this path is not needed for non-peekable.
> I still left it here, assuming it's clearer it's only needed for peekable.
> But you can reply with your thought. I hope at least we can be more
> focused with most of the rest addressed.
>
I tend to prefer having a single path and make it a noop via code than
to have two paths and use our knowledge of the code to decide what goes
where. Here we can't escape having two paths, so it's not a huge deal.
>>
>> > + }
>> > +
>> > +out:
>> > + if (local_err) {
>> > + migration_incoming_error_propagate(mis, local_err);
>> > + }
>> > +
>> > + /*
>> > + * NOTE: we should have already detached the GSource, returning
>> > + * G_SOURCE_REMOVE to be logically consistent only.
>> > + */
>> > + return G_SOURCE_REMOVE;
>> > +}
>> > +
>> > +static void migration_incoming_channel_watch(MigrationIncomingState *mis,
>> > + QIOChannel *ioc)
>> > +{
>> > + GMainContext *context = g_main_context_get_thread_default();
>> > + GSource *source;
>> > + guint io_tag;
>> > +
>> > + trace_migration_incoming_channel_watch(ioc,
>> > + object_get_typename(OBJECT(ioc)));
>> > +
>> > + /*
>> > + * Careful: this can be run from either the main thread or the monitor
>> > + * iothread when migrate_recover is used with OOB=on, so we need to
>> > + * take the lock and use the full version to specify the correct
>> > + * context.
>> > + */
>> > + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
>> > +
>> > + /*
>> > + * We should never watch an @ioc that is not peekable, because there's
>> > + * no point. What is worse is we lose the real order of accept()s via
>> > + * the asynchronous IO watch operation.
>> > + *
>> > + * Another note is TLS channel (non-peekable) may or may not work
>> > + * properly with IO watch due to its current .io_create_watch() impl,
>> > + * which is another story. Just guard both points.
>> > + */
>> > + assert(qio_channel_is_peekable(ioc));
>> > + io_tag = qio_channel_add_watch_full(ioc, G_IO_IN,
>> > + migration_incoming_channel_readable,
>> > + mis, NULL, context);
>> > +
>> > + /*
>> > + * Replace this if one day qio_channel_add_watch*() API can directly
>> > + * return the GSource*.. for now, stick with it.
>> > + */
>> > + source = g_main_context_find_source_by_id(context, io_tag);
>> > + /*
>> > + * Nothing can race with adding the IO watch, aka, concurrent removal
>> > + * is not possible when we have the lock. So it must be present.
>> > + */
>> > + assert(source);
>> > +
>> > + migration_incoming_early_channel_insert(mis, ioc, source);
>> > }
>> >
>> > /**
>> > @@ -254,13 +523,44 @@ void migration_channel_process_incoming(QIOChannel *ioc)
>> > MigrationIncomingState *mis = migration_incoming_get_current();
>> > Error *local_err = NULL;
>> >
>> > - trace_migration_channel_process_incoming(
>> > + trace_migration_incoming_channel_process(
>> > ioc, object_get_typename(OBJECT(ioc)));
>> >
>> > if (migrate_channel_requires_tls_upgrade(ioc)) {
>> > migration_tls_channel_process_incoming(ioc, &local_err);
>> > } else {
>> > - migration_incoming_channel_install(mis, ioc, &local_err);
>> > + if (migration_has_main_and_multifd_channels()) {
>>
>> The fact that this check must come before everything is a major
>> weirdness. In fact, this is conceptually the same case as the first
>> branch in migration_channel_identify(). I therefore moved that function
>> to this point and added a comment explaining why this must come
>> first. See [1].
>
> This is one part that I left alone so far. My reason is that preempt
> channel needs special care at least for peekable, it's because it's not
> peekable there when hitting this case. So we need to have this separate
> path. This is also relevant to below, where..
>
You removed the check from _identify, so it's less confusing now.
>>
>> > + /*
>> > + * If all main+multifd channels are present already, this must
>> > + * be the preempt channel.
>> > + *
>> > + * QEMU can't register an IO watch for it if there is only the
>> > + * last preempt channel left, because it means the IO watch
>> > + * will never fire and nobody will pick it up: we rely on the
>> > + * one before the last one to pick both.
>> > + *
>> > + * See comment in migration_incoming_channel_readable() on
>> > + * the migration_incoming_detect_preempt_channel() call.
>> > + */
>> > + migration_incoming_channel_preempt_setup(ioc);
>> > + } else {
>> > + /*
>> > + * Register an IO watch for peekable channels, so that channels
>> > + * can be accept()ed with any order.
>> > + *
>> > + * Non-peekable channels (file, TLS, etc.) cannot register IO
>> > + * watch, not only because there's no data to look at to help
>> > + * making the decision, but also because after registering we
>> > + * will lose the real ordering we get from accept(), which is
>> > + * still so far the only source of truth to identify a channel
>> > + * in such case.
>> > + */
>> > + if (qio_channel_is_peekable(ioc)) {
>>
>> I moved this line into migration_channel_identify(). That way we ensure
>> the ordering regarding the main+mfd check. The watch is still installed
>> at this point. See [1].
>
> ... you suggested moving this into migration_channel_identify().
>
> Personally I think it's against my purpose of split: I wanted to make
> migration_channel_identify() to only rely on order of arrival to identify
> channels, nothing else. Then for all peekable handling, it should be
> inside the _peek() function.
>
ok
>>
>> > + migration_incoming_channel_watch(mis, ioc);
>> > + } else {
>> > + migration_incoming_channel_install(mis, ioc, &local_err);
>>
>> This invocation of install does not check for the preempt channel after
>> it returns. Is this simply assuming that if a non-peekable channel is
>> present then there will be no preempt channel at all?
>>
>> Or if main+TLS is the first channel, then the next channel will be
>> preempt and already enter the first branch?
>
> Yes. It's because for non-peekable, preempt channel is only processed
> above (in my patch logic, with/without my new fixup to be attached).
>
> For peekable, preempt channel may be picked up by the 2nd last channel,
> which is not possible for non-peekable, so that is special way for peekable
> channels only.
>
>>
>> > + }
>> > + }
>> > }
>> >
>> > if (local_err) {
>> > @@ -270,7 +570,7 @@ void migration_channel_process_incoming(QIOChannel *ioc)
>> >
>> > void migration_channel_connect_outgoing(MigrationState *s, QIOChannel *ioc)
>> > {
>> > - trace_migration_set_outgoing_channel(ioc, object_get_typename(OBJECT(ioc)));
>> > + trace_migration_outgoing_channel_set(ioc, object_get_typename(OBJECT(ioc)));
>> >
>> > if (migrate_channel_requires_tls_upgrade(ioc)) {
>> > Error *local_err = NULL;
>> > diff --git a/migration/migration.c b/migration/migration.c
>> > index cfadcc79c2..4cc4077a76 100644
>> > --- a/migration/migration.c
>> > +++ b/migration/migration.c
>> > @@ -334,6 +334,10 @@ void migration_object_init(void)
>> > current_incoming->page_requested = g_tree_new(page_request_addr_cmp);
>> >
>> > current_incoming->exit_on_error = INMIGRATE_DEFAULT_EXIT_ON_ERROR;
>> > + /* zero_terminated=false, clear_=true */
>>
>> There's an extra _ after 'clear' I think.
>
> See? I know someone else will get confused too. :)
>
hahaha crap. Put a +1 next to that comment and let's increment it every
time someone mentions this.
> https://docs.gtk.org/glib/type_func.Array.new.html
>
> GArray*
> g_array_new (
> gboolean zero_terminated,
> gboolean clear_,
> guint element_size
> )
>
> ...
>
> clear_
> Type: gboolean
>
> If true, GArray elements should be automatically cleared to 0 when they are allocated.
>
>>
>> > + current_incoming->channels_early.channels =
>> > + g_array_new(FALSE, TRUE, sizeof(MigEarlyIncomingChannel));
>> > + qemu_mutex_init(¤t_incoming->channels_early.mutex);
>> >
>> > migration_object_check(current_migration, &error_fatal);
>> >
>> > @@ -447,6 +451,24 @@ void migration_incoming_state_destroy(void)
>> > MigrationIncomingState *mis = migration_incoming_get_current();
>> > PostcopyState ps = postcopy_state_get();
>> >
>> > + /* Cleanup listener to make sure no further accept() for sockets */
>> > + migration_incoming_transport_cleanup(mis);
>> > +
>> > + /*
>> > + * It's safer to free channel watches earlier than most of the rest, in
>> > + * case the IO watches could fire in the monitor iothread concurrently
>> > + * against this function.
>>
>> Now I'm getting worried. Cleanup races are super annoying. This is
>> "just" about the recovery command, right?
>
> I think so.
>
> Note: I didn't have any way to trigger any crash at all, this is something
> when I had AI review my code and it pointed out this. I thought I should
> be safe than sorry.
>
It will happen in CI one day when we least expect it, don't worry. =)
It's fine, I don't think it's good use of our time to overthink this at
the moment.
> Below is my fixup. The hope is I addressed most of them but not all, with
> reasonings inline above. Let me know.
>
>
> ===8<===
> From eb03b1b648b91a317a8a7559240186c87d835b8c Mon Sep 17 00:00:00 2001
> From: Peter Xu <peterx@redhat.com>
> Date: Mon, 28 Sep 2026 11:35:20 -0400
> Subject: [PATCH] fixup! migration: Fix incoming channel race with multifd and
> preempt_pre_7_2
>
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
> migration/channel.c | 42 +++++++++++++++++-------------------------
> migration/migration.c | 9 +++------
> 2 files changed, 20 insertions(+), 31 deletions(-)
>
> diff --git a/migration/channel.c b/migration/channel.c
> index acb7ef5206..72de9c9778 100644
> --- a/migration/channel.c
> +++ b/migration/channel.c
> @@ -204,17 +204,14 @@ static MigChannelType migration_channel_peek(MigrationIncomingState *mis,
>
> /*
> * Returns: >0 if success, ==0 (CH_NONE) if error. If error happened,
> - * *errp must be set.
> + * *errp must be set. NOTE: preempt channel is done separately.
> */
> static MigChannelType migration_channel_identify(MigrationIncomingState *mis,
> QIOChannel *ioc, Error **errp)
> {
> MigChannelType channel = CH_NONE;
>
> - if (migration_has_main_and_multifd_channels()) {
> - assert(migrate_postcopy_preempt());
> - channel = CH_POSTCOPY;
Fair.
> - } else if (!mis->from_src_file) {
> + if (!mis->from_src_file) {
> channel = CH_MAIN;
> } else if (migrate_multifd()) {
> /*
> @@ -314,31 +311,16 @@ static bool migration_incoming_setup_channel(QIOChannel *ioc,
> object_get_typename(OBJECT(ioc)),
> mig_channel_str[ch]);
> migration_ioc_register_yank(ioc);
> - /* TODO: make this return the success status instead */
> - migration_incoming_setup(ioc, ch, errp);
>
> - return *errp == NULL;
> + return migration_incoming_setup(ioc, ch, errp);
> }
>
> static bool migration_incoming_channel_install(MigrationIncomingState *mis,
> QIOChannel *ioc,
> + MigChannelType ch,
> Error **errp)
> {
> - MigChannelType ch;
> - bool ret;
> -
> - if (qio_channel_is_peekable(ioc)) {
> - ch = migration_channel_peek(mis, ioc, errp);
> - } else {
> - ch = migration_channel_identify(mis, ioc, errp);
> - }
> -
> - if (!ch) {
> - return false;
> - }
> -
> - ret = migration_incoming_setup_channel(ioc, ch, errp);
> - if (!ret) {
> + if (!migration_incoming_setup_channel(ioc, ch, errp)) {
> return false;
> }
>
> @@ -409,6 +391,7 @@ static gboolean migration_incoming_channel_readable(QIOChannel *ioc,
> {
> MigrationIncomingState *mis = opaque;
> Error *local_err = NULL;
> + MigChannelType ch;
>
> /*
> * No need to monitor this channel anymore as long as anything arrived,
> @@ -435,7 +418,12 @@ static gboolean migration_incoming_channel_readable(QIOChannel *ioc,
> goto out;
> }
>
> - if (!migration_incoming_channel_install(mis, ioc, &local_err)) {
> + ch = migration_channel_peek(mis, ioc, &local_err);
> + if (!ch) {
> + goto out;
> + }
> +
> + if (!migration_incoming_channel_install(mis, ioc, ch, &local_err)) {
> goto out;
> }
>
> @@ -522,6 +510,7 @@ void migration_channel_process_incoming(QIOChannel *ioc)
> {
> MigrationIncomingState *mis = migration_incoming_get_current();
> Error *local_err = NULL;
> + MigChannelType ch;
>
> trace_migration_incoming_channel_process(
> ioc, object_get_typename(OBJECT(ioc)));
> @@ -558,7 +547,10 @@ void migration_channel_process_incoming(QIOChannel *ioc)
> if (qio_channel_is_peekable(ioc)) {
> migration_incoming_channel_watch(mis, ioc);
Please carry my "async" comment if possible. It helps when navigating
the code because there's a migration_incoming_channel_install() just
below so we can jump to it without having to read
migration_incoming_channel_watch() definition.
> } else {
> - migration_incoming_channel_install(mis, ioc, &local_err);
> + ch = migration_channel_identify(mis, ioc, &local_err);
> + if (ch) {
> + migration_incoming_channel_install(mis, ioc, ch, &local_err);
> + }
> }
> }
> }
> diff --git a/migration/migration.c b/migration/migration.c
> index adba154e46..242b8ed812 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -854,10 +854,7 @@ out:
> migrate_incoming_unref_outgoing_state();
> }
>
> -/*
> - * Returns whether all the necessary channels to proceed with the
> - * incoming migration have been established without error.
> - */
> +/* Return true if success, false otherwise (with *errp set) */
Probably not needed, this is the expected way.
> bool migration_incoming_setup(QIOChannel *ioc, uint8_t channel, Error **errp)
> {
> MigrationIncomingState *mis = migration_incoming_get_current();
> @@ -886,13 +883,13 @@ bool migration_incoming_setup(QIOChannel *ioc, uint8_t channel, Error **errp)
> assert(!mis->postcopy_qemufile_dst);
> f = qemu_file_new_input(ioc);
> postcopy_preempt_new_channel(mis, f);
> - return false;
> + break;
I see. Maybe a separate preliminary patch for this change?
>
> default:
> g_assert_not_reached();
> }
>
> - return migration_has_main_and_multifd_channels();
> + return true;
> }
>
> void migration_outgoing_setup(QIOChannel *ioc)
> --
> 2.55.0
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 6/7] migration: Fix incoming channel race with multifd and preempt_pre_7_2
2026-09-28 20:38 ` Fabiano Rosas
@ 2026-09-29 20:00 ` Peter Xu
0 siblings, 0 replies; 18+ messages in thread
From: Peter Xu @ 2026-09-29 20:00 UTC (permalink / raw)
To: Fabiano Rosas; +Cc: qemu-devel, Akash Kulhalli, Juraj Marcin
On Mon, Sep 28, 2026 at 05:38:16PM -0300, Fabiano Rosas wrote:
> Peter Xu <peterx@redhat.com> writes:
>
> > On Thu, Sep 24, 2026 at 06:54:25PM -0300, Fabiano Rosas wrote:
> >> Peter Xu <peterx@redhat.com> writes:
> >>
> >> > PROBLEM
> >> > =======
> >> >
> >> > Migration reliably hangs with old machine types (7.2-) when these migration
> >> > capabilities are enabled: multifd, postcopy-ram, postcopy-preempt.
> >> >
> >> > Simplest reproducer :
> >> >
> >> > $ QTEST_QEMU_MACHINE_TYPE=pc-q35-7.2 \
> >> > QTEST_QEMU_BINARY=./qemu-system-x86_64 \
> >> > ./tests/qtest/migration-test --full \
> >> > -r /x86_64/migration/multifd+postcopy/preempt/plain
> >> >
> >> > Current workaround is to kill destination QEMU, cancel the migration on
> >> > source (with/without yank), disable one or more of the features, and retry.
> >> >
> >> > The hang is caused by receiving preempt channel before most of the multifd
> >> > channels, the peek buffer operation will stuck forever.
> >> >
> >> > Incoming side QEMU hang (with relevant tracepoints enabled):
> >> >
> >> > migrate_set_state new state setup
> >> > migration_socket_incoming_accepted
> >> > migration_set_incoming_channel ioc=0x557d82c1caa0 ioctype=qio-channel-socket
> >> > migration_socket_incoming_accepted
> >> > migration_set_incoming_channel ioc=0x557d83023840 ioctype=qio-channel-socket
> >> > multifd_recv_new_channel channel 1
> >> > migration_socket_incoming_accepted
> >> > migration_set_incoming_channel ioc=0x557d830c08c0 ioctype=qio-channel-socket
> >> > multifd_recv_new_channel channel 0
> >> > multifd_recv_thread_start 1
> >> > migration_socket_incoming_accepted
> >> > migration_set_incoming_channel ioc=0x557d8284a010 ioctype=qio-channel-socket
> >> > multifd_recv_thread_start 0
> >> > multifd_recv_unfill channel 0 packet_num 0 flags 0x1 next packet size 0
> >> > multifd_recv_unfill channel 1 packet_num 1 flags 0x1 next packet size 0
> >> > [dest qemu hangs here]
> >> >
> >> > Incoming side backtrace:
> >> >
> >> > __syscall_cancel_arch
> >> > __internal_syscall_cancel
> >> > __syscall_cancel
> >> > recvmsg
> >> > qio_channel_socket_readv
> >> > qio_channel_readv_full
> >> > migration_channel_read_peek
> >> > migration_channel_identify
> >> > migration_channel_process_incoming
> >> > socket_accept_incoming_migration
> >> > qio_net_listener_channel_func
> >> > qio_channel_fd_source_dispatch
> >> > g_main_context_dispatch_unlocked.lto_priv
> >> > g_main_context_dispatch
> >> > glib_pollfds_poll
> >> > os_host_main_loop_wait
> >> > main_loop_wait
> >> > qemu_main_loop
> >> > qemu_default_main
> >> > main
> >> >
> >> > This patch tries to fix it, from incoming side first. This patch alone
> >> > should enable single-direction migration to this new QEMU. The next patch
> >> > will propose a fix for the outgoing path, fixing new->old migrations.
> >> >
> >> > BACKGROUND
> >> > ==========
> >> >
> >> > preempt_pre_7_2 used to be a flag marking QEMU releases 7.1/7.2 only
> >> > because they have a flaw on channel establishment on preempt channel.
> >> >
> >> > Now, after we have multifd + postcopy support, new QEMU binaries can
> >> > migrate old machine types with both features enabled. Juraj reported
> >> > constant migration hang at the very beginning for those old machine types
> >> > in our downstream systems with such setup. Juraj found it's because of
> >> > this flag.
> >> >
> >> > QEMU source initiates channels in this order on current master when both
> >> > features enabled with postcopy-preempt mode:
> >> >
> >> > - First, main channel connect() happens,
> >> > - Second, postcopy_preempt_setup() invokes connect() for preempt channel,
> >> > - Last, in migration_thread(), multifd_send_setup() invokes connect()s
> >> > for all the multifd channels
> >> >
> >> > However on an old QEMU, it expect the channels arrive in order of
> >> > "main"->"multifd"->"preempt". Even on a new QEMU, the destination expects
> >> > the same order of arrival on the channels when the channels are not
> >> > peekable.
> >> >
> >> > For peekable channels (non-tls sockets), this time we'll likely see preempt
> >> > channel appearing very soon, peeking at it causing main thread hang, like
> >> > mentioned in the PROBLEM section above.
> >> >
> >> > SOLUTION
> >> > ========
> >> >
> >> > One major problem of current hang is we try to peek at preempt channel,
> >> > which offers nothing at the beginning.
> >> >
> >> > Since we'll need to accept stream from old binaries, arrival of preempt
> >> > channel early is unavoidable.
> >> >
> >> > What we can do, though, is to allow concurrent monitoring of all channels
> >> > rather than one. Meanwhile, we shouldn't peek at anything that has no
> >> > data.
> >> >
> >> > migration_channel_read_peek() almost does the wait, but it's too late.
> >> > This patch proposes to watch all channels from the start without reading at
> >> > them at all, relying on an IO watch attached. This will make sure (1) for
> >> > preempt channel, we never read on it (watch can be gracefully disarmed when
> >> > we know it's preempt channel later) (2) since we have one IO watch for each
> >> > channel, then we can allow accept() to happen in almost any order, process
> >> > only when there's some header to read.
> >> >
> >> > To maintain these watches, a new GArray @channels_early is introduced, with
> >> > each element to be a (ioc, GSource) tuple (@MigEarlyIncomingChannel), so
> >> > that QEMU can manage all the IO watches later with it. Here I used GSource
> >> > rather than io_tag because the GSource may or may not be attached to the
> >> > default main thread gcontext: when OOB is used, it may be the iothread
> >> > context instead. IOW, g_source_remove() on io_tags stops working, which
> >> > only works for default main context.
> >> >
> >> > The trick this patch used is when we have the ability to wait on all
> >> > channel headers at the same time, we pick one by one from main and multifd
> >> > channels (since both of the types will contain headers dumped right at the
> >> > very beginning), leave preempt channel alone. It means, after dest QEMU
> >> > finds all main and multifd channels, there are three possibilities:
> >> >
> >> > - If preempt not enabled, we finished full channel establishment, done.
> >> >
> >> > - If preempt enabled,
> >> >
> >> > - If we have one registered IO watch with the IOC, it must be the
> >> > preempt channel,
> >> >
> >> > - If we have no further IO watch, wait for the next accept(), which
> >> > must be the preempt channel.
> >> >
> >> > This will make channel establish work on incoming side even with the old
> >> > QEMU binaries.
> >> >
> >> > While working on it, I managed to refactor the peeking logic quite a bit:
> >> > we used to have a very convoluted migration_channel_identify() function,
> >> > taking care of two different cases:
> >> >
> >> > (1) when the channel is peekable (like normal socket channels),
> >> > (2) when the channel is not peekable (like TLS or file migrations).
> >> >
> >> > This patch refactored that part to make it crystal clear on how we make
> >> > decisions on which channel is which, and split the peek/identify paths.
> >> >
> >> > One example incoming migration from pc-q35-7.2 after this patch applied,
> >> > and with relevant tracepoints set (8 multifd channels, 1 preempt channel):
> >> >
> >> > migrate_set_state new state setup
> >> > migration_channel_process_incoming ioc=0x557dc8af4e20 ioctype=qio-channel-socket
> >> > migration_incoming_channel_watch ioc=0x557dc8af4e20 ioctype=qio-channel-socket
> >> > migration_channel_process_incoming ioc=0x557dc8abc5d0 ioctype=qio-channel-socket
> >> > migration_incoming_channel_watch ioc=0x557dc8abc5d0 ioctype=qio-channel-socket
> >> > migration_channel_process_incoming ioc=0x557dc953d680 ioctype=qio-channel-socket
> >> > migration_incoming_channel_watch ioc=0x557dc953d680 ioctype=qio-channel-socket
> >> > migration_set_incoming_channel ioc=0x557dc8abc5d0 ioctype=qio-channel-socket type=MULTIFD
> >> > migration_channel_process_incoming ioc=0x557dc898a820 ioctype=qio-channel-socket
> >> > migration_incoming_channel_watch ioc=0x557dc898a820 ioctype=qio-channel-socket
> >> > migration_set_incoming_channel ioc=0x557dc953d680 ioctype=qio-channel-socket type=MULTIFD
> >> > migration_channel_process_incoming ioc=0x557dc919bd70 ioctype=qio-channel-socket
> >> > migration_incoming_channel_watch ioc=0x557dc919bd70 ioctype=qio-channel-socket
> >> > migration_set_incoming_channel ioc=0x557dc898a820 ioctype=qio-channel-socket type=MULTIFD
> >> > migration_channel_process_incoming ioc=0x557dc8734b20 ioctype=qio-channel-socket
> >> > migration_incoming_channel_watch ioc=0x557dc8734b20 ioctype=qio-channel-socket
> >> > migration_set_incoming_channel ioc=0x557dc919bd70 ioctype=qio-channel-socket type=MULTIFD
> >> > migration_channel_process_incoming ioc=0x557dc898bdf0 ioctype=qio-channel-socket
> >> > migration_incoming_channel_watch ioc=0x557dc898bdf0 ioctype=qio-channel-socket
> >> > migration_set_incoming_channel ioc=0x557dc8734b20 ioctype=qio-channel-socket type=MULTIFD
> >> > migration_channel_process_incoming ioc=0x557dc968cfd0 ioctype=qio-channel-socket
> >> > migration_incoming_channel_watch ioc=0x557dc968cfd0 ioctype=qio-channel-socket
> >> > migration_set_incoming_channel ioc=0x557dc898bdf0 ioctype=qio-channel-socket type=MULTIFD
> >> > migration_channel_process_incoming ioc=0x557dc8c31810 ioctype=qio-channel-socket
> >> > migration_incoming_channel_watch ioc=0x557dc8c31810 ioctype=qio-channel-socket
> >> > migration_set_incoming_channel ioc=0x557dc968cfd0 ioctype=qio-channel-socket type=MULTIFD
> >> > migration_set_incoming_channel ioc=0x557dc8c31810 ioctype=qio-channel-socket type=MULTIFD
> >> > migration_set_incoming_channel ioc=0x557dc8af4e20 ioctype=qio-channel-socket type=MAIN
> >> > migration_start_incoming
> >> > migrate_set_state new state active
> >> > migration_channel_process_incoming ioc=0x557dc8966160 ioctype=qio-channel-socket
> >> > migration_set_incoming_channel ioc=0x557dc8966160 ioctype=qio-channel-socket type=PREEMPT
> >> >
> >> > While at it, I renamed the four channel incoming/outgoing tracepoints, make
> >> > all to follow migration_[incoming|outgoing]_channel_*(). Especially for
> >> > incoming, then we can enable migration_incoming_channel* for incoming
> >> > channel debuggings.
> >> >
> >> > FINAL NOTE ON TLS
> >> > =================
> >> >
> >> > Note that this solution isn't a magic bullet fixing everything. TLS is not
> >> > fixable with this approach because TLS isn't peekable channel, hence the
> >> > watch won't help.
> >> >
> >> > We can have other ways to hack it to make it work, e.g. we can make TLS
> >> > channels peekable too, but I don't want to pollute the TLS iochannel only
> >> > for this: let's hope handshake will arrive soon so we can drop these code.
> >> >
> >> > For now, when TLS is involved with such old machine type (7.2-), one needs
> >> > to migrate it out with any combination of features except enabling all
> >> > four (multifd + TLS + postcopy + preempt) to a patched binary, after that,
> >> > all combinations will start working.
> >> >
> >> > BugLink: https://redhat.atlassian.net/browse/RHEL-254933
> >> > Fixes: e27418861288 ("migration: enable multifd and postcopy together")
> >> > Reported-by: Juraj Marcin <jmarcin@redhat.com>
> >> > Signed-off-by: Peter Xu <peterx@redhat.com>
> >> > ---
> >> > migration/channel.h | 3 +
> >> > migration/migration.h | 35 ++++
> >> > migration/channel.c | 414 +++++++++++++++++++++++++++++++++++------
> >> > migration/migration.c | 23 ++-
> >> > migration/trace-events | 7 +-
> >> > 5 files changed, 421 insertions(+), 61 deletions(-)
> >>
> >> Hi Peter, I think the code looks good, but there are some twists and
> >> turns that I think we can get rid of. I put a fixup patch [1] at the end
> >> with my suggestions and mentioned inline what I changed and why.
> >
> > Thanks, especially for covering the tests while suggesting.
> >
> > I believe I agree with many of them, I'll comment on the rest, see inline.
> >
> >>
> >> >
> >> > diff --git a/migration/channel.h b/migration/channel.h
> >> > index 678712f291..40bd339a3e 100644
> >> > --- a/migration/channel.h
> >> > +++ b/migration/channel.h
> >> > @@ -49,4 +49,7 @@ bool migration_channel_parse_input(const char *uri,
> >> > MigrationChannel **main_channelp,
> >> > MigrationChannel **cpr_channelp,
> >> > Error **errp);
> >> > +
> >> > +void migration_incoming_free_early_channels(MigrationIncomingState *mis);
> >> > +
> >> > #endif
> >> > diff --git a/migration/migration.h b/migration/migration.h
> >> > index 683bc7bdd5..6f23e1805b 100644
> >> > --- a/migration/migration.h
> >> > +++ b/migration/migration.h
> >> > @@ -90,6 +90,28 @@ typedef enum {
> >> > PREEMPT_THREAD_QUIT,
> >> > } PreemptThreadStatus;
> >> >
> >> > +typedef struct {
> >> > + /*
> >> > + * The GSource we have allocated to track G_IO_IN events for the
> >> > + * channel. Note: it may not be attached to the default main gcontext,
> >> > + * for example, when in case of io watch created during an OOB
> >> > + * migrate-recover command.
> >> > + */
> >> > + GSource *source;
> >> > + /* The channel we will identify later after getting some buffers to read */
> >> > + QIOChannel *ioc;
> >> > +} MigEarlyIncomingChannel;
> >> > +
> >> > +typedef struct {
> >> > + GArray *channels;
> >> > + /*
> >> > + * In most cases, channels are only operated with BQl, but since we
> >> > + * have OOB command support, don't assume it, just use a standalone
> >> > + * mutex to protect any access to the channels array.
> >> > + */
> >> > + QemuMutex mutex;
> >> > +} MigEarlyIncomingChannels;
> >> > +
> >> > /* State for the incoming migration */
> >> > struct MigrationIncomingState {
> >> > QEMUFile *from_src_file;
> >> > @@ -255,6 +277,19 @@ struct MigrationIncomingState {
> >> >
> >> > /* Do exit on incoming migration failure */
> >> > bool exit_on_error;
> >> > +
> >> > + /*
> >> > + * Maintains all channels only at early stage. After incoming
> >> > + * migration started, this should be an empty array and no use anymore.
> >> > + *
> >> > + * TODO: we logically only need this to make new QEMU binaries work for
> >> > + * old machines who have @preempt_pre_7_2 set on the source, but it's
> >> > + * also good to have this early stage anyway, making sure when peek the
> >> > + * channel there will be something in the channel. Ideally, we should
> >> > + * manage all migration channels in the future with proper headers,
> >> > + * then we can drop this.
> >> > + */
> >> > + MigEarlyIncomingChannels channels_early;
> >> > };
> >> >
> >> > MigrationIncomingState *migration_incoming_get_current(void);
> >> > diff --git a/migration/channel.c b/migration/channel.c
> >> > index b9065efd03..acb7ef5206 100644
> >> > --- a/migration/channel.c
> >> > +++ b/migration/channel.c
> >> > @@ -12,6 +12,8 @@
> >> >
> >> > #include "qemu/osdep.h"
> >> > #include "qemu/cutils.h"
> >> > +#include "qemu/main-loop.h"
> >> > +#include "qemu/error-report.h"
> >> > #include "channel.h"
> >> > #include "exec.h"
> >> > #include "fd.h"
> >> > @@ -146,61 +148,84 @@ bool migration_has_all_channels(void)
> >> > return true;
> >> > }
> >> >
> >> > -static MigChannelType migration_channel_identify(MigrationIncomingState *mis,
> >> > - QIOChannel *ioc, Error **errp)
> >> > +static bool qio_channel_is_peekable(QIOChannel *ioc)
> >> > +{
> >> > + return qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_READ_MSG_PEEK);
> >> > +}
> >> > +
> >> > +/*
> >> > + * With multiple channels, it is possible that we receive channels out of
> >> > + * order on destination side, causing incorrect mapping of source channels
> >> > + * on destination side.
> >> > + *
> >> > + * When the channel is peekable (e.g. non-TLS socket channels), check
> >> > + * channel MAGIC to decide type of channel.
> >> > + *
> >> > + * Please note this is best effort, postcopy preempt channel does not send
> >> > + * any magic number so avoid it for postcopy live migration.
> >> > + *
> >> > + * Returns: >0 if success, ==0 (CH_NONE) if error. If error happened,
> >> > + * *errp must be set.
> >> > + */
> >> > +static MigChannelType migration_channel_peek(MigrationIncomingState *mis,
> >> > + QIOChannel *ioc,
> >> > + Error **errp)
> >> > {
> >> > MigChannelType channel = CH_NONE;
> >> > uint32_t channel_magic = 0;
> >> > int ret = 0;
> >> >
> >> > - if (!migration_has_main_and_multifd_channels()) {
> >> > - if (qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_READ_MSG_PEEK)) {
> >> > - /*
> >> > - * With multiple channels, it is possible that we receive channels
> >> > - * out of order on destination side, causing incorrect mapping of
> >> > - * source channels on destination side. Check channel MAGIC to
> >> > - * decide type of channel. Please note this is best effort,
> >> > - * postcopy preempt channel does not send any magic number so
> >> > - * avoid it for postcopy live migration. Also tls live migration
> >> > - * already does tls handshake while initializing main channel so
> >> > - * with tls this issue is not possible.
> >> > - */
> >> > - ret = migration_channel_read_peek(ioc, (void *)&channel_magic,
> >> > - sizeof(channel_magic), errp);
> >> > - if (ret != 0) {
> >> > - goto out;
> >> > - }
> >> > + assert(qio_channel_is_peekable(ioc));
> >> >
> >> > - channel_magic = be32_to_cpu(channel_magic);
> >> > - if (channel_magic == QEMU_VM_FILE_MAGIC) {
> >> > - channel = CH_MAIN;
> >> > - } else if (channel_magic == MULTIFD_MAGIC) {
> >> > - assert(migrate_multifd());
> >> > - channel = CH_MULTIFD;
> >> > - } else if (!mis->from_src_file &&
> >> > - mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {
> >> > - /* reconnect main channel for postcopy recovery */
> >> > - channel = CH_MAIN;
> >> > - } else {
> >> > - error_setg(errp, "unknown channel magic: %u", channel_magic);
> >> > - }
> >> > - } else if (mis->from_src_file && migrate_multifd()) {
> >> > - /*
> >> > - * Non-peekable channels like tls/file are processed as
> >> > - * multifd channels when multifd is enabled.
> >> > - */
> >> > - channel = CH_MULTIFD;
> >> > - } else if (!mis->from_src_file) {
> >> > - channel = CH_MAIN;
> >> > - } else {
> >> > - error_setg(errp, "non-peekable channel used without multifd");
> >> > - }
> >> > + ret = migration_channel_read_peek(ioc, (void *)&channel_magic,
> >> > + sizeof(channel_magic), errp);
> >> > + if (ret != 0) {
> >> > + /* Failed */
> >> > + return channel;
> >> > + }
> >> > +
> >> > + channel_magic = be32_to_cpu(channel_magic);
> >> > +
> >> > + if (channel_magic == QEMU_VM_FILE_MAGIC) {
> >> > + channel = CH_MAIN;
> >> > + } else if (channel_magic == MULTIFD_MAGIC) {
> >> > + assert(migrate_multifd());
> >> > + channel = CH_MULTIFD;
> >> > + } else if (!mis->from_src_file &&
> >> > + mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {
> >> > + /* reconnect main channel for postcopy recovery */
> >> > + channel = CH_MAIN;
> >>
> >> This is not peeking, maybe it should be somewhere else. Not this patch's
> >> fault, we can think about it some other day.
> >
> > If we separate "peek" from "identify", this one still falls into "peek".
> >
> > Per my definition, the latter "identify" only does "pick channels by order
> > they arrive". Then this doesn't belong to that. As it needs to "peek for
> > at least something readable", rather than blindly rely on the order of
> > arrival.
> >
> > But yeah, it'll be good we leave this for later regardless.
> >
> >>
> >> > } else {
> >> > + error_setg(errp, "Unknown channel magic: %u", channel_magic);
> >> > + }
> >> > +
> >> > + return channel;
> >> > +}
> >> > +
> >> > +/*
> >> > + * Returns: >0 if success, ==0 (CH_NONE) if error. If error happened,
> >> > + * *errp must be set.
> >> > + */
> >> > +static MigChannelType migration_channel_identify(MigrationIncomingState *mis,
> >> > + QIOChannel *ioc, Error **errp)
> >> > +{
> >> > + MigChannelType channel = CH_NONE;
> >> > +
> >> > + if (migration_has_main_and_multifd_channels()) {
> >> > assert(migrate_postcopy_preempt());
> >> > channel = CH_POSTCOPY;
> >>
> >> This check is the same as the one at
> >> migration_channel_process_incoming(). I think we can simplify this.
> >
> > True, this path should be dead code when original patch applied. I have a
> > slight preference on keeping the other one instead (which I know you tend
> > to think "awkward"). I'll explain below, and we'll see.
> >
> >>
> >> See [1].
> >>
> >> > + } else if (!mis->from_src_file) {
> >> > + channel = CH_MAIN;
> >> > + } else if (migrate_multifd()) {
> >> > + /*
> >> > + * Non-peekable channels like tls/file are processed as
> >> > + * multifd channels when multifd is enabled.
> >> > + */
> >> > + channel = CH_MULTIFD;
> >> > + } else {
> >> > + error_setg(errp, "Unexpected non-peekable channel observed");
> >> > }
> >> >
> >> > -out:
> >> > return channel;
> >> > }
> >> >
> >> > @@ -214,31 +239,275 @@ static void migration_incoming_error_propagate(MigrationIncomingState *mis,
> >> > }
> >> > }
> >> >
> >> > +/* Must be with mis->channels_early.mutex held */
> >> > +static void
> >> > +migration_incoming_early_channel_insert(MigrationIncomingState *mis,
> >> > + QIOChannel *ioc,
> >> > + GSource *source)
> >> > +{
> >> > + MigEarlyIncomingChannel chan = {
> >> > + .source = source,
> >> > + .ioc = ioc,
> >> > + };
> >> > +
> >> > + object_ref(OBJECT(ioc));
> >> > + g_source_ref(source);
> >> > +
> >> > + g_array_append_val(mis->channels_early.channels, chan);
> >> > +}
> >> > +
> >> > +static void migration_incoming_early_channel_free(GArray *channels, int i)
> >> > +{
> >> > + MigEarlyIncomingChannel *chan;
> >> > +
> >> > + chan = &g_array_index(channels, MigEarlyIncomingChannel, i);
> >> > +
> >> > + g_source_destroy(chan->source);
> >> > + g_source_unref(chan->source);
> >> > + object_unref(OBJECT(chan->ioc));
> >> > +
> >> > + g_array_remove_index_fast(channels, i);
> >> > +}
> >> > +
> >> > +/*
> >> > + * Remove this channel from the monitoring of @channels_early array.
> >> > + * Return true if found and successful, false otherwise.
> >> > + */
> >> > +static bool
> >> > +migration_incoming_early_channel_remove(MigrationIncomingState *mis,
> >> > + QIOChannel *ioc)
> >> > +{
> >> > + GArray *channels = mis->channels_early.channels;
> >> > + MigEarlyIncomingChannel *chan;
> >> > + int i;
> >> > +
> >> > + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
> >> > +
> >> > + for (i = 0; i < channels->len; i++) {
> >> > + chan = &g_array_index(channels, MigEarlyIncomingChannel, i);
> >> > + if (chan->ioc != ioc) {
> >> > + continue;
> >> > + }
> >> > + migration_incoming_early_channel_free(channels, i);
> >> > + return true;
> >> > + }
> >> > +
> >> > + return false;
> >> > +}
> >> > +
> >> > +void migration_incoming_free_early_channels(MigrationIncomingState *mis)
> >> > +{
> >> > + GArray *channels = mis->channels_early.channels;
> >> > +
> >> > + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
> >> > +
> >> > + while (channels->len) {
> >> > + migration_incoming_early_channel_free(channels, 0);
> >> > + }
> >> > +}
> >> > +
> >> > +static bool migration_incoming_setup_channel(QIOChannel *ioc,
> >> > + MigChannelType ch,
> >> > + Error **errp)
> >> > +{
> >> > + trace_migration_incoming_channel_set(ioc,
> >> > + object_get_typename(OBJECT(ioc)),
> >> > + mig_channel_str[ch]);
> >> > + migration_ioc_register_yank(ioc);
> >> > + /* TODO: make this return the success status instead */
> >> > + migration_incoming_setup(ioc, ch, errp);
> >>
> >> I implemented this TODO. It allows us to skip the main+mfd check after
> >> starting migration because migration_incoming_setup() already returns
> >> that value. See [1].
> >
> > Actually now looking at this patch, this TODO is so trivial.. yes I'll do
> > it.
> >
> > But when I do it, I think it too error prone to return a value returned
> > from migration_has_main_and_multifd_channels() for this function. I
> > changed it to simple true/false for success or not instead. I'll attach a
> > 2nd version of the fixup patch at the end, applying most changes you
> > suggested but stick with returning true/false for this one.
> >
> >>
> >> > +
> >> > + return *errp == NULL;
> >> > +}
> >> > +
> >> > static bool migration_incoming_channel_install(MigrationIncomingState *mis,
> >> > QIOChannel *ioc,
> >> > Error **errp)
> >> > {
> >> > - MigChannelType ch = migration_channel_identify(mis, ioc, errp);
> >> > + MigChannelType ch;
> >> > + bool ret;
> >> > +
> >> > + if (qio_channel_is_peekable(ioc)) {
> >>
> >> This check is redundant, we can only arrive here via the watch and we
> >> checked peekable already at migration_channel_process_incoming. See [1].
> >
> > Shouldn't? Because the file path uses migration_incoming_channel_install()
> > too, afaict.
> >
> > But I see how your question came, which I'm guessing: I used this function
> > in a peekable only path, so here what I can do minimum is I can move the
> > migration_channel_peek() to the peekable path, then move the other path of
> > migration_channel_identify() to the e.g. file path. I'll do that.
> >
> >>
> >> > + ch = migration_channel_peek(mis, ioc, errp);
> >> > + } else {
> >> > + ch = migration_channel_identify(mis, ioc, errp);
> >> > + }
> >> >
> >> > if (!ch) {
> >> > - assert(*errp);
> >> > return false;
> >> > }
> >> >
> >> > - trace_migration_set_incoming_channel(ioc,
> >> > - object_get_typename(OBJECT(ioc)),
> >> > - mig_channel_str[ch]);
> >> > - migration_ioc_register_yank(ioc);
> >> > + ret = migration_incoming_setup_channel(ioc, ch, errp);
> >> > + if (!ret) {
> >> > + return false;
> >> > + }
> >> >
> >> > - if (migration_incoming_setup(ioc, ch, errp)) {
> >> > + /* Installation succeeded, kickoff migration if needed */
> >> > + if (migration_has_main_and_multifd_channels()) {
> >> > migration_start_incoming();
> >> > }
> >> >
> >> > - if (*errp) {
> >> > - return false;
> >> > + return true;
> >> > +}
> >> > +
> >> > +static void
> >> > +migration_incoming_channel_preempt_setup(QIOChannel *ioc)
> >> > +{
> >> > + assert(migrate_postcopy_preempt());
> >> > + /* Installation of preempt channel should never fail */
> >> > + migration_incoming_setup_channel(ioc, CH_POSTCOPY, &error_abort);
> >> > +}
> >> > +
> >> > +static void
> >> > +migration_incoming_detect_preempt_channel(MigrationIncomingState *mis)
> >> > +{
> >> > + GArray *channels = mis->channels_early.channels;
> >> > + MigEarlyIncomingChannel *chan;
> >> > +
> >> > + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
> >> > +
> >> > + /* When preempt mode not enabled, nothing to detect.. */
> >> > + if (!migrate_postcopy_preempt()) {
> >> > + /*
> >> > + * .. but if we found something pending, throw an error only, which
> >> > + * should not happen. Even if it happens, resources will still be
> >> > + * released after incoming migration is completedly.
> >> > + */
> >> > + if (channels->len) {
> >> > + error_report("%s: Found %u unused channels",
> >> > + __func__, channels->len);
> >> > + }
> >> > + return;
> >> > }
> >> >
> >> > - return true;
> >> > + /* Preempt channel hasn't yet arrived? Process it later */
> >> > + if (!channels->len) {
> >> > + return;
> >> > + }
> >> > +
> >> > + /*
> >> > + * More than one channel should never happen.. capture it in case if
> >> > + * it happens, then there's not much we can do.
> >> > + */
> >> > + if (channels->len > 1) {
> >> > + error_report("%s: Found %u unused channels, "
> >> > + "can't identify preempt channel",
> >> > + __func__, channels->len);
> >> > + return;
> >> > + }
> >> > +
> >> > + assert(channels->len == 1);
> >> > + /* This is the preempt channel, install it directly */
> >> > + chan = &g_array_index(channels, MigEarlyIncomingChannel, 0);
> >> > + migration_incoming_channel_preempt_setup(chan->ioc);
> >> > + migration_incoming_early_channel_free(channels, 0);
> >> > +}
> >> > +
> >> > +static gboolean migration_incoming_channel_readable(QIOChannel *ioc,
> >> > + GIOCondition condition,
> >> > + gpointer opaque)
> >> > +{
> >> > + MigrationIncomingState *mis = opaque;
> >> > + Error *local_err = NULL;
> >> > +
> >> > + /*
> >> > + * No need to monitor this channel anymore as long as anything arrived,
> >> > + * remove it from tracking.
> >> > + *
> >> > + * NOTE: this means if partial data arrived we may still block here,
> >> > + * but it shouldn't happen in production, only malicious stream. Since
> >> > + * migration stream is trusted (either due to trusted network, or TLS),
> >> > + * that's non-issue.
> >>
> >> Could we check the amount of data and keep waiting?
> >
> > We could, but it is about the security side of things, I'd not bother in
> > this patch, and maybe we don't bother forever, hopping that at the end of
> > this year we enable handshake in next release, then this is a ioc read()
> > block reading, as simple as that.
> >
>
> Ok, no worries.
>
> >>
> >> > + *
> >> > + * NOTE2: this will also release the ioc ref that we used to hold, but
> >> > + * it's fine since we have at least one more refcount in the current
> >> > + * event handler.
> >>
> >> I don't understand "one more ref in the event handler". Looks like
> >> you're trying to say the refcount is consistent, but why even mention
> >> it? I may be missing something.
> >
> > Not about consistency, it's about holding at least one refcount to make sure
> > migration_incoming_early_channel_remove() won't already free the IOC.
> >
> > But I think maybe you're right: likely nobody will notice the context of
> > this path processing the gsource, and maybe this sentence brings more
> > confusion than clarity? Let me know, I can drop this line.
> >
>
> You mean the inc at qio_channel_create_fd_watch()? Then we don't need
> this comment.
Let me remove it.
>
> >>
> >> > + *
> >> > + * NOTE3: it's theoretically possible that this entry is gone reaching
> >> > + * here. Example: the main thread is doing incoming cleanup having this
> >> > + * one removed, while this watch can be registered on the monitor
> >> > + * iothread's context and fired at the exact same time but in the
> >> > + * iothread instead. If it happens, skip the rest. I'm not sure if
> >> > + * this could happen at all, may depend on iothread lifespan management
> >> > + * in the main thread, but be prepared.
> >>
> >> I wonder if we should extend the locking a bit further. Not because of
> >> what you mentioned here^, but because everything the code running on the
> >> monitor thread touches can race with changes from the main loop. All of
> >> these migrate_foo_bar() helpers, the QEMUFiles, caps, params, etc.
> >
> > Is that about the new lock (mis->channels_early.mutex) or existing code?
> > Possible to do on top, or a new concern introduced from this patch?
> >
>
> If we can reach migration_channel_process_incoming() via OOB command,
> then everything below it needs to be audited to ensure we're not
> changing global state concurrently. Mostly pre-existing, but you are
> adding more code inside the danger window.
Fair enough.
I'd say migration_channel_process_incoming() isn't that bad accessing
globals? We have those (ugly..) migrate_incoming_[un]ref_outgoing_state()
managing refcount for MigrationState*, meanwhile the incoming state object
is never freed AFAIU.
OTOH, migration_channel_process_incoming() still in most cases only touches
the ioc, it shouldn't do a lot complex things. This patch will introduce
more references to the incoming state object indeed, but only that
early_channels structure. The hope is it is well guarded.. but I think
indeed I can still miss some spots.
>
> >>
> >> > + */
> >> > + if (!migration_incoming_early_channel_remove(mis, ioc)) {
> >> > + goto out;
> >> > + }
> >> > +
> >>
> >> I moved the peek into here and passed the already identified
> >> channel into migration_incoming_channel_install(). See [1].
> >
> > Agree on this change, better.
> >
> >>
> >> > + if (!migration_incoming_channel_install(mis, ioc, &local_err)) {
> >> > + goto out;
> >> > + }
> >> > +
> >> > + if (migration_has_main_and_multifd_channels()) {
> >>
> >> This check became redundant because the _setup routine already returns
> >> it. See [1].
> >
> > I didn't adopt this in my new fixup, because I want to avoid returning that
> > info deep from stack. Let's continue the discussion in my fixup there as a
> > reply.
> >
>
> I wrote a migration_can_start() routine and tried to incorporate some
> preempt channel knowledge into it, but it didn't work so well. I find it
> a bit opaque to look only at main+mfd channels to start the
> migration. Since nothing better came up so far, I agree you keep this
> here.
Yes, it's odd, at that time only to provide the ordering. I'll remove that
oddity when working on handshake.
>
> >>
> >> > + /*
> >> > + * Possibilities when reaching here:
> >> > + *
> >> > + * (1) if preempt not enabled, this should be no-op, all done,
> >> > + * (2) if preempt enabled,
> >> > + * (2.a) preempt channel arrived @channels_early, handle it now
> >> > + * (2.b) preempt channel not arrived, to be handled in
> >> > + * migration_channel_process_incoming() later
> >> > + */
> >> > + migration_incoming_detect_preempt_channel(mis);
> >>
> >> Moved this into migration_incoming_channel_install(). See [1].
> >
> > Since my version used migration_incoming_channel_install() for both
> > peekable and non-peekable, this path is not needed for non-peekable.
> > I still left it here, assuming it's clearer it's only needed for peekable.
> > But you can reply with your thought. I hope at least we can be more
> > focused with most of the rest addressed.
> >
>
> I tend to prefer having a single path and make it a noop via code than
> to have two paths and use our knowledge of the code to decide what goes
> where. Here we can't escape having two paths, so it's not a huge deal.
Thanks, yes, I believe this is more or less cosmetic difference.
What I wanted to avoid is e.g. migration_incoming_detect_preempt_channel()
not used at all in a "file:" migration, especially, what it does is it will
look up mis->channels_early.channels (no matter preempt mode enabled or
not, currently it still does a sanity check even if !preempt). In "file:"
migrations, we never use mis->channels_early.channels. It looks a bit
weird to look it up and "fallback to noop" because of that.
>
> >>
> >> > + }
> >> > +
> >> > +out:
> >> > + if (local_err) {
> >> > + migration_incoming_error_propagate(mis, local_err);
> >> > + }
> >> > +
> >> > + /*
> >> > + * NOTE: we should have already detached the GSource, returning
> >> > + * G_SOURCE_REMOVE to be logically consistent only.
> >> > + */
> >> > + return G_SOURCE_REMOVE;
> >> > +}
> >> > +
> >> > +static void migration_incoming_channel_watch(MigrationIncomingState *mis,
> >> > + QIOChannel *ioc)
> >> > +{
> >> > + GMainContext *context = g_main_context_get_thread_default();
> >> > + GSource *source;
> >> > + guint io_tag;
> >> > +
> >> > + trace_migration_incoming_channel_watch(ioc,
> >> > + object_get_typename(OBJECT(ioc)));
> >> > +
> >> > + /*
> >> > + * Careful: this can be run from either the main thread or the monitor
> >> > + * iothread when migrate_recover is used with OOB=on, so we need to
> >> > + * take the lock and use the full version to specify the correct
> >> > + * context.
> >> > + */
> >> > + QEMU_LOCK_GUARD(&mis->channels_early.mutex);
> >> > +
> >> > + /*
> >> > + * We should never watch an @ioc that is not peekable, because there's
> >> > + * no point. What is worse is we lose the real order of accept()s via
> >> > + * the asynchronous IO watch operation.
> >> > + *
> >> > + * Another note is TLS channel (non-peekable) may or may not work
> >> > + * properly with IO watch due to its current .io_create_watch() impl,
> >> > + * which is another story. Just guard both points.
> >> > + */
> >> > + assert(qio_channel_is_peekable(ioc));
> >> > + io_tag = qio_channel_add_watch_full(ioc, G_IO_IN,
> >> > + migration_incoming_channel_readable,
> >> > + mis, NULL, context);
> >> > +
> >> > + /*
> >> > + * Replace this if one day qio_channel_add_watch*() API can directly
> >> > + * return the GSource*.. for now, stick with it.
> >> > + */
> >> > + source = g_main_context_find_source_by_id(context, io_tag);
> >> > + /*
> >> > + * Nothing can race with adding the IO watch, aka, concurrent removal
> >> > + * is not possible when we have the lock. So it must be present.
> >> > + */
> >> > + assert(source);
> >> > +
> >> > + migration_incoming_early_channel_insert(mis, ioc, source);
> >> > }
> >> >
> >> > /**
> >> > @@ -254,13 +523,44 @@ void migration_channel_process_incoming(QIOChannel *ioc)
> >> > MigrationIncomingState *mis = migration_incoming_get_current();
> >> > Error *local_err = NULL;
> >> >
> >> > - trace_migration_channel_process_incoming(
> >> > + trace_migration_incoming_channel_process(
> >> > ioc, object_get_typename(OBJECT(ioc)));
> >> >
> >> > if (migrate_channel_requires_tls_upgrade(ioc)) {
> >> > migration_tls_channel_process_incoming(ioc, &local_err);
> >> > } else {
> >> > - migration_incoming_channel_install(mis, ioc, &local_err);
> >> > + if (migration_has_main_and_multifd_channels()) {
> >>
> >> The fact that this check must come before everything is a major
> >> weirdness. In fact, this is conceptually the same case as the first
> >> branch in migration_channel_identify(). I therefore moved that function
> >> to this point and added a comment explaining why this must come
> >> first. See [1].
> >
> > This is one part that I left alone so far. My reason is that preempt
> > channel needs special care at least for peekable, it's because it's not
> > peekable there when hitting this case. So we need to have this separate
> > path. This is also relevant to below, where..
> >
>
> You removed the check from _identify, so it's less confusing now.
>
> >>
> >> > + /*
> >> > + * If all main+multifd channels are present already, this must
> >> > + * be the preempt channel.
> >> > + *
> >> > + * QEMU can't register an IO watch for it if there is only the
> >> > + * last preempt channel left, because it means the IO watch
> >> > + * will never fire and nobody will pick it up: we rely on the
> >> > + * one before the last one to pick both.
> >> > + *
> >> > + * See comment in migration_incoming_channel_readable() on
> >> > + * the migration_incoming_detect_preempt_channel() call.
> >> > + */
> >> > + migration_incoming_channel_preempt_setup(ioc);
> >> > + } else {
> >> > + /*
> >> > + * Register an IO watch for peekable channels, so that channels
> >> > + * can be accept()ed with any order.
> >> > + *
> >> > + * Non-peekable channels (file, TLS, etc.) cannot register IO
> >> > + * watch, not only because there's no data to look at to help
> >> > + * making the decision, but also because after registering we
> >> > + * will lose the real ordering we get from accept(), which is
> >> > + * still so far the only source of truth to identify a channel
> >> > + * in such case.
> >> > + */
> >> > + if (qio_channel_is_peekable(ioc)) {
> >>
> >> I moved this line into migration_channel_identify(). That way we ensure
> >> the ordering regarding the main+mfd check. The watch is still installed
> >> at this point. See [1].
> >
> > ... you suggested moving this into migration_channel_identify().
> >
> > Personally I think it's against my purpose of split: I wanted to make
> > migration_channel_identify() to only rely on order of arrival to identify
> > channels, nothing else. Then for all peekable handling, it should be
> > inside the _peek() function.
> >
>
> ok
>
> >>
> >> > + migration_incoming_channel_watch(mis, ioc);
> >> > + } else {
> >> > + migration_incoming_channel_install(mis, ioc, &local_err);
> >>
> >> This invocation of install does not check for the preempt channel after
> >> it returns. Is this simply assuming that if a non-peekable channel is
> >> present then there will be no preempt channel at all?
> >>
> >> Or if main+TLS is the first channel, then the next channel will be
> >> preempt and already enter the first branch?
> >
> > Yes. It's because for non-peekable, preempt channel is only processed
> > above (in my patch logic, with/without my new fixup to be attached).
> >
> > For peekable, preempt channel may be picked up by the 2nd last channel,
> > which is not possible for non-peekable, so that is special way for peekable
> > channels only.
> >
> >>
> >> > + }
> >> > + }
> >> > }
> >> >
> >> > if (local_err) {
> >> > @@ -270,7 +570,7 @@ void migration_channel_process_incoming(QIOChannel *ioc)
> >> >
> >> > void migration_channel_connect_outgoing(MigrationState *s, QIOChannel *ioc)
> >> > {
> >> > - trace_migration_set_outgoing_channel(ioc, object_get_typename(OBJECT(ioc)));
> >> > + trace_migration_outgoing_channel_set(ioc, object_get_typename(OBJECT(ioc)));
> >> >
> >> > if (migrate_channel_requires_tls_upgrade(ioc)) {
> >> > Error *local_err = NULL;
> >> > diff --git a/migration/migration.c b/migration/migration.c
> >> > index cfadcc79c2..4cc4077a76 100644
> >> > --- a/migration/migration.c
> >> > +++ b/migration/migration.c
> >> > @@ -334,6 +334,10 @@ void migration_object_init(void)
> >> > current_incoming->page_requested = g_tree_new(page_request_addr_cmp);
> >> >
> >> > current_incoming->exit_on_error = INMIGRATE_DEFAULT_EXIT_ON_ERROR;
> >> > + /* zero_terminated=false, clear_=true */
> >>
> >> There's an extra _ after 'clear' I think.
> >
> > See? I know someone else will get confused too. :)
> >
>
> hahaha crap. Put a +1 next to that comment and let's increment it every
> time someone mentions this.
Be prepared reviewing more migration patches, just to bump it. :)
To avoid it from happening, I did this instead:
/* zero_terminated=false, clear_=true (NOTE, "clear_" is not a typo) */
>
> > https://docs.gtk.org/glib/type_func.Array.new.html
> >
> > GArray*
> > g_array_new (
> > gboolean zero_terminated,
> > gboolean clear_,
> > guint element_size
> > )
> >
> > ...
> >
> > clear_
> > Type: gboolean
> >
> > If true, GArray elements should be automatically cleared to 0 when they are allocated.
> >
> >>
> >> > + current_incoming->channels_early.channels =
> >> > + g_array_new(FALSE, TRUE, sizeof(MigEarlyIncomingChannel));
> >> > + qemu_mutex_init(¤t_incoming->channels_early.mutex);
> >> >
> >> > migration_object_check(current_migration, &error_fatal);
> >> >
> >> > @@ -447,6 +451,24 @@ void migration_incoming_state_destroy(void)
> >> > MigrationIncomingState *mis = migration_incoming_get_current();
> >> > PostcopyState ps = postcopy_state_get();
> >> >
> >> > + /* Cleanup listener to make sure no further accept() for sockets */
> >> > + migration_incoming_transport_cleanup(mis);
> >> > +
> >> > + /*
> >> > + * It's safer to free channel watches earlier than most of the rest, in
> >> > + * case the IO watches could fire in the monitor iothread concurrently
> >> > + * against this function.
> >>
> >> Now I'm getting worried. Cleanup races are super annoying. This is
> >> "just" about the recovery command, right?
> >
> > I think so.
> >
> > Note: I didn't have any way to trigger any crash at all, this is something
> > when I had AI review my code and it pointed out this. I thought I should
> > be safe than sorry.
> >
>
> It will happen in CI one day when we least expect it, don't worry. =)
>
> It's fine, I don't think it's good use of our time to overthink this at
> the moment.
I agree.
>
> > Below is my fixup. The hope is I addressed most of them but not all, with
> > reasonings inline above. Let me know.
> >
> >
> > ===8<===
> > From eb03b1b648b91a317a8a7559240186c87d835b8c Mon Sep 17 00:00:00 2001
> > From: Peter Xu <peterx@redhat.com>
> > Date: Mon, 28 Sep 2026 11:35:20 -0400
> > Subject: [PATCH] fixup! migration: Fix incoming channel race with multifd and
> > preempt_pre_7_2
> >
> > Signed-off-by: Peter Xu <peterx@redhat.com>
> > ---
> > migration/channel.c | 42 +++++++++++++++++-------------------------
> > migration/migration.c | 9 +++------
> > 2 files changed, 20 insertions(+), 31 deletions(-)
> >
> > diff --git a/migration/channel.c b/migration/channel.c
> > index acb7ef5206..72de9c9778 100644
> > --- a/migration/channel.c
> > +++ b/migration/channel.c
> > @@ -204,17 +204,14 @@ static MigChannelType migration_channel_peek(MigrationIncomingState *mis,
> >
> > /*
> > * Returns: >0 if success, ==0 (CH_NONE) if error. If error happened,
> > - * *errp must be set.
> > + * *errp must be set. NOTE: preempt channel is done separately.
> > */
> > static MigChannelType migration_channel_identify(MigrationIncomingState *mis,
> > QIOChannel *ioc, Error **errp)
> > {
> > MigChannelType channel = CH_NONE;
> >
> > - if (migration_has_main_and_multifd_channels()) {
> > - assert(migrate_postcopy_preempt());
> > - channel = CH_POSTCOPY;
>
> Fair.
>
> > - } else if (!mis->from_src_file) {
> > + if (!mis->from_src_file) {
> > channel = CH_MAIN;
> > } else if (migrate_multifd()) {
> > /*
> > @@ -314,31 +311,16 @@ static bool migration_incoming_setup_channel(QIOChannel *ioc,
> > object_get_typename(OBJECT(ioc)),
> > mig_channel_str[ch]);
> > migration_ioc_register_yank(ioc);
> > - /* TODO: make this return the success status instead */
> > - migration_incoming_setup(ioc, ch, errp);
> >
> > - return *errp == NULL;
> > + return migration_incoming_setup(ioc, ch, errp);
> > }
> >
> > static bool migration_incoming_channel_install(MigrationIncomingState *mis,
> > QIOChannel *ioc,
> > + MigChannelType ch,
> > Error **errp)
> > {
> > - MigChannelType ch;
> > - bool ret;
> > -
> > - if (qio_channel_is_peekable(ioc)) {
> > - ch = migration_channel_peek(mis, ioc, errp);
> > - } else {
> > - ch = migration_channel_identify(mis, ioc, errp);
> > - }
> > -
> > - if (!ch) {
> > - return false;
> > - }
> > -
> > - ret = migration_incoming_setup_channel(ioc, ch, errp);
> > - if (!ret) {
> > + if (!migration_incoming_setup_channel(ioc, ch, errp)) {
> > return false;
> > }
> >
> > @@ -409,6 +391,7 @@ static gboolean migration_incoming_channel_readable(QIOChannel *ioc,
> > {
> > MigrationIncomingState *mis = opaque;
> > Error *local_err = NULL;
> > + MigChannelType ch;
> >
> > /*
> > * No need to monitor this channel anymore as long as anything arrived,
> > @@ -435,7 +418,12 @@ static gboolean migration_incoming_channel_readable(QIOChannel *ioc,
> > goto out;
> > }
> >
> > - if (!migration_incoming_channel_install(mis, ioc, &local_err)) {
> > + ch = migration_channel_peek(mis, ioc, &local_err);
> > + if (!ch) {
> > + goto out;
> > + }
> > +
> > + if (!migration_incoming_channel_install(mis, ioc, ch, &local_err)) {
> > goto out;
> > }
> >
> > @@ -522,6 +510,7 @@ void migration_channel_process_incoming(QIOChannel *ioc)
> > {
> > MigrationIncomingState *mis = migration_incoming_get_current();
> > Error *local_err = NULL;
> > + MigChannelType ch;
> >
> > trace_migration_incoming_channel_process(
> > ioc, object_get_typename(OBJECT(ioc)));
> > @@ -558,7 +547,10 @@ void migration_channel_process_incoming(QIOChannel *ioc)
> > if (qio_channel_is_peekable(ioc)) {
> > migration_incoming_channel_watch(mis, ioc);
>
> Please carry my "async" comment if possible. It helps when navigating
> the code because there's a migration_incoming_channel_install() just
> below so we can jump to it without having to read
> migration_incoming_channel_watch() definition.
This I can do. Since I had a verbose comment above this (now I tend to
think it's a bit wordy..), I did this change instead taking your
suggestion into account, I hope it looks better:
diff --git a/migration/channel.c b/migration/channel.c
index 8c2b0e6c39..5fdc8a17cf 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -529,20 +529,22 @@ void migration_channel_process_incoming(QIOChannel *ioc)
*/
migration_incoming_channel_preempt_setup(ioc);
} else {
- /*
- * Register an IO watch for peekable channels, so that channels
- * can be accept()ed with any order.
- *
- * Non-peekable channels (file, TLS, etc.) cannot register IO
- * watch, not only because there's no data to look at to help
- * making the decision, but also because after registering we
- * will lose the real ordering we get from accept(), which is
- * still so far the only source of truth to identify a channel
- * in such case.
- */
if (qio_channel_is_peekable(ioc)) {
+ /*
+ * Register an IO watch for the peekable channel, deciding
+ * the type of channel later by peeking at it whenever
+ * possible. migration_incoming_channel_install() will be
+ * postponed.
+ */
migration_incoming_channel_watch(mis, ioc);
} else {
+ /*
+ * Non-peekable channels (file, TLS, etc.), cannot register
+ * IO watch because (1) there's nothing to peek, (2) after
+ * registering IO watch, QEMU will lose the real ordering
+ * it gets from accept(), which is still so far the only
+ * source of truth to identify a channel in this case.
+ */
ch = migration_channel_identify(mis, ioc, &local_err);
if (ch) {
migration_incoming_channel_install(mis, ioc, ch, &local_err);
>
> > } else {
> > - migration_incoming_channel_install(mis, ioc, &local_err);
> > + ch = migration_channel_identify(mis, ioc, &local_err);
> > + if (ch) {
> > + migration_incoming_channel_install(mis, ioc, ch, &local_err);
> > + }
> > }
> > }
> > }
> > diff --git a/migration/migration.c b/migration/migration.c
> > index adba154e46..242b8ed812 100644
> > --- a/migration/migration.c
> > +++ b/migration/migration.c
> > @@ -854,10 +854,7 @@ out:
> > migrate_incoming_unref_outgoing_state();
> > }
> >
> > -/*
> > - * Returns whether all the necessary channels to proceed with the
> > - * incoming migration have been established without error.
> > - */
> > +/* Return true if success, false otherwise (with *errp set) */
>
> Probably not needed, this is the expected way.
Yep, I put it there only because it may make review easier when it's not a
new function but retval changed, but let me drop it then.
>
> > bool migration_incoming_setup(QIOChannel *ioc, uint8_t channel, Error **errp)
> > {
> > MigrationIncomingState *mis = migration_incoming_get_current();
> > @@ -886,13 +883,13 @@ bool migration_incoming_setup(QIOChannel *ioc, uint8_t channel, Error **errp)
> > assert(!mis->postcopy_qemufile_dst);
> > f = qemu_file_new_input(ioc);
> > postcopy_preempt_new_channel(mis, f);
> > - return false;
> > + break;
>
> I see. Maybe a separate preliminary patch for this change?
Let me try, not guaranteed though, because IIUC it can be ugly: we used to
rely on migration_has_main_and_multifd_channels() to be returned, then I'll
need to explicitly add it in callers.
>
> >
> > default:
> > g_assert_not_reached();
> > }
> >
> > - return migration_has_main_and_multifd_channels();
> > + return true;
> > }
> >
> > void migration_outgoing_setup(QIOChannel *ioc)
> > --
> > 2.55.0
>
--
Peter Xu
^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2026-09-29 20:02 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-09-16 21:35 [PATCH 0/7] migration: Fix multifd+postcopy break on qemu-7.2 machine type Peter Xu
2026-09-16 21:35 ` [PATCH 1/7] tests/migration-test: Add multifd+postcopy test for preempt recovery Peter Xu
2026-09-16 21:35 ` [PATCH 2/7] migration: Add two more trace points for incoming channel mgmt Peter Xu
2026-09-16 21:35 ` [PATCH 3/7] migration: Fix socket listen backlog Peter Xu
2026-09-16 21:35 ` [PATCH 4/7] migration: Split migration_channel_process_incoming() Peter Xu
2026-09-16 21:35 ` [PATCH 5/7] migration: Dump type of channel in set_incoming_channel tracepoint Peter Xu
2026-09-16 21:35 ` [PATCH 6/7] migration: Fix incoming channel race with multifd and preempt_pre_7_2 Peter Xu
2026-09-23 15:54 ` Fabiano Rosas
2026-09-23 21:04 ` Peter Xu
2026-09-23 22:15 ` Fabiano Rosas
2026-09-24 21:54 ` Fabiano Rosas
2026-09-28 19:22 ` Peter Xu
2026-09-28 20:38 ` Fabiano Rosas
2026-09-29 20:00 ` Peter Xu
2026-09-16 21:35 ` [PATCH 7/7] migration: Postpone the outgoing preempt channel for preempt_pre_7_2 Peter Xu
2026-09-22 23:34 ` Fabiano Rosas
2026-09-23 20:24 ` Peter Xu
2026-09-23 22:30 ` Fabiano Rosas
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.