All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fabiano Rosas" <farosas@suse.de>,
	"Juraj Marcin" <jmarcin@redhat.com>,
	peterx@redhat.com, "Feifan Qian" <bea1e@proton.me>,
	"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH v2 4/5] migration: Fix rare hang of migration_channel_read_peek()
Date: Tue, 28 Jul 2026 17:04:16 -0400	[thread overview]
Message-ID: <20260728210417.1925078-5-peterx@redhat.com> (raw)
In-Reply-To: <20260728210417.1925078-1-peterx@redhat.com>

In an unlikely case, when a migration stream is attached to the destination
QEMU and only send <4 bytes to the channel as magic, it's possible that
migration_channel_read_peek() may spin forever.

Fix it by adding a manual sleep for partial read.

Since the path isn't attached to a coroutine, it means when partial read
happens, there's yet not much we can do but hang the main thread, it will
happen even for len==0 case.  It means monitors can hang due to this,
either partial read or no data arrived (but connection established).

Leave this for later, the hope is this is extremely rare in production.

Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3889
Reported-by: Feifan Qian <bea1e@proton.me>
Cc: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
 migration/channel.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/migration/channel.c b/migration/channel.c
index 1e2935f926..f446561b59 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -296,9 +296,16 @@ int migration_channel_read_peek(QIOChannel *ioc,
 
         if (len == buflen) {
             break;
+        } else if (len == 0) {
+            qio_channel_wait_cond(ioc, G_IO_IN);
+        } else {
+            /*
+             * When partially ready, we can't use qio_channel_wait_cond()
+             * because it will return immediately.  Apply a manual wait.
+             */
+            assert(!qemu_in_coroutine());
+            g_usleep(1000);
         }
-
-        qio_channel_wait_cond(ioc, G_IO_IN);
     }
 
     return 0;
-- 
2.54.0



  parent reply	other threads:[~2026-07-28 21:05 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-28 21:04 [PATCH v2 0/5] migration: Hardening fixes for 11.2 Peter Xu
2026-07-28 21:04 ` [PATCH v2 1/5] migration: Fix possible overflow in vmstate_handle_alloc() Peter Xu
2026-07-28 21:04 ` [PATCH v2 2/5] migration/multifd: Validate next_packet_size in zlib/zstd recv Peter Xu
2026-07-28 21:04 ` [PATCH v2 3/5] migration/multifd: Replace assert() with error_setg() in recv paths Peter Xu
2026-07-28 21:04 ` Peter Xu [this message]
2026-07-28 21:29   ` [PATCH v2 4/5] migration: Fix rare hang of migration_channel_read_peek() Peter Xu
2026-07-29 14:38     ` Peter Xu
2026-07-29 14:43     ` Daniel P. Berrangé
2026-07-29 15:39       ` Peter Xu
2026-07-28 21:04 ` [PATCH v2 5/5] migration/ram: Check for RAMBlock size mismatch when parsing Peter Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260728210417.1925078-5-peterx@redhat.com \
    --to=peterx@redhat.com \
    --cc=bea1e@proton.me \
    --cc=berrange@redhat.com \
    --cc=farosas@suse.de \
    --cc=jmarcin@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.