migration/tls: add support for multifd tls-handshake
Similar like migration main thread, we need to do handshake for each multifd thread. Signed-off-by: Chuan Zheng <zhengchuan@huawei.com> Signed-off-by: Yan Jin <jinyan12@huawei.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <1600139042-104593-6-git-send-email-zhengchuan@huawei.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
parent
03c7a42d0d
commit
2964714015
@ -20,6 +20,7 @@
|
|||||||
#include "ram.h"
|
#include "ram.h"
|
||||||
#include "migration.h"
|
#include "migration.h"
|
||||||
#include "socket.h"
|
#include "socket.h"
|
||||||
|
#include "tls.h"
|
||||||
#include "qemu-file.h"
|
#include "qemu-file.h"
|
||||||
#include "trace.h"
|
#include "trace.h"
|
||||||
#include "multifd.h"
|
#include "multifd.h"
|
||||||
@ -719,6 +720,77 @@ out:
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool multifd_channel_connect(MultiFDSendParams *p,
|
||||||
|
QIOChannel *ioc,
|
||||||
|
Error *error);
|
||||||
|
|
||||||
|
static void multifd_tls_outgoing_handshake(QIOTask *task,
|
||||||
|
gpointer opaque)
|
||||||
|
{
|
||||||
|
MultiFDSendParams *p = opaque;
|
||||||
|
QIOChannel *ioc = QIO_CHANNEL(qio_task_get_source(task));
|
||||||
|
Error *err = NULL;
|
||||||
|
|
||||||
|
qio_task_propagate_error(task, &err);
|
||||||
|
multifd_channel_connect(p, ioc, err);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void multifd_tls_channel_connect(MultiFDSendParams *p,
|
||||||
|
QIOChannel *ioc,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
MigrationState *s = migrate_get_current();
|
||||||
|
const char *hostname = p->tls_hostname;
|
||||||
|
QIOChannelTLS *tioc;
|
||||||
|
|
||||||
|
tioc = migration_tls_client_create(s, ioc, hostname, errp);
|
||||||
|
if (!tioc) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
qio_channel_set_name(QIO_CHANNEL(tioc), "multifd-tls-outgoing");
|
||||||
|
qio_channel_tls_handshake(tioc,
|
||||||
|
multifd_tls_outgoing_handshake,
|
||||||
|
p,
|
||||||
|
NULL,
|
||||||
|
NULL);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool multifd_channel_connect(MultiFDSendParams *p,
|
||||||
|
QIOChannel *ioc,
|
||||||
|
Error *error)
|
||||||
|
{
|
||||||
|
MigrationState *s = migrate_get_current();
|
||||||
|
|
||||||
|
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,
|
static void multifd_new_send_channel_cleanup(MultiFDSendParams *p,
|
||||||
QIOChannel *ioc, Error *err)
|
QIOChannel *ioc, Error *err)
|
||||||
{
|
{
|
||||||
@ -749,8 +821,9 @@ static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque)
|
|||||||
p->c = QIO_CHANNEL(sioc);
|
p->c = QIO_CHANNEL(sioc);
|
||||||
qio_channel_set_delay(p->c, false);
|
qio_channel_set_delay(p->c, false);
|
||||||
p->running = true;
|
p->running = true;
|
||||||
qemu_thread_create(&p->thread, p->name, multifd_send_thread, p,
|
if (multifd_channel_connect(p, sioc, local_err)) {
|
||||||
QEMU_THREAD_JOINABLE);
|
goto cleanup;
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user