Introduce 'yank' oob qmp command to recover from hanging qemu
v5 cover Introduce 'yank' oob qmp command to recover from hanging qemu
Hello Everyone,
In many cases, if qemu has a network connection (qmp, migration, chardev, etc.) to some other server and that server dies or hangs, qemu hangs too. These patches introduce the new 'yank' out-of-band qmp command to recover from these kinds of hangs. The different subsystems register callbacks which get executed with the yank command. For example the callback can shutdown() a socket. This is intended for the colo use-case, but it can be used for other things too of course.
Regards,
Lukas Straub
v5:
-move yank.c to util/
-move yank.h to include/qemu/
-add license to yank.h
-use const char*
-nbd: use atomic_store_release and atomic_load_aqcuire -io-channel: ensure thread-safety and document it -add myself as maintainer for yank
v4:
-fix build errors...
v3:
-don't touch softmmu/vl.c, use __contructor__ attribute instead (Paolo Bonzini) -fix build errors
-rewrite migration patch so it actually passes all tests
v2:
-don't touch io/ code anymore
-always register yank functions
-'yank' now takes a list of instances to yank -'query-yank' returns a list of yankable instances
Lukas Straub (7):
Introduce yank feature
block/nbd.c: Add yank feature chardev/char-socket.c: Add yank feature
migration: Add yank feature
io/channel-tls.c: make qio_channel_tls_shutdown thread-safe
io: Document thread-safety of qio_channel_shutdown
MAINTAINERS: Add myself as maintainer for yank feature
MAINTAINERS | 13 +++ block/nbd.c | 101 ++++++++++++------- chardev/char-socket.c | 24 +++++ include/io/channel.h | 2 + include/qemu/yank.h | 79 +++++++++++++++ io/channel-tls.c | 6 +- migration/channel.c | 12 +++ migration/migration.c | 18 +++- migration/multifd.c | 10 ++ migration/qemu-file-channel.c | 6 ++ migration/savevm.c | 2 + qapi/misc.json | 45 +++++++++ tests/Makefile.include | 2 +- util/Makefile.objs | 1 + util/yank.c | 179 ++++++++++++++++++++++++++++++++++ 15 files changed, 459 insertions(+), 41 deletions(-) create mode 100644 include/qemu/yank.h create mode 100644 util/yank.c
--
2.20.1
PATCH v5 1/7 Introduce yank feature
The yank feature allows to recover from hanging qemu by "yanking" at various parts. Other qemu systems can register themselves and multiple yank functions. Then all yank functions for selected instances can be called by the 'yank' out-of-band qmp command. Available instances can be queried by a 'query-yank' oob command.
--- include/qemu/yank.h | 79 +++++++++++++++++++ qapi/misc.json | 45 +++++++++++ util/Makefile.objs | 1 + util/yank.c | 179 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 304 insertions(+) create mode 100644 include/qemu/yank.h create mode 100644 util/yank.c
include/qemu/yank.h new file +79 -0
@@ -0,0 +1,79 @@ +/* +* QEMU yank feature +* +* Copyright (c) Lukas Straub <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#ifndef YANK_H +#define YANK_H + +typedef void (YankFn ) (void *opaque); + +/** +* yank_register_instance: Register a new instance. +* +* This registers a new instance for yanking. Must be called before any yank +* function is registered for this instance. +* +* This function is thread-safe. +* +* @instance_name: The globally unique name of the instance. +*/ +void yank_register_instance (const char *instance_name); + +/** +* yank_unregister_instance: Unregister a instance. +* +* This unregisters a instance. Must be called only after every yank function +* of the instance has been unregistered. +* +* This function is thread-safe. +* +* @instance_name: The name of the instance. +*/ +void yank_unregister_instance (const char *instance_name); + +/** +* yank_register_function: Register a yank function +* +* This registers a yank function. All limitations of qmp oob commands apply +* to the yank function as well. +* +* This function is thread-safe. +* +* @instance_name: The name of the instance +* @func: The yank function +* @opaque: Will be passed to the yank function +*/ +void yank_register_function (const char *instance_name, +YankFn *func, +void *opaque); + +/** +* yank_unregister_function: Unregister a yank function +* +* This unregisters a yank function. +* +* This function is thread-safe. +* +* @instance_name: The name of the instance +* @func: func that was passed to yank_register_function +* @opaque: opaque that was passed to yank_register_function +*/ +void yank_unregister_function (const char *instance_name, +YankFn *func, +void *opaque); + +/** +* yank_unregister_function: Generic yank function for iochannel +* +* This is a generic yank function which will call qio_channel_shutdown on the +* provided QIOChannel. +* +* @opaque: QIOChannel to shutdown +*/ +void yank_generic_iochannel (void *opaque); +#endif
qapi/misc.json +45 -0
48 lines not on this page · raw message
util/Makefile.objs +1 -0
@@ -45,6 +45,7 @@ util-obj-$(CONFIG_GIO) += dbus.o dbus.o-cflags = $(GIO_CFLAGS) dbus.o-libs = $(GIO_LIBS) util-obj-$(CONFIG_USER_ONLY) += selfmap.o +util-obj-y += yank.o ####################################################################### # code used by both qemu system emulation and qemu-img
util/yank.c new file +179 -0
179 lines not on this page · raw message
--
2.20.1
Re: [PATCH v5 1/7] Introduce yank feature
Quoted 7 lines · Lukas Straub
The yank feature allows to recover from hanging qemu by "yanking" at various parts. Other qemu systems can register themselves and multiple yank functions. Then all yank functions for selected instances can be called by the 'yank' out-of-band qmp command. Available instances can be queried by a 'query-yank' oob command.
Signed-off-by Lukas Straub <[email protected]>
Quoted 8 lines
--- include/qemu/yank.h | 79 +++++++++++++++++++ qapi/misc.json | 45 +++++++++++ util/Makefile.objs | 1 + util/yank.c | 179 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 304 insertions(+) create mode 100644 include/qemu/yank.h create mode 100644 util/yank.c
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
PATCH v5 2/7 block/nbd.c: Add yank feature
In reply to Lukas StraubRegister a yank function which shuts down the socket and sets s->state = NBD_CLIENT_QUIT. This is the same behaviour as if an error occured.
--- block/nbd.c | 101 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 64 insertions(+), 37 deletions(-)
block/nbd.c +64 -37
@@ -35,6 +35,7 @@#include "qemu/option.h" #include "qemu/cutils.h" #include "qemu/main-loop.h" +#include "qemu/atomic.h" #include "qapi/qapi-visit-sockets.h" #include "qapi/qmp/qstring.h"
@@ -43,6 +44,8 @@#include "block/nbd.h" #include "block/block_int.h" +#include "qemu/yank.h" +#define EN_OPTSTR ":exportname="#define MAX_NBD_REQUESTS 16
@@ -84,6 +87,8 @@ typedef struct BDRVNBDState {NBDReply reply;BlockDriverState *bs; +char *yank_name; +/* Connection parameters */ uint32_t reconnect_delay;SocketAddress *saddr;
@@ -94,6 +99,7 @@ typedef struct BDRVNBDState { } BDRVNBDState;static int nbd_client_connect (BlockDriverState *bs,Error **errp); +static void nbd_yank (void *opaque);static void nbd_clear_bdrvstate (BDRVNBDState *s) {
@@ -106,17 +112,19 @@ static void nbd_clear_bdrvstate(BDRVNBDState *s) s->tlscredsid =NULL ;g_free (s->x_dirty_bitmap); s->x_dirty_bitmap =NULL ; +g_free (s->yank_name); + s->yank_name =NULL ; }static void nbd_channel_error (BDRVNBDState *s,int ret) {if (ret == -EIO ) { -if (s->state ==NBD_CLIENT_CONNECTED ) { +if (atomic_load_acquire (&s->state) ==NBD_CLIENT_CONNECTED ) { s->state = s->reconnect_delay ?NBD_CLIENT_CONNECTING_WAIT :NBD_CLIENT_CONNECTING_NOWAIT ; } }else { -if (s->state ==NBD_CLIENT_CONNECTED ) { +if (atomic_load_acquire (&s->state) ==NBD_CLIENT_CONNECTED ) {qio_channel_shutdown (s->ioc,QIO_CHANNEL_SHUTDOWN_BOTH ,NULL ); } s->state =NBD_CLIENT_QUIT ;
@@ -167,7 +175,7 @@ static void nbd_client_attach_aio_context(BlockDriverState *bs,* s->connection_co is either yielded from nbd_receive_reply or from * nbd_co_reconnect_loop() */ -if (s->state ==NBD_CLIENT_CONNECTED ) { +if (atomic_load_acquire (&s->state) ==NBD_CLIENT_CONNECTED ) {qio_channel_attach_aio_context (QIO_CHANNEL (s->ioc), new_context); }
@@ -206,7 +214,7 @@ static void nbd_teardown_connection(BlockDriverState *bs) {BDRVNBDState *s = (BDRVNBDState *)bs->opaque; -if (s->state ==NBD_CLIENT_CONNECTED ) { +if (atomic_load_acquire (&s->state) ==NBD_CLIENT_CONNECTED ) {/* finish any pending coroutines */ assert (s->ioc);qio_channel_shutdown (s->ioc,QIO_CHANNEL_SHUTDOWN_BOTH ,NULL );
@@ -230,13 +238,14 @@ static void nbd_teardown_connection(BlockDriverState *bs)static bool nbd_client_connecting (BDRVNBDState *s) { -return s->state ==NBD_CLIENT_CONNECTING_WAIT || - s->state ==NBD_CLIENT_CONNECTING_NOWAIT ; +NBDClientState state =atomic_load_acquire (&s->state); +return state ==NBD_CLIENT_CONNECTING_WAIT || + state ==NBD_CLIENT_CONNECTING_NOWAIT ; }static bool nbd_client_connecting_wait (BDRVNBDState *s) { -return s->state ==NBD_CLIENT_CONNECTING_WAIT ; +return atomic_load_acquire (&s->state) ==NBD_CLIENT_CONNECTING_WAIT ; } static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s)
@@ -274,6 +283,7 @@ static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s)/* Finalize previous connection if any */ if (s->ioc) {nbd_client_detach_aio_context (s->bs); +yank_unregister_function (s->yank_name, nbd_yank, s->bs);object_unref (OBJECT (s->sioc)); s->sioc =NULL ;object_unref (OBJECT (s->ioc));
@@ -305,7 +315,7 @@ static coroutine_fn void nbd_co_reconnect_loop(BDRVNBDState *s)nbd_reconnect_attempt (s);while (nbd_client_connecting (s)) { -if (s->state ==NBD_CLIENT_CONNECTING_WAIT && +if (atomic_load_acquire (&s->state) ==NBD_CLIENT_CONNECTING_WAIT &&qemu_clock_get_ns (QEMU_CLOCK_REALTIME ) - start_time_ns > delay_ns) { s->state =NBD_CLIENT_CONNECTING_NOWAIT ;
@@ -341,7 +351,7 @@ static coroutine_fn void nbd_connection_entry(void *opaque)int ret =0 ;Error *local_err =NULL ; -while (s->state !=NBD_CLIENT_QUIT ) { +while (atomic_load_acquire (&s->state) !=NBD_CLIENT_QUIT ) {/* * The NBD client can only really be considered idle when it has * yielded from qio_channel_readv_all_eof(), waiting for data. This is
@@ -356,7 +366,7 @@ static coroutine_fn void nbd_connection_entry(void *opaque)nbd_co_reconnect_loop (s); } -if (s->state !=NBD_CLIENT_CONNECTED ) { +if (atomic_load_acquire (&s->state) !=NBD_CLIENT_CONNECTED ) {continue ; }
@@ -411,6 +421,7 @@ static coroutine_fn void nbd_connection_entry(void *opaque) s->connection_co =NULL ;if (s->ioc) {nbd_client_detach_aio_context (s->bs); +yank_unregister_function (s->yank_name, nbd_yank, s->bs);object_unref (OBJECT (s->sioc)); s->sioc =NULL ;object_unref (OBJECT (s->ioc));
@@ -435,7 +446,7 @@ static int nbd_co_send_request(BlockDriverState *bs,qemu_co_queue_wait (&s->free_sema, &s->send_mutex); } -if (s->state !=NBD_CLIENT_CONNECTED ) { +if (atomic_load_acquire (&s->state) !=NBD_CLIENT_CONNECTED ) { rc = -EIO ; goto err; }
@@ -462,7 +473,7 @@ static int nbd_co_send_request(BlockDriverState *bs,if (qiov) {qio_channel_set_cork (s->ioc, true); rc =nbd_send_request (s->ioc, request); -if (rc >=0 && s->state ==NBD_CLIENT_CONNECTED ) { +if (rc >=0 &&atomic_load_acquire (&s->state) ==NBD_CLIENT_CONNECTED ) {if (qio_channel_writev_all (s->ioc, qiov->iov, qiov->niov,NULL ) <0 ) { rc = -EIO ;
@@ -777,7 +788,7 @@ static coroutine_fn int nbd_co_do_receive_one_chunk( s->requests[i].receiving = true;qemu_coroutine_yield (); s->requests[i].receiving = false; -if (s->state !=NBD_CLIENT_CONNECTED ) { +if (atomic_load_acquire (&s->state) !=NBD_CLIENT_CONNECTED ) {error_setg (errp,"Connection closed" );return -EIO ; }
@@ -936,7 +947,7 @@ static bool nbd_reply_chunk_iter_receive(BDRVNBDState *s,NBDReply local_reply;NBDStructuredReplyChunk *chunk;Error *local_err =NULL ; -if (s->state !=NBD_CLIENT_CONNECTED ) { +if (atomic_load_acquire (&s->state) !=NBD_CLIENT_CONNECTED ) {error_setg (&local_err,"Connection closed" );nbd_iter_channel_error (iter, -EIO , &local_err); goto break_loop;
@@ -961,7 +972,8 @@ static bool nbd_reply_chunk_iter_receive(BDRVNBDState *s, }/* Do not execute the body of NBD_FOREACH_REPLY_CHUNK for simple reply. */ -if (nbd_reply_is_simple (reply) || s->state !=NBD_CLIENT_CONNECTED ) { +if (nbd_reply_is_simple (reply) || +atomic_load_acquire (&s->state) !=NBD_CLIENT_CONNECTED ) { goto break_loop; }
@@ -1393,6 +1405,15 @@ static int nbd_client_reopen_prepare(BDRVReopenState *state,return 0 ; } +static void nbd_yank (void *opaque) +{ +BlockDriverState *bs = opaque; +BDRVNBDState *s = (BDRVNBDState *)bs->opaque; + +atomic_store_release (&s->state,NBD_CLIENT_QUIT ); +qio_channel_shutdown (QIO_CHANNEL (s->sioc),QIO_CHANNEL_SHUTDOWN_BOTH ,NULL ); +} +static void nbd_client_close (BlockDriverState *bs) {BDRVNBDState *s = (BDRVNBDState *)bs->opaque;
@@ -1405,25 +1426,29 @@ static void nbd_client_close(BlockDriverState *bs)nbd_teardown_connection (bs); } -static QIOChannelSocket *nbd_establish_connection (SocketAddress *saddr, -Error **errp) +static int nbd_establish_connection (BlockDriverState *bs, +SocketAddress *saddr, +Error **errp) { -QIOChannelSocket *sioc; +BDRVNBDState *s = (BDRVNBDState *)bs->opaque;Error *local_err =NULL ; - sioc =qio_channel_socket_new (); -qio_channel_set_name (QIO_CHANNEL (sioc),"nbd-client" ); + s->sioc =qio_channel_socket_new (); +qio_channel_set_name (QIO_CHANNEL (s->sioc),"nbd-client" ); +yank_register_function (s->yank_name, nbd_yank, bs); -qio_channel_socket_connect_sync (sioc, saddr, &local_err); +qio_channel_socket_connect_sync (s->sioc, saddr, &local_err);if (local_err) { -object_unref (OBJECT (sioc)); +yank_unregister_function (s->yank_name, nbd_yank, bs); +object_unref (OBJECT (s->sioc)); + s->sioc =NULL ;error_propagate (errp, local_err); -return NULL ; +return -1 ; } -qio_channel_set_delay (QIO_CHANNEL (sioc), false); +qio_channel_set_delay (QIO_CHANNEL (s->sioc), false); -return sioc; +return 0 ; }static int nbd_client_connect (BlockDriverState *bs,Error **errp)
@@ -1436,28 +1461,27 @@ static int nbd_client_connect(BlockDriverState *bs, Error **errp)* establish TCP connection, return error if it fails * TODO: Configurable retry-until-timeout behaviour. */ -QIOChannelSocket *sioc =nbd_establish_connection (s->saddr, errp); - -if (!sioc) { +if (nbd_establish_connection (bs, s->saddr, errp) <0 ) {return -ECONNREFUSED ; }/* NBD handshake */ trace_nbd_client_connect (s->export); -qio_channel_set_blocking (QIO_CHANNEL (sioc), false,NULL ); -qio_channel_attach_aio_context (QIO_CHANNEL (sioc), aio_context); +qio_channel_set_blocking (QIO_CHANNEL (s->sioc), false,NULL ); +qio_channel_attach_aio_context (QIO_CHANNEL (s->sioc), aio_context); s->info.request_sizes = true; s->info.structured_reply = true; s->info.base_allocation = true; s->info.x_dirty_bitmap =g_strdup (s->x_dirty_bitmap); s->info.name =g_strdup (s->export ?:"" ); - ret =nbd_receive_negotiate (aio_context,QIO_CHANNEL (sioc), s->tlscreds, + ret =nbd_receive_negotiate (aio_context,QIO_CHANNEL (s->sioc), s->tlscreds, s->hostname, &s->ioc, &s->info, errp);g_free (s->info.x_dirty_bitmap);g_free (s->info.name);if (ret <0 ) { -object_unref (OBJECT (sioc)); +yank_unregister_function (s->yank_name, nbd_yank, bs); +object_unref (OBJECT (s->sioc));return ret; }if (s->x_dirty_bitmap && !s->info.base_allocation) {
@@ -1483,10 +1507,8 @@ static int nbd_client_connect(BlockDriverState *bs, Error **errp) } } - s->sioc = sioc; -if (!s->ioc) { - s->ioc =QIO_CHANNEL (sioc); + s->ioc =QIO_CHANNEL (s->sioc);object_ref (OBJECT (s->ioc)); }
@@ -1502,9 +1524,10 @@ static int nbd_client_connect(BlockDriverState *bs, Error **errp) {NBDRequest request = { .type =NBD_CMD_DISC }; -nbd_send_request (s->ioc ?:QIO_CHANNEL (sioc), &request); +nbd_send_request (s->ioc ?:QIO_CHANNEL (s->sioc), &request); -object_unref (OBJECT (sioc)); +yank_unregister_function (s->yank_name, nbd_yank, bs); +object_unref (OBJECT (s->sioc));return ret; }
@@ -1911,6 +1934,9 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags,qemu_co_mutex_init (&s->send_mutex);qemu_co_queue_init (&s->free_sema); + s->yank_name =g_strconcat ("blockdev:" , bs->node_name,NULL ); +yank_register_instance (s->yank_name); + ret =nbd_client_connect (bs, errp);if (ret <0 ) {nbd_clear_bdrvstate (s);
@@ -1970,6 +1996,7 @@ static void nbd_close(BlockDriverState *bs)BDRVNBDState *s = bs->opaque;nbd_client_close (bs); +yank_unregister_instance (s->yank_name);nbd_clear_bdrvstate (s); }
--
2.20.1
Re: [PATCH v5 2/7] block/nbd.c: Add yank feature
Quoted 8 lines · Lukas Straub
Register a yank function which shuts down the socket and sets
s->state=NBD_CLIENT_QUIT. This is the same behaviour as if an error occured.Signed-off-by Lukas Straub <[email protected]>--- block/nbd.c | 101 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 64 insertions(+), 37 deletions(-)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
PATCH v5 3/7 chardev/char-socket.c: Add yank feature
In reply to Lukas StraubRegister a yank function to shutdown the socket on yank.
--- chardev/char-socket.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
chardev/char-socket.c +24 -0
@@ -34,6 +34,7 @@#include "qapi/error.h" #include "qapi/clone-visitor.h" #include "qapi/qapi-visit-sockets.h" +#include "qemu/yank.h" #include "chardev/char-io.h"
@@ -69,6 +70,7 @@ typedef struct {size_t read_msgfds_num;int *write_msgfds;size_t write_msgfds_num; +char *yank_name;SocketAddress *addr;bool is_listen;
@@ -411,6 +413,11 @@ static void tcp_chr_free_connection(Chardev *chr)tcp_set_msgfds (chr,NULL ,0 );remove_fd_in_watch (chr); +if (s->state ==TCP_CHARDEV_STATE_CONNECTING + || s->state ==TCP_CHARDEV_STATE_CONNECTED ) { +yank_unregister_function (s->yank_name, yank_generic_iochannel, +QIO_CHANNEL (s->sioc)); + }object_unref (OBJECT (s->sioc)); s->sioc =NULL ;object_unref (OBJECT (s->ioc));
@@ -916,6 +923,8 @@ static int tcp_chr_add_client(Chardev *chr, int fd) }tcp_chr_change_state (s,TCP_CHARDEV_STATE_CONNECTING );tcp_chr_set_client_ioc_name (chr, sioc); +yank_register_function (s->yank_name, yank_generic_iochannel, +QIO_CHANNEL (sioc)); ret =tcp_chr_new_client (chr, sioc);object_unref (OBJECT (sioc));return ret;
@@ -930,6 +939,8 @@ static void tcp_chr_accept(QIONetListener *listener,tcp_chr_change_state (s,TCP_CHARDEV_STATE_CONNECTING );tcp_chr_set_client_ioc_name (chr, cioc); +yank_register_function (s->yank_name, yank_generic_iochannel, +QIO_CHANNEL (cioc));tcp_chr_new_client (chr, cioc); }
@@ -945,6 +956,8 @@ static int tcp_chr_connect_client_sync(Chardev *chr, Error **errp)object_unref (OBJECT (sioc));return -1 ; } +yank_register_function (s->yank_name, yank_generic_iochannel, +QIO_CHANNEL (sioc));tcp_chr_new_client (chr, sioc);object_unref (OBJECT (sioc));return 0 ;
@@ -960,6 +973,8 @@ static void tcp_chr_accept_server_sync(Chardev *chr)tcp_chr_change_state (s,TCP_CHARDEV_STATE_CONNECTING ); sioc =qio_net_listener_wait_client (s->listener);tcp_chr_set_client_ioc_name (chr, sioc); +yank_register_function (s->yank_name, yank_generic_iochannel, +QIO_CHANNEL (sioc));tcp_chr_new_client (chr, sioc);object_unref (OBJECT (sioc)); }
@@ -1070,6 +1085,8 @@ static void char_socket_finalize(Object *obj)object_unref (OBJECT (s->tls_creds)); }g_free (s->tls_authz); +yank_unregister_instance (s->yank_name); +g_free (s->yank_name);qemu_chr_be_event (chr,CHR_EVENT_CLOSED ); }
@@ -1085,6 +1102,8 @@ static void qemu_chr_socket_connected(QIOTask *task, void *opaque)if (qio_task_propagate_error (task, &err)) {tcp_chr_change_state (s,TCP_CHARDEV_STATE_DISCONNECTED ); +yank_unregister_function (s->yank_name, yank_generic_iochannel, +QIO_CHANNEL (sioc));check_report_connect_error (chr, err);error_free (err); goto cleanup;
@@ -1119,6 +1138,8 @@ static void tcp_chr_connect_client_async(Chardev *chr)tcp_chr_change_state (s,TCP_CHARDEV_STATE_CONNECTING ); sioc =qio_channel_socket_new ();tcp_chr_set_client_ioc_name (chr, sioc); +yank_register_function (s->yank_name, yank_generic_iochannel, +QIO_CHANNEL (sioc));/* * Normally code would use the qio_channel_socket_connect_async * method which uses a QIOTask + qio_task_set_error internally
@@ -1360,6 +1381,9 @@ static void qmp_chardev_open_socket(Chardev *chr,qemu_chr_set_feature (chr,QEMU_CHAR_FEATURE_FD_PASS ); } + s->yank_name =g_strconcat ("chardev:" , chr->label,NULL ); +yank_register_instance (s->yank_name); +/* be isn't opened until we get a connection */ *be_opened = false;
--
2.20.1
Re: [PATCH v5 3/7] chardev/char-socket.c: Add yank feature
Quoted 6 lines · Lukas Straub
Register a yank function to shutdown the socket on yank.
Signed-off-by Lukas Straub <[email protected]>--- chardev/char-socket.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
PATCH v5 4/7 migration: Add yank feature
In reply to Lukas StraubRegister yank functions on sockets to shut them down.
--- migration/channel.c | 12 ++++++++++++ migration/migration.c | 18 +++++++++++++++++- migration/multifd.c | 10 ++++++++++ migration/qemu-file-channel.c | 6 ++++++ migration/savevm.c | 2 ++ tests/Makefile.include | 2 +- 6 files changed, 48 insertions(+), 2 deletions(-)
migration/channel.c +12 -0
@@ -18,6 +18,8 @@#include "trace.h" #include "qapi/error.h" #include "io/channel-tls.h" +#include "io/channel-socket.h" +#include "qemu/yank.h" /** * @migration_channel_process_incoming - Create new incoming migration channel
@@ -35,6 +37,11 @@ void migration_channel_process_incoming(QIOChannel *ioc)trace_migration_set_incoming_channel ( ioc,object_get_typename (OBJECT (ioc))); +if (object_dynamic_cast (OBJECT (ioc),TYPE_QIO_CHANNEL_SOCKET )) { +yank_register_function ("migration" , yank_generic_iochannel, +QIO_CHANNEL (ioc)); + } +if (s->parameters.tls_creds && *s->parameters.tls_creds && !object_dynamic_cast(OBJECT(ioc),
@@ -67,6 +74,11 @@ void migration_channel_connect(MigrationState *s, ioc, object_get_typename(OBJECT(ioc)), hostname, error); if (!error) { + if (object_dynamic_cast(OBJECT(ioc), TYPE_QIO_CHANNEL_SOCKET)) { + yank_register_function("migration", yank_generic_iochannel, + QIO_CHANNEL(ioc)); + } + if (s->parameters.tls_creds && *s->parameters.tls_creds && !object_dynamic_cast(OBJECT(ioc),
migration/migration.c +17 -1
@@ -54,6 +54,7 @@#include "net/announce.h" #include "qemu/queue.h" #include "multifd.h" +#include "qemu/yank.h" #define MAX_THROTTLE (32 << 20)/* Migration transfer speed throttling */
@@ -231,6 +232,8 @@ void migration_incoming_state_destroy(void)qapi_free_SocketAddressList (mis->socket_address_list); mis->socket_address_list =NULL ; } + +yank_unregister_instance ("migration" ); }static void migrate_generate_event (int new_state)
@@ -362,7 +365,9 @@ void qemu_start_incoming_migration(const char *uri, Error **errp)const char *p;qapi_event_send_migration (MIGRATION_STATUS_SETUP ); +yank_register_instance ("migration" );if (!strcmp (uri,"defer" )) { +yank_unregister_instance ("migration" );deferred_incoming_migration (errp); }else if (strstart (uri,"tcp:" , &p)) {tcp_start_incoming_migration (p, errp);
@@ -377,6 +382,7 @@ void qemu_start_incoming_migration(const char *uri, Error **errp) }else if (strstart (uri,"fd:" , &p)) {fd_start_incoming_migration (p, errp); }else { +yank_unregister_instance ("migration" );error_setg (errp,"unknown migration protocol: %s" , uri); } }
@@ -1646,6 +1652,7 @@ static void migrate_fd_cleanup(MigrationState *s) }notifier_list_notify (&migration_state_notifiers, s);block_cleanup_parameters (s); +yank_unregister_instance ("migration" ); }static void migrate_fd_cleanup_schedule (MigrationState *s)
@@ -1912,6 +1919,7 @@ void qmp_migrate_recover(const char *uri, Error **errp)* only re-setup the migration stream and poke existing migration * to continue using that newly established channel. */ +yank_unregister_instance ("migration" );qemu_start_incoming_migration (uri, errp); }
@@ -2048,7 +2056,9 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,/* Error detected, put into errp */ return ; } - +if (!(has_resume && resume)) { +yank_register_instance ("migration" ); + }if (strstart (uri,"tcp:" , &p)) {tcp_start_outgoing_migration (s, p, &local_err);#ifdef CONFIG_RDMA
@@ -2062,6 +2072,9 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, }else if (strstart (uri,"fd:" , &p)) {fd_start_outgoing_migration (s, p, &local_err); }else { +if (!(has_resume && resume)) { +yank_unregister_instance ("migration" ); + }error_setg (errp,QERR_INVALID_PARAMETER_VALUE ,"uri" ,"a valid migration protocol" ); migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
@@ -2071,6 +2084,9 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, }if (local_err) { +if (!(has_resume && resume)) { +yank_unregister_instance ("migration" ); + }migrate_fd_error (s, local_err);error_propagate (errp, local_err);return ;
migration/multifd.c +10 -0
@@ -24,6 +24,9 @@#include "trace.h" #include "multifd.h" +#include "qemu/yank.h" +#include "io/channel-socket.h" +/* Multiple fd's */ #define MULTIFD_MAGIC 0x11223344U
@@ -866,6 +869,13 @@ int multifd_load_cleanup(Error **errp)for (i =0 ; i <migrate_multifd_channels (); i++) {MultiFDRecvParams *p = &multifd_recv_state->params[i]; +if (object_dynamic_cast (OBJECT (p->c),TYPE_QIO_CHANNEL_SOCKET ) + &&OBJECT (p->c)->ref ==1 ) { +yank_unregister_function ("migration" , + yank_generic_iochannel, +QIO_CHANNEL (p->c)); + } +object_unref (OBJECT (p->c)); p->c =NULL ;qemu_mutex_destroy (&p->mutex);
migration/qemu-file-channel.c +6 -0
@@ -27,6 +27,7 @@#include "qemu-file.h" #include "io/channel-socket.h" #include "qemu/iov.h" +#include "qemu/yank.h" static ssize_t channel_writev_buffer(void *opaque,
@@ -104,6 +105,11 @@ static int channel_close(void *opaque, Error **errp)int ret;QIOChannel *ioc =QIO_CHANNEL (opaque); ret =qio_channel_close (ioc, errp); +if (object_dynamic_cast (OBJECT (ioc),TYPE_QIO_CHANNEL_SOCKET ) + &&OBJECT (ioc)->ref ==1 ) { +yank_unregister_function ("migration" , yank_generic_iochannel, +QIO_CHANNEL (ioc)); + }object_unref (OBJECT (ioc));return ret; }
migration/savevm.c +2 -0
@@ -63,6 +63,7 @@#include "migration/colo.h" #include "qemu/bitmap.h" #include "net/announce.h" +#include "qemu/yank.h" const unsigned int postcopy_ram_discard_version =0 ;
@@ -2897,6 +2898,7 @@ int load_snapshot(const char *name, Error **errp)qemu_system_reset (SHUTDOWN_CAUSE_NONE ); mis->from_src_file = f; +yank_register_instance ("migration" );aio_context_acquire (aio_context); ret =qemu_loadvm_state (f);migration_incoming_state_destroy ();
tests/Makefile.include +1 -1
@@ -450,7 +450,7 @@ tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ $(test-qapi-obj-y) tests/test-vmstate$(EXESUF): tests/test-vmstate.o \ migration/vmstate.o migration/vmstate-types.o migration/qemu-file.o \ - migration/qemu-file-channel.o migration/qjson.o \ + migration/qemu-file-channel.o migration/qjson.o util/yank.o \ $(test-io-obj-y) tests/test-timed-average$(EXESUF): tests/test-timed-average.o $(test-util-obj-y) tests/test-base64$(EXESUF): tests/test-base64.o $(test-util-obj-y)
--
2.20.1
Re: [PATCH v5 4/7] migration: Add yank feature
Quoted 11 lines · Lukas Straub
Register yank functions on sockets to shut them down.
Signed-off-by Lukas Straub <[email protected]>--- migration/channel.c | 12 ++++++++++++ migration/migration.c | 18 +++++++++++++++++- migration/multifd.c | 10 ++++++++++ migration/qemu-file-channel.c | 6 ++++++ migration/savevm.c | 2 ++ tests/Makefile.include | 2 +- 6 files changed, 48 insertions(+), 2 deletions(-)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
PATCH v5 5/7 io/channel-tls.c: make qio_channel_tls_shutdown thread-safe
In reply to Lukas StraubMake qio_channel_tls_shutdown thread-safe by using atomics when accessing tioc->shutdown.
--- io/channel-tls.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
io/channel-tls.c +4 -2
@@ -23,6 +23,7 @@#include "qemu/module.h" #include "io/channel-tls.h" #include "trace.h" +#include "qemu/atomic.h" static ssize_t qio_channel_tls_write_handler(const char *buf,
@@ -277,7 +278,8 @@ static ssize_t qio_channel_tls_readv(QIOChannel *ioc,return QIO_CHANNEL_ERR_BLOCK ; } }else if (errno ==ECONNABORTED && - (tioc->shutdown &QIO_CHANNEL_SHUTDOWN_READ )) { + (atomic_load_acquire (&tioc->shutdown) & +QIO_CHANNEL_SHUTDOWN_READ )) {return 0 ; }
@@ -361,7 +363,7 @@ static int qio_channel_tls_shutdown(QIOChannel *ioc, {QIOChannelTLS *tioc =QIO_CHANNEL_TLS (ioc); - tioc->shutdown |= how; +atomic_or (&tioc->shutdown, how);return qio_channel_shutdown (tioc->master, how, errp); }
--
2.20.1
Re: [PATCH v5 5/7] io/channel-tls.c: make qio_channel_tls_shutdown thread-safe
Quoted 7 lines · Lukas Straub
Make
qio_channel_tls_shutdownthread-safe by using atomics when accessingtioc->shutdown.Signed-off-by Lukas Straub <[email protected]>--- io/channel-tls.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
PATCH v5 6/7 io: Document thread-safety of qio_channel_shutdown
In reply to Lukas StraubMigration and yank code assume that qio_channel_shutdown is thread -safe. Document this after checking the code.
--- include/io/channel.h | 2 ++ 1 file changed, 2 insertions(+)
include/io/channel.h +2 -0
@@ -516,6 +516,8 @@ int qio_channel_close(QIOChannel *ioc,* QIO_CHANNEL_FEATURE_SHUTDOWN prior to calling * this method. * +* This function is thread-safe. +* * Returns: 0 on success, -1 on error */ int qio_channel_shutdown(QIOChannel *ioc,
--
2.20.1
Re: [PATCH v5 6/7] io: Document thread-safety of qio_channel_shutdown
Quoted 7 lines · Lukas Straub
Migration and yank code assume that
qio_channel_shutdownis thread -safe. Document this after checking the code.Signed-off-by Lukas Straub <[email protected]>--- include/io/channel.h | 2 ++ 1 file changed, 2 insertions(+)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
PATCH v5 7/7 MAINTAINERS: Add myself as maintainer for yank feature
In reply to Lukas StraubI'll maintain this for now as the colo usecase is the first user of this functionality.
--- MAINTAINERS | 13 +++++++++++++ 1 file changed, 13 insertions(+)
MAINTAINERS +13 -0
@@ -2506,6 +2506,19 @@ F: util/uuid.c F: include/qemu/uuid.h F: tests/test-uuid.c +Yank feature +M: Lukas Straub <[email protected]> +S: Odd fixes +F: util/yank.c +F: include/qemu/yank.h +F: chardev/char-socket.c +F: block/nbd.c +F: migration/channel.c +F: migration/migration.c +F: migration/multifd.c +F: migration/qemu-file-channel.c +F: migration/savevm.c + COLO Framework M: zhanghailiang <[email protected]> S: Maintained
--
2.20.1
Re: [PATCH v5 7/7] MAINTAINERS: Add myself as maintainer for yank feature
Quoted 13 lines · Lukas Straub
I'll maintain this for now as the colo usecase is the first user of this functionality.
Signed-off-by Lukas Straub <[email protected]>--- MAINTAINERS | 13 +++++++++++++ 1 file changed, 13 insertions(+)MAINTAINERS +0
-0
MAINTAINERS F: util/uuid.c · line 2513
Quoted 8 lines
MAINTAINERS +5
-0@@ -2506,6 +2506,19 @@ F: util/uuid.c F: include/qemu/uuid.h F: tests/test-uuid.c +Yank feature +M: Lukas Straub <[email protected]> +S: Odd fixes +F: util/yank.c +F: include/qemu/yank.h
For these 2 files,
MAINTAINERS F: util/uuid.c · line 2520
Quoted 7 lines
MAINTAINERS +7
-0+F: chardev/char-socket.c +F: block/nbd.c +F: migration/channel.c +F: migration/migration.c +F: migration/multifd.c +F: migration/qemu-file-channel.c +F: migration/savevm.c
You shouldn't be claiming maintainership of any of these files.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 63 lines · On Tue, 23 Jun 2020 16:42:30 +0200 Lukas Straub <[email protected]> wrote:
Hello Everyone,
In many cases, if qemu has a network connection (qmp, migration, chardev, etc.) to some other server and that server dies or hangs, qemu hangs too. These patches introduce the new 'yank' out-of-band qmp command to recover from these kinds of hangs. The different subsystems register callbacks which get executed with the yank command. For example the callback canshutdown()a socket. This is intended for the colo use-case, but it can be used for other things too of course.Regards,
Lukas Straubv5:
-moveyank.cto util/
-moveyank.htoinclude/qemu/
-add license toyank.h
-use const char*
-nbd: useatomic_store_releaseandatomic_load_aqcuire-io-channel: ensure thread-safety and document it -add myself as maintainer for yankv4:
-fix build errors...v3:
-don't touchsoftmmu/vl.c, use__contructor__attribute instead (Paolo Bonzini) -fix build errors
-rewrite migration patch so it actually passes all testsv2:
-don't touch io/ code anymore
-always register yank functions
-'yank' now takes a list of instances to yank -'query-yank' returns a list of yankable instancesLukas Straub (7):
Introduce yank feature
block/nbd.c: Add yank featurechardev/char-socket.c: Add yank feature
migration: Add yank feature
io/channel-tls.c: makeqio_channel_tls_shutdownthread-safe
io: Document thread-safety ofqio_channel_shutdown
MAINTAINERS: Add myself as maintainer for yank featureMAINTAINERS | 13 +++ block/nbd.c | 101 ++++++++++++------- chardev/char-socket.c | 24 +++++ include/io/channel.h | 2 + include/qemu/yank.h | 79 +++++++++++++++ io/channel-tls.c | 6 +- migration/channel.c | 12 +++ migration/migration.c | 18 +++- migration/multifd.c | 10 ++ migration/qemu-file-channel.c | 6 ++ migration/savevm.c | 2 + qapi/misc.json | 45 +++++++++ tests/Makefile.include | 2 +- util/Makefile.objs | 1 + util/yank.c | 179 ++++++++++++++++++++++++++++++++++ 15 files changed, 459 insertions(+), 41 deletions(-) create mode 100644 include/qemu/yank.h create mode 100644 util/yank.c
Quoted 2 lines
--
2.20.1
Forgot to cc Stefan Hajnoczi...
Quoted 66 lines · On Wed, 24 Jun 2020 21:47:46 +0200 Lukas Straub <[email protected]> wrote:
Quoted 63 lines · On Tue, 23 Jun 2020 16:42:30 +0200 Lukas Straub <[email protected]> wrote:
Hello Everyone,
In many cases, if qemu has a network connection (qmp, migration, chardev, etc.) to some other server and that server dies or hangs, qemu hangs too. These patches introduce the new 'yank' out-of-band qmp command to recover from these kinds of hangs. The different subsystems register callbacks which get executed with the yank command. For example the callback canshutdown()a socket. This is intended for the colo use-case, but it can be used for other things too of course.Regards,
Lukas Straubv5:
-moveyank.cto util/
-moveyank.htoinclude/qemu/
-add license toyank.h
-use const char*
-nbd: useatomic_store_releaseandatomic_load_aqcuire-io-channel: ensure thread-safety and document it -add myself as maintainer for yankv4:
-fix build errors...v3:
-don't touchsoftmmu/vl.c, use__contructor__attribute instead (Paolo Bonzini) -fix build errors
-rewrite migration patch so it actually passes all testsv2:
-don't touch io/ code anymore
-always register yank functions
-'yank' now takes a list of instances to yank -'query-yank' returns a list of yankable instancesLukas Straub (7):
Introduce yank feature
block/nbd.c: Add yank featurechardev/char-socket.c: Add yank feature
migration: Add yank feature
io/channel-tls.c: makeqio_channel_tls_shutdownthread-safe
io: Document thread-safety ofqio_channel_shutdown
MAINTAINERS: Add myself as maintainer for yank featureMAINTAINERS | 13 +++ block/nbd.c | 101 ++++++++++++------- chardev/char-socket.c | 24 +++++ include/io/channel.h | 2 + include/qemu/yank.h | 79 +++++++++++++++ io/channel-tls.c | 6 +- migration/channel.c | 12 +++ migration/migration.c | 18 +++- migration/multifd.c | 10 ++ migration/qemu-file-channel.c | 6 ++ migration/savevm.c | 2 + qapi/misc.json | 45 +++++++++ tests/Makefile.include | 2 +- util/Makefile.objs | 1 + util/yank.c | 179 ++++++++++++++++++++++++++++++++++ 15 files changed, 459 insertions(+), 41 deletions(-) create mode 100644 include/qemu/yank.h create mode 100644 util/yank.c
Quoted 4 lines
Quoted 2 lines
--
2.20.1Forgot to cc Stefan Hajnoczi...
Ping...
Quoted 7 lines · Lukas Straub
In many cases, if qemu has a network connection (qmp, migration, chardev, etc.) to some other server and that server dies or hangs, qemu hangs too. These patches introduce the new 'yank' out-of-band qmp command to recover from these kinds of hangs. The different subsystems register callbacks which get executed with the yank command. For example the callback can
shutdown()a socket. This is intended for the colo use-case, but it can be used for other things too of course.