Skip to content

Commit

Permalink
migration/multifd: Clarify Error usage in multifd_channel_connect
Browse files Browse the repository at this point in the history 
The function is currently called from two sites, one always gives it a
NULL Error and the other always gives it a non-NULL Error.

In the non-NULL case, all it does it trace the error and return. One
of the callers already have tracing, add a tracepoint to the other and
stop passing the error into the function.

Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231012134343.23757-4-farosas@suse.de>
  • Loading branch information
Fabiano Rosas authored and Juan Quintela committed Oct 17, 2023
1 parent ee8a7c9 commit 967e388
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 33 deletions.
60 changes: 28 additions & 32 deletions migration/multifd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ static void *multifd_send_thread(void *opaque)

static bool multifd_channel_connect(MultiFDSendParams *p,
QIOChannel *ioc,
Error *error);
Error **errp);

static void multifd_tls_outgoing_handshake(QIOTask *task,
gpointer opaque)
Expand All @@ -784,21 +784,22 @@ static void multifd_tls_outgoing_handshake(QIOTask *task,
QIOChannel *ioc = QIO_CHANNEL(qio_task_get_source(task));
Error *err = NULL;

if (qio_task_propagate_error(task, &err)) {
trace_multifd_tls_outgoing_handshake_error(ioc, error_get_pretty(err));
} else {
if (!qio_task_propagate_error(task, &err)) {
trace_multifd_tls_outgoing_handshake_complete(ioc);
if (multifd_channel_connect(p, ioc, &err)) {
return;
}
}

if (!multifd_channel_connect(p, ioc, err)) {
/*
* Error happen, mark multifd_send_thread status as 'quit' although it
* is not created, and then tell who pay attention to me.
*/
p->quit = true;
qemu_sem_post(&multifd_send_state->channels_ready);
qemu_sem_post(&p->sem_sync);
}
trace_multifd_tls_outgoing_handshake_error(ioc, error_get_pretty(err));

/*
* Error happen, mark multifd_send_thread status as 'quit' although it
* is not created, and then tell who pay attention to me.
*/
p->quit = true;
qemu_sem_post(&multifd_send_state->channels_ready);
qemu_sem_post(&p->sem_sync);
}

static void *multifd_tls_handshake_thread(void *opaque)
Expand All @@ -814,7 +815,7 @@ static void *multifd_tls_handshake_thread(void *opaque)
return NULL;
}

static void multifd_tls_channel_connect(MultiFDSendParams *p,
static bool multifd_tls_channel_connect(MultiFDSendParams *p,
QIOChannel *ioc,
Error **errp)
{
Expand All @@ -824,7 +825,7 @@ static void multifd_tls_channel_connect(MultiFDSendParams *p,

tioc = migration_tls_client_create(ioc, hostname, errp);
if (!tioc) {
return;
return false;
}

object_unref(OBJECT(ioc));
Expand All @@ -834,31 +835,25 @@ static void multifd_tls_channel_connect(MultiFDSendParams *p,
qemu_thread_create(&p->thread, "multifd-tls-handshake-worker",
multifd_tls_handshake_thread, p,
QEMU_THREAD_JOINABLE);
return true;
}

static bool multifd_channel_connect(MultiFDSendParams *p,
QIOChannel *ioc,
Error *error)
Error **errp)
{
trace_multifd_set_outgoing_channel(
ioc, object_get_typename(OBJECT(ioc)),
migrate_get_current()->hostname, error);
migrate_get_current()->hostname);

if (error) {
return false;
}
if (migrate_channel_requires_tls_upgrade(ioc)) {
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 true;
} else {
return false;
}
/*
* tls_channel_connect will call back to this
* function after the TLS handshake,
* so we mustn't call multifd_send_thread until then
*/
return multifd_tls_channel_connect(p, ioc, errp);

} else {
migration_ioc_register_yank(ioc);
p->registered_yank = true;
Expand Down Expand Up @@ -897,11 +892,12 @@ static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque)
p->c = ioc;
qio_channel_set_delay(p->c, false);
p->running = true;
if (multifd_channel_connect(p, ioc, local_err)) {
if (multifd_channel_connect(p, ioc, &local_err)) {
return;
}
}

trace_multifd_new_send_channel_async_error(p->id, local_err);
multifd_new_send_channel_cleanup(p, ioc, local_err);
}

Expand Down
3 changes: 2 additions & 1 deletion migration/trace-events
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ postcopy_preempt_reset_channel(void) ""

# multifd.c
multifd_new_send_channel_async(uint8_t id) "channel %u"
multifd_new_send_channel_async_error(uint8_t id, void *err) "channel=%u err=%p"
multifd_recv(uint8_t id, uint64_t packet_num, uint32_t used, uint32_t flags, uint32_t next_packet_size) "channel %u packet_num %" PRIu64 " pages %u flags 0x%x next packet size %u"
multifd_recv_new_channel(uint8_t id) "channel %u"
multifd_recv_sync_main(long packet_num) "packet num %ld"
Expand All @@ -144,7 +145,7 @@ multifd_send_thread_start(uint8_t id) "%u"
multifd_tls_outgoing_handshake_start(void *ioc, void *tioc, const char *hostname) "ioc=%p tioc=%p hostname=%s"
multifd_tls_outgoing_handshake_error(void *ioc, const char *err) "ioc=%p err=%s"
multifd_tls_outgoing_handshake_complete(void *ioc) "ioc=%p"
multifd_set_outgoing_channel(void *ioc, const char *ioctype, const char *hostname, void *err) "ioc=%p ioctype=%s hostname=%s err=%p"
multifd_set_outgoing_channel(void *ioc, const char *ioctype, const char *hostname) "ioc=%p ioctype=%s hostname=%s"

# migration.c
await_return_path_close_on_source_close(void) ""
Expand Down

0 comments on commit 967e388

Please sign in to comment.