From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, kuhn.chenqun@huawei.com,
zhengchuan@huawei.com, lihaotian9@huawei.com,
longpeng2@huawei.com, liangpeng10@huawei.com, philmd@redhat.com,
liuzhiqiang26@huawei.com
Cc: stefanha@redhat.com, quintela@redhat.com
Subject: [PULL 03/11] migration/multifd: fix hangup with TLS-Multifd due to blocking handshake
Date: Thu, 12 Nov 2020 18:37:50 +0000 [thread overview]
Message-ID: <20201112183758.203176-4-dgilbert@redhat.com> (raw)
In-Reply-To: <20201112183758.203176-1-dgilbert@redhat.com>
From: Chuan Zheng <zhengchuan@huawei.com>
The qemu main loop could hang up forever when we enable TLS+Multifd.
The Src multifd_send_0 invokes tls handshake, it sends hello to sever
and wait response.
However, the Dst main qemu loop has been waiting recvmsg() for multifd_recv_1.
Both of Src and Dst main qemu loop are blocking and waiting for reponse which
results in hanging up forever.
Src: (multifd_send_0) Dst: (multifd_recv_1)
multifd_channel_connect migration_channel_process_incoming
multifd_tls_channel_connect migration_tls_channel_process_incoming
multifd_tls_channel_connect qio_channel_tls_handshake_task
qio_channel_tls_handshake gnutls_handshake
qio_channel_tls_handshake_task ...
qcrypto_tls_session_handshake ...
gnutls_handshake ...
... ...
recvmsg (Blocking I/O waiting for response) recvmsg (Blocking I/O waiting for response)
Fix this by offloadinig handshake work to a background thread.
Reported-by: Yan Jin <jinyan12@huawei.com>
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Chuan Zheng <zhengchuan@huawei.com>
Message-Id: <1604643893-8223-1-git-send-email-zhengchuan@huawei.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/multifd.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/migration/multifd.c b/migration/multifd.c
index 68b171fb61..88486b90d6 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -739,6 +739,19 @@ static void multifd_tls_outgoing_handshake(QIOTask *task,
multifd_channel_connect(p, ioc, err);
}
+static void *multifd_tls_handshake_thread(void *opaque)
+{
+ MultiFDSendParams *p = opaque;
+ QIOChannelTLS *tioc = QIO_CHANNEL_TLS(p->c);
+
+ qio_channel_tls_handshake(tioc,
+ multifd_tls_outgoing_handshake,
+ p,
+ NULL,
+ NULL);
+ return NULL;
+}
+
static void multifd_tls_channel_connect(MultiFDSendParams *p,
QIOChannel *ioc,
Error **errp)
@@ -754,12 +767,10 @@ static void multifd_tls_channel_connect(MultiFDSendParams *p,
trace_multifd_tls_outgoing_handshake_start(ioc, tioc, hostname);
qio_channel_set_name(QIO_CHANNEL(tioc), "multifd-tls-outgoing");
- qio_channel_tls_handshake(tioc,
- multifd_tls_outgoing_handshake,
- p,
- NULL,
- NULL);
-
+ p->c = QIO_CHANNEL(tioc);
+ qemu_thread_create(&p->thread, "multifd-tls-handshake-worker",
+ multifd_tls_handshake_thread, p,
+ QEMU_THREAD_JOINABLE);
}
static bool multifd_channel_connect(MultiFDSendParams *p,
--
2.28.0
next prev parent reply other threads:[~2020-11-12 18:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 18:37 [PULL 00/11] migration queue Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 01/11] migration/ram: Fix hexadecimal format string specifier Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 02/11] ACPI: Avoid infinite recursion when dump-vmstate Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` Dr. David Alan Gilbert (git) [this message]
2020-11-12 18:37 ` [PULL 04/11] migration: fix uninitialized variable warning in migrate_send_rp_req_pages() Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 05/11] migration/dirtyrate: simplify includes in dirtyrate.c Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 06/11] multifd/tls: fix memoryleak of the QIOChannelSocket object when cancelling migration Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 07/11] migration: handle CANCELLING state in migration_completion() Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 08/11] virtiofsd: Announce submounts even without statx() Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 09/11] tools/virtiofsd/buffer.c: check whether buf is NULL in fuse_bufvec_advance func Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 10/11] virtiofsd: check whether lo_map_reserve returns NULL in, main func Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 11/11] virtiofsd: check whether strdup lo.source return NULL in " Dr. David Alan Gilbert (git)
2020-11-13 10:49 ` [PULL 00/11] 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=20201112183758.203176-4-dgilbert@redhat.com \
--to=dgilbert@redhat.com \
--cc=kuhn.chenqun@huawei.com \
--cc=liangpeng10@huawei.com \
--cc=lihaotian9@huawei.com \
--cc=liuzhiqiang26@huawei.com \
--cc=longpeng2@huawei.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=stefanha@redhat.com \
--cc=zhengchuan@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).