qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] migration/multifd: close TLS channel before socket finalize
@ 2020-11-06 10:54 Chuan Zheng
  2020-11-10  1:30 ` Zheng Chuan
  2020-11-10 10:12 ` Daniel P. Berrangé
  0 siblings, 2 replies; 7+ messages in thread
From: Chuan Zheng @ 2020-11-06 10:54 UTC (permalink / raw)
  To: quintela, dgilbert, berrange
  Cc: yubihong, zhang.zhanghailiang, qemu-devel, xiexiangyou, alex.chen,
	wanghao232

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



^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-11-11  7:09 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-06 10:54 [PATCH v2] migration/multifd: close TLS channel before socket finalize Chuan Zheng
2020-11-10  1:30 ` 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

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).