{"id":2177607,"url":"http://patchwork.ozlabs.org/api/patches/2177607/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20251226211930.27565-18-farosas@suse.de/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20251226211930.27565-18-farosas@suse.de>","list_archive_url":null,"date":"2025-12-26T21:19:19","name":"[RFC,17/25] migration: Move channel code to channel.c","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"d17704783e2e96034acec3827c4599a91f8d937c","submitter":{"id":85343,"url":"http://patchwork.ozlabs.org/api/people/85343/?format=json","name":"Fabiano Rosas","email":"farosas@suse.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20251226211930.27565-18-farosas@suse.de/mbox/","series":[{"id":486505,"url":"http://patchwork.ozlabs.org/api/series/486505/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=486505","date":"2025-12-26T21:19:04","name":"migration: Cleanup early connection code","version":1,"mbox":"http://patchwork.ozlabs.org/series/486505/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2177607/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2177607/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256\n header.s=susede2_rsa header.b=zciHotFp;\n\tdkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=P79Zuds/;\n\tdkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de\n header.a=rsa-sha256 header.s=susede2_rsa header.b=cq6JbR+b;\n\tdkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=GOP6ckQZ;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)","smtp-out2.suse.de;\n dkim=pass header.d=suse.de header.s=susede2_rsa header.b=cq6JbR+b;\n dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=GOP6ckQZ"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4ddJSm6sskz1y3s\n\tfor ; Sat, 27 Dec 2025 08:21:12 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1vZFEt-0001lk-Db; Fri, 26 Dec 2025 16:20:47 -0500","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1vZFEq-0001ch-Or\n for qemu-devel@nongnu.org; Fri, 26 Dec 2025 16:20:44 -0500","from smtp-out2.suse.de ([195.135.223.131])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from ) id 1vZFEo-0004I1-KC\n for qemu-devel@nongnu.org; Fri, 26 Dec 2025 16:20:44 -0500","from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org\n [IPv6:2a07:de40:b281:104:10:150:64:97])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n (No client certificate requested)\n by smtp-out2.suse.de (Postfix) with ESMTPS id B1FF35BCE1;\n Fri, 26 Dec 2025 21:20:02 +0000 (UTC)","from imap1.dmz-prg2.suse.org (localhost [127.0.0.1])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n (No client certificate requested)\n by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 6C0023EA63;\n Fri, 26 Dec 2025 21:20:01 +0000 (UTC)","from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167])\n by imap1.dmz-prg2.suse.org with ESMTPSA id SGpRCwH8TmnwJwAAD6G6ig\n (envelope-from ); Fri, 26 Dec 2025 21:20:01 +0000"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1766784003;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=9ZJOtMOEZAVo7vbMwFj3ucTsVaUW3dpHV0sKC1MhhQI=;\n b=zciHotFpdrmLqF+38DwGCXcx+CEmIrFQ+4cRVi5Qg5QfN1bV8sVeDnglmKuO/jbUmgrpRr\n cXAJtP1TTUpzetvz66UyheJOw8gmtr57HFzbne5v5nbSUMIVTGDy+5OPECb6HyNHMCF/Jf\n 5GDWQJm1AN28IAGm0GSJJwsbOCmOdAo=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1766784003;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=9ZJOtMOEZAVo7vbMwFj3ucTsVaUW3dpHV0sKC1MhhQI=;\n b=P79Zuds//NMxrOIrhiM1FGkDQs4zk5keWab9dvBB6INhMRaxn0yzAN2OaMCCzrET8BMbXR\n FqLVYq/hN2c3OzDw==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1766784002;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=9ZJOtMOEZAVo7vbMwFj3ucTsVaUW3dpHV0sKC1MhhQI=;\n b=cq6JbR+bu6nrexpHv65Yr6XWYR9pEONa59Vekqw7m8S/c/TcMB3yvjHheogvYky//veNqH\n FPrXoDNYdSUntOk23DEemCq6LQJ3Fo0qlz+CNsAy/h4U5tWCW7deeDFr8quTMW3BGcxOuz\n NieGrjLx/mV0Gvxvz39E3mDBxgr4F+U=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1766784002;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=9ZJOtMOEZAVo7vbMwFj3ucTsVaUW3dpHV0sKC1MhhQI=;\n b=GOP6ckQZO+0nemFs+hdHFjhMiwA3qBeJWU/sRX4t1nvGS09+qvztHvVN9hbYWtIuwOB3zJ\n LxTJCmrLtXx9uvAw=="],"From":"Fabiano Rosas ","To":"qemu-devel@nongnu.org","Cc":"peterx@redhat.com,\n\tLi Zhijian ","Subject":"[RFC PATCH 17/25] migration: Move channel code to channel.c","Date":"Fri, 26 Dec 2025 18:19:19 -0300","Message-ID":"<20251226211930.27565-18-farosas@suse.de>","X-Mailer":"git-send-email 2.51.0","In-Reply-To":"<20251226211930.27565-1-farosas@suse.de>","References":"<20251226211930.27565-1-farosas@suse.de>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Spamd-Result":"default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%];\n MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000];\n R_MISSING_CHARSET(0.50)[];\n R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519];\n NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain];\n MX_GOOD(-0.01)[];\n DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:dkim,suse.de:mid,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns];\n FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+];\n SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from];\n TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[];\n RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[];\n DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519];\n FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2];\n RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[3];\n DKIM_TRACE(0.00)[suse.de:+]","X-Rspamd-Action":"no action","X-Rspamd-Server":"rspamd2.dmz-prg2.suse.org","X-Rspamd-Queue-Id":"B1FF35BCE1","X-Spam-Score":"-3.01","Received-SPF":"pass client-ip=195.135.223.131; envelope-from=farosas@suse.de;\n helo=smtp-out2.suse.de","X-Spam_score_int":"-43","X-Spam_score":"-4.4","X-Spam_bar":"----","X-Spam_report":"(-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Move the code responsible for the various channels connection into\nchannel.c. This is all executed before the migration_thread and\nprocess_incoming_migration_co are running, so it helps the reasoning\nto have them out of migration.c.\n\nmigration_ioc_process_incoming becomes migration_channel_identify\nwhich is more in line with what the function does.\n\nSigned-off-by: Fabiano Rosas \n---\n migration/channel.c | 99 ++++++++++++++++++++++++++++++++++++++++++-\n migration/channel.h | 12 ++++++\n migration/migration.c | 98 ------------------------------------------\n migration/migration.h | 5 +--\n migration/rdma.c | 1 +\n 5 files changed, 113 insertions(+), 102 deletions(-)","diff":"diff --git a/migration/channel.c b/migration/channel.c\nindex c5bd89576a..a9ac3711b5 100644\n--- a/migration/channel.c\n+++ b/migration/channel.c\n@@ -14,13 +14,110 @@\n #include \"channel.h\"\n #include \"tls.h\"\n #include \"migration.h\"\n+#include \"multifd.h\"\n+#include \"savevm.h\"\n #include \"trace.h\"\n+#include \"options.h\"\n #include \"qapi/error.h\"\n #include \"io/channel-tls.h\"\n #include \"io/channel-socket.h\"\n #include \"qemu/yank.h\"\n #include \"yank_functions.h\"\n \n+bool migration_has_main_and_multifd_channels(void)\n+{\n+ MigrationIncomingState *mis = migration_incoming_get_current();\n+ if (!mis->from_src_file) {\n+ /* main channel not established */\n+ return false;\n+ }\n+\n+ if (migrate_multifd() && !multifd_recv_all_channels_created()) {\n+ return false;\n+ }\n+\n+ /* main and all multifd channels are established */\n+ return true;\n+}\n+\n+/**\n+ * @migration_has_all_channels: We have received all channels that we need\n+ *\n+ * Returns true when we have got connections to all the channels that\n+ * we need for migration.\n+ */\n+bool migration_has_all_channels(void)\n+{\n+ if (!migration_has_main_and_multifd_channels()) {\n+ return false;\n+ }\n+\n+ MigrationIncomingState *mis = migration_incoming_get_current();\n+ if (migrate_postcopy_preempt() && !mis->postcopy_qemufile_dst) {\n+ return false;\n+ }\n+\n+ return true;\n+}\n+\n+static int migration_channel_identify(MigrationIncomingState *mis,\n+ QIOChannel *ioc, Error **errp)\n+{\n+ int channel = CH_NONE;\n+ uint32_t channel_magic = 0;\n+ int ret = 0;\n+\n+ if (!migration_has_main_and_multifd_channels()) {\n+ if (qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_READ_MSG_PEEK)) {\n+ /*\n+ * With multiple channels, it is possible that we receive channels\n+ * out of order on destination side, causing incorrect mapping of\n+ * source channels on destination side. Check channel MAGIC to\n+ * decide type of channel. Please note this is best effort,\n+ * postcopy preempt channel does not send any magic number so\n+ * avoid it for postcopy live migration. Also tls live migration\n+ * already does tls handshake while initializing main channel so\n+ * with tls this issue is not possible.\n+ */\n+ ret = migration_channel_read_peek(ioc, (void *)&channel_magic,\n+ sizeof(channel_magic), errp);\n+ if (ret != 0) {\n+ goto out;\n+ }\n+\n+ channel_magic = be32_to_cpu(channel_magic);\n+ if (channel_magic == QEMU_VM_FILE_MAGIC) {\n+ channel = CH_MAIN;\n+ } else if (channel_magic == MULTIFD_MAGIC) {\n+ assert(migrate_multifd());\n+ channel = CH_MULTIFD;\n+ } else if (!mis->from_src_file &&\n+ mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {\n+ /* reconnect main channel for postcopy recovery */\n+ channel = CH_MAIN;\n+ } else {\n+ error_setg(errp, \"unknown channel magic: %u\", channel_magic);\n+ }\n+ } else if (mis->from_src_file && migrate_multifd()) {\n+ /*\n+ * Non-peekable channels like tls/file are processed as\n+ * multifd channels when multifd is enabled.\n+ */\n+ channel = CH_MULTIFD;\n+ } else if (!mis->from_src_file) {\n+ channel = CH_MAIN;\n+ } else {\n+ error_setg(errp, \"non-peekable channel used without multifd\");\n+ }\n+ } else {\n+ assert(migrate_postcopy_preempt());\n+ channel = CH_POSTCOPY;\n+ }\n+\n+out:\n+ return channel;\n+}\n+\n /**\n * @migration_channel_process_incoming - Create new incoming migration channel\n *\n@@ -42,7 +139,7 @@ void migration_channel_process_incoming(QIOChannel *ioc)\n migration_tls_channel_process_incoming(ioc, &local_err);\n } else {\n migration_ioc_register_yank(ioc);\n- ch = migration_ioc_process_incoming(ioc, &local_err);\n+ ch = migration_channel_identify(mis, ioc, &local_err);\n if (!ch) {\n goto out;\n }\ndiff --git a/migration/channel.h b/migration/channel.h\nindex 7d3457271d..59d169e095 100644\n--- a/migration/channel.h\n+++ b/migration/channel.h\n@@ -18,6 +18,14 @@\n \n #include \"io/channel.h\"\n \n+/* Migration channel types */\n+enum {\n+ CH_NONE,\n+ CH_MAIN,\n+ CH_MULTIFD,\n+ CH_POSTCOPY\n+};\n+\n void migration_channel_process_incoming(QIOChannel *ioc);\n \n void migration_channel_connect_outgoing(MigrationState *s, QIOChannel *ioc);\n@@ -26,4 +34,8 @@ int migration_channel_read_peek(QIOChannel *ioc,\n const char *buf,\n const size_t buflen,\n Error **errp);\n+\n+bool migration_has_main_and_multifd_channels(void);\n+bool migration_has_all_channels(void);\n+\n #endif\ndiff --git a/migration/migration.c b/migration/migration.c\nindex 42adee5695..e0aee17317 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -91,9 +91,6 @@ enum mig_rp_message_type {\n MIG_RP_MSG_MAX\n };\n \n-/* Migration channel types */\n-enum { CH_NONE, CH_MAIN, CH_MULTIFD, CH_POSTCOPY };\n-\n /* When we add fault tolerance, we could have several\n migrations at once. For now we don't need to add\n dynamic creation of migration */\n@@ -934,8 +931,6 @@ out:\n migrate_incoming_unref_outgoing_state();\n }\n \n-static bool migration_has_main_and_multifd_channels(void);\n-\n bool migration_incoming_setup(QIOChannel *ioc, uint8_t channel, Error **errp)\n {\n MigrationIncomingState *mis = migration_incoming_get_current();\n@@ -1021,99 +1016,6 @@ void migration_start_incoming(void)\n qemu_coroutine_enter(co);\n }\n \n-static bool migration_has_main_and_multifd_channels(void)\n-{\n- MigrationIncomingState *mis = migration_incoming_get_current();\n- if (!mis->from_src_file) {\n- /* main channel not established */\n- return false;\n- }\n-\n- if (migrate_multifd() && !multifd_recv_all_channels_created()) {\n- return false;\n- }\n-\n- /* main and all multifd channels are established */\n- return true;\n-}\n-\n-uint8_t migration_ioc_process_incoming(QIOChannel *ioc, Error **errp)\n-{\n- MigrationIncomingState *mis = migration_incoming_get_current();\n- uint8_t channel = CH_NONE;\n- uint32_t channel_magic = 0;\n- int ret = 0;\n-\n- if (!migration_has_main_and_multifd_channels()) {\n- if (qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_READ_MSG_PEEK)) {\n- /*\n- * With multiple channels, it is possible that we receive channels\n- * out of order on destination side, causing incorrect mapping of\n- * source channels on destination side. Check channel MAGIC to\n- * decide type of channel. Please note this is best effort,\n- * postcopy preempt channel does not send any magic number so\n- * avoid it for postcopy live migration. Also tls live migration\n- * already does tls handshake while initializing main channel so\n- * with tls this issue is not possible.\n- */\n- ret = migration_channel_read_peek(ioc, (void *)&channel_magic,\n- sizeof(channel_magic), errp);\n- if (ret != 0) {\n- goto out;\n- }\n-\n- channel_magic = be32_to_cpu(channel_magic);\n- if (channel_magic == QEMU_VM_FILE_MAGIC) {\n- channel = CH_MAIN;\n- } else if (channel_magic == MULTIFD_MAGIC) {\n- assert(migrate_multifd());\n- channel = CH_MULTIFD;\n- } else if (!mis->from_src_file &&\n- mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {\n- /* reconnect main channel for postcopy recovery */\n- channel = CH_MAIN;\n- } else {\n- error_setg(errp, \"unknown channel magic: %u\", channel_magic);\n- }\n- } else if (mis->from_src_file && migrate_multifd()) {\n- /*\n- * Non-peekable channels like tls/file are processed as\n- * multifd channels when multifd is enabled.\n- */\n- channel = CH_MULTIFD;\n- } else if (!mis->from_src_file) {\n- channel = CH_MAIN;\n- } else {\n- error_setg(errp, \"non-peekable channel used without multifd\");\n- }\n- } else {\n- assert(migrate_postcopy_preempt());\n- channel = CH_POSTCOPY;\n- }\n-out:\n- return channel;\n-}\n-\n-/**\n- * @migration_has_all_channels: We have received all channels that we need\n- *\n- * Returns true when we have got connections to all the channels that\n- * we need for migration.\n- */\n-bool migration_has_all_channels(void)\n-{\n- if (!migration_has_main_and_multifd_channels()) {\n- return false;\n- }\n-\n- MigrationIncomingState *mis = migration_incoming_get_current();\n- if (migrate_postcopy_preempt() && !mis->postcopy_qemufile_dst) {\n- return false;\n- }\n-\n- return true;\n-}\n-\n int migrate_send_rp_switchover_ack(MigrationIncomingState *mis)\n {\n return migrate_send_rp_message(mis, MIG_RP_MSG_SWITCHOVER_ACK, 0, NULL);\ndiff --git a/migration/migration.h b/migration/migration.h\nindex cbe90471c2..138831d7d9 100644\n--- a/migration/migration.h\n+++ b/migration/migration.h\n@@ -529,13 +529,12 @@ void migrate_set_state(MigrationStatus *state, MigrationStatus old_state,\n void migration_outgoing_setup(QIOChannel *ioc);\n bool migration_incoming_setup(QIOChannel *ioc, uint8_t channel, Error **errp);\n \n-bool migration_has_all_channels(void);\n-\n void migration_connect_error_propagate(MigrationState *s, Error *error);\n void migrate_error_propagate(MigrationState *s, Error *error);\n bool migrate_has_error(MigrationState *s);\n \n-void migration_start_outgoing(MigrationState *s, QEMUFile *file);\n+void migration_start_outgoing(MigrationState *s);\n+void migration_start_incoming(void);\n \n int migration_call_notifiers(MigrationState *s, MigrationEventType type,\n Error **errp);\ndiff --git a/migration/rdma.c b/migration/rdma.c\nindex 788120a0b1..6e9ca5f5f6 100644\n--- a/migration/rdma.c\n+++ b/migration/rdma.c\n@@ -17,6 +17,7 @@\n #include \"qemu/osdep.h\"\n #include \"qapi/error.h\"\n #include \"qemu/cutils.h\"\n+#include \"channel.h\"\n #include \"exec/target_page.h\"\n #include \"rdma.h\"\n #include \"migration.h\"\n","prefixes":["RFC","17/25"]}