qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Chuan Zheng <zhengchuan@huawei.com>
To: <quintela@redhat.com>, <eblake@redhat.com>, <dgilbert@redhat.com>,
	<berrange@redhat.com>
Cc: zhengchuan@huawei.com, zhang.zhanghailiang@huawei.com,
	yuxiating@huawei.com, qemu-devel@nongnu.org,
	xiexiangyou@huawei.com, alex.chen@huawei.com,
	jinyan12@huawei.com
Subject: [PATCH v1 5/7] migration/tls: add support for tls check
Date: Wed, 9 Sep 2020 22:52:55 +0800	[thread overview]
Message-ID: <1599663177-53993-6-git-send-email-zhengchuan@huawei.com> (raw)
In-Reply-To: <1599663177-53993-1-git-send-email-zhengchuan@huawei.com>

add multifd_channel_connect to support for tls check.

Signed-off-by: Chuan Zheng <zhengchuan@huawei.com>
Signed-off-by: Yan Jin <jinyan12@huawei.com>
---
 migration/multifd.c | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/migration/multifd.c b/migration/multifd.c
index b2e741c..b2076d7 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -20,6 +20,7 @@
 #include "ram.h"
 #include "migration.h"
 #include "socket.h"
+#include "tls.h"
 #include "qemu-file.h"
 #include "trace.h"
 #include "multifd.h"
@@ -718,6 +719,47 @@ out:
     return NULL;
 }
 
+static void multifd_tls_channel_connect(MultiFDSendParams *p,
+                                    QIOChannel *ioc,
+                                    Error **errp)
+{
+    /* TODO */
+}
+
+static bool multifd_channel_connect(MultiFDSendParams *p,
+                                    QIOChannel *ioc,
+                                    Error *error)
+{
+    MigrationState *s = p->s;
+
+    if (!error) {
+        if (s->parameters.tls_creds &&
+            *s->parameters.tls_creds &&
+            !object_dynamic_cast(OBJECT(ioc),
+                                 TYPE_QIO_CHANNEL_TLS)) {
+            multifd_tls_channel_connect(p, ioc, &error);
+            if (!error) {
+                /*
+                 * tls_channel_connect will call back to this
+                 * function after the TLS handshake,
+                 * so we mustn't call multifd_send_thread until then
+                 */
+                return false;
+            } else {
+                return true;
+            }
+        } else {
+            /* update for tls qio channel */
+            p->c = ioc;
+            qemu_thread_create(&p->thread, p->name, multifd_send_thread, p,
+                                   QEMU_THREAD_JOINABLE);
+       }
+       return false;
+    }
+
+    return true;
+}
+
 static void multifd_new_send_channel_cleanup(MultiFDSendParams *p,
                                              QIOChannel *ioc, Error *err)
 {
@@ -749,8 +791,9 @@ static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque)
         p->c = QIO_CHANNEL(sioc);
         qio_channel_set_delay(p->c, false);
         p->running = true;
-        qemu_thread_create(&p->thread, p->name, multifd_send_thread, p,
-                           QEMU_THREAD_JOINABLE);
+        if (multifd_channel_connect(p, sioc, local_err)) {
+            goto cleanup;
+        }
         return;
     }
 
-- 
1.8.3.1



  parent reply	other threads:[~2020-09-09 14:44 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-09 14:52 [RFC][PATCH v1 0/7] *** Add Multifd support for TLS migration *** Chuan Zheng
2020-09-09 14:52 ` [PATCH v1 1/7] migration/tls: save hostname into MigrationState Chuan Zheng
2020-09-10 13:11   ` Daniel P. Berrangé
2020-09-10 13:55     ` Zheng Chuan
2020-09-09 14:52 ` [PATCH v1 2/7] migration/tls: extract migration_tls_client_create for common-use Chuan Zheng
2020-09-10 13:16   ` Daniel P. Berrangé
2020-09-10 13:55     ` Zheng Chuan
2020-09-09 14:52 ` [PATCH v1 3/7] migration/tls: add MigrationState into MultiFDSendParams Chuan Zheng
2020-09-10 13:38   ` Daniel P. Berrangé
2020-09-09 14:52 ` [PATCH v1 4/7] migration/tls: extract cleanup function for common-use Chuan Zheng
2020-09-10 13:18   ` Daniel P. Berrangé
2020-09-09 14:52 ` Chuan Zheng [this message]
2020-09-10 13:36   ` [PATCH v1 5/7] migration/tls: add support for tls check Daniel P. Berrangé
2020-09-09 14:52 ` [PATCH v1 6/7] migration/tls: add support for multifd tls-handshake Chuan Zheng
2020-09-10 13:25   ` Daniel P. Berrangé
2020-09-10 13:56     ` Zheng Chuan
2020-09-09 14:52 ` [PATCH v1 7/7] migration/tls: add trace points for multifd-tls Chuan Zheng
2020-09-10 13:37   ` Daniel P. Berrangé
2020-09-10 13:57     ` 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=1599663177-53993-6-git-send-email-zhengchuan@huawei.com \
    --to=zhengchuan@huawei.com \
    --cc=alex.chen@huawei.com \
    --cc=berrange@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=eblake@redhat.com \
    --cc=jinyan12@huawei.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=xiexiangyou@huawei.com \
    --cc=yuxiating@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).