From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, groug@kaod.org, vgoyal@redhat.com,
wanghao232@huawei.com, ma.mandourr@gmail.com
Cc: stefanha@redhat.com, peterx@redhat.com, quintela@redhat.com
Subject: [PULL 7/9] migration/tls: add error handling in multifd_tls_handshake_thread
Date: Mon, 15 Mar 2021 20:12:13 +0000 [thread overview]
Message-ID: <20210315201215.222539-8-dgilbert@redhat.com> (raw)
In-Reply-To: <20210315201215.222539-1-dgilbert@redhat.com>
From: Hao Wang <wanghao232@huawei.com>
If any error happens during multifd send thread creating (e.g. channel broke
because new domain is destroyed by the dst), multifd_tls_handshake_thread
may exit silently, leaving main migration thread hanging (ram_save_setup ->
multifd_send_sync_main -> qemu_sem_wait(&p->sem_sync)).
Fix that by adding error handling in multifd_tls_handshake_thread.
Signed-off-by: Hao Wang <wanghao232@huawei.com>
Message-Id: <20210209104237.2250941-3-wanghao232@huawei.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Chuan Zheng <zhengchuan@huawei.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/multifd.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/migration/multifd.c b/migration/multifd.c
index 2a1ea85ade..03527c564c 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -739,7 +739,16 @@ static void multifd_tls_outgoing_handshake(QIOTask *task,
} else {
trace_multifd_tls_outgoing_handshake_complete(ioc);
}
- multifd_channel_connect(p, ioc, err);
+
+ if (!multifd_channel_connect(p, ioc, err)) {
+ /*
+ * Error happen, mark multifd_send_thread status as 'quit' although it
+ * is not created, and then tell who pay attention to me.
+ */
+ p->quit = true;
+ qemu_sem_post(&multifd_send_state->channels_ready);
+ qemu_sem_post(&p->sem_sync);
+ }
}
static void *multifd_tls_handshake_thread(void *opaque)
--
2.30.2
next prev parent reply other threads:[~2021-03-15 20:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 20:12 [PULL 0/9] virtiofs and migration queue Dr. David Alan Gilbert (git)
2021-03-15 20:12 ` [PULL 1/9] virtiofsd: Release vu_dispatch_lock when stopping queue Dr. David Alan Gilbert (git)
2021-03-15 20:12 ` [PULL 2/9] virtiofsd: Add qemu version and copyright info Dr. David Alan Gilbert (git)
2021-03-15 20:12 ` [PULL 3/9] virtiofsd: Don't allow empty filenames Dr. David Alan Gilbert (git)
2021-03-15 20:12 ` [PULL 4/9] virtiofsd: Don't allow empty paths in lookup_name() Dr. David Alan Gilbert (git)
2021-03-15 20:12 ` [PULL 5/9] virtiofsd: Convert some functions to return bool Dr. David Alan Gilbert (git)
2021-03-15 20:12 ` [PULL 6/9] migration/tls: fix inverted semantics in multifd_channel_connect Dr. David Alan Gilbert (git)
2021-03-15 20:12 ` Dr. David Alan Gilbert (git) [this message]
2021-03-15 20:12 ` [PULL 8/9] monitor: Replaced qemu_mutex_lock calls with QEMU_LOCK_GUARD Dr. David Alan Gilbert (git)
2021-03-15 20:12 ` [PULL 9/9] migration: " Dr. David Alan Gilbert (git)
2021-03-17 10:37 ` [PULL 0/9] virtiofs and migration queue Peter Maydell
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=20210315201215.222539-8-dgilbert@redhat.com \
--to=dgilbert@redhat.com \
--cc=groug@kaod.org \
--cc=ma.mandourr@gmail.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=stefanha@redhat.com \
--cc=vgoyal@redhat.com \
--cc=wanghao232@huawei.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).