From: Chuan Zheng <zhengchuan@huawei.com>
To: <quintela@redhat.com>, <dgilbert@redhat.com>, <berrange@redhat.com>
Cc: yubihong@huawei.com, zhang.zhanghailiang@huawei.com,
qemu-devel@nongnu.org, xiexiangyou@huawei.com,
alex.chen@huawei.com, wanghao232@huawei.com
Subject: [PATCH v2] migration/multifd: close TLS channel before socket finalize
Date: Fri, 6 Nov 2020 18:54:54 +0800 [thread overview]
Message-ID: <1604660094-123959-1-git-send-email-zhengchuan@huawei.com> (raw)
Since we now support tls multifd, when we cancel migration, the TLS
sockets will be left as CLOSE-WAIT On Src which results in socket
leak.
Fix it by closing TLS channel before socket finalize.
Signed-off-by: Chuan Zheng <zhengchuan@huawei.com>
---
migration/multifd.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/migration/multifd.c b/migration/multifd.c
index 68b171f..a6838dc 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -523,6 +523,19 @@ static void multifd_send_terminate_threads(Error *err)
}
}
+static void multifd_tls_socket_close(QIOChannel *ioc, Error *err)
+{
+ if (ioc &&
+ object_dynamic_cast(OBJECT(ioc),
+ TYPE_QIO_CHANNEL_TLS)) {
+ /*
+ * TLS channel is special, we need close it before
+ * socket finalize.
+ */
+ qio_channel_close(ioc, &err);
+ }
+}
+
void multifd_save_cleanup(void)
{
int i;
@@ -542,6 +555,7 @@ void multifd_save_cleanup(void)
MultiFDSendParams *p = &multifd_send_state->params[i];
Error *local_err = NULL;
+ multifd_tls_socket_close(p->c, NULL);
socket_send_channel_destroy(p->c);
p->c = NULL;
qemu_mutex_destroy(&p->mutex);
--
1.8.3.1
next reply other threads:[~2020-11-06 10:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-06 10:54 Chuan Zheng [this message]
2020-11-10 1:30 ` [PATCH v2] migration/multifd: close TLS channel before socket finalize Zheng Chuan
2020-11-10 10:12 ` Daniel P. Berrangé
2020-11-10 10:45 ` Zheng Chuan
2020-11-10 11:01 ` Daniel P. Berrangé
2020-11-10 11:56 ` Zheng Chuan
2020-11-11 7:07 ` Zheng Chuan
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=1604660094-123959-1-git-send-email-zhengchuan@huawei.com \
--to=zhengchuan@huawei.com \
--cc=alex.chen@huawei.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=wanghao232@huawei.com \
--cc=xiexiangyou@huawei.com \
--cc=yubihong@huawei.com \
--cc=zhang.zhanghailiang@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).