From nobody Wed Oct 29 06:43:59 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152457540141571.21523581597683; Tue, 24 Apr 2018 06:10:01 -0700 (PDT) Received: from localhost ([::1]:58423 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAxhi-0008TM-03 for importer@patchew.org; Tue, 24 Apr 2018 09:09:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAxgL-0007gl-6Z for qemu-devel@nongnu.org; Tue, 24 Apr 2018 09:08:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAxgG-0005U0-5g for qemu-devel@nongnu.org; Tue, 24 Apr 2018 09:08:29 -0400 Received: from relay.sw.ru ([185.231.240.75]:45490) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fAxgF-0005Na-TL; Tue, 24 Apr 2018 09:08:24 -0400 Received: from msk-vpn.virtuozzo.com ([195.214.232.6] helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1fAxgD-0007sT-KX; Tue, 24 Apr 2018 16:08:21 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 24 Apr 2018 16:08:19 +0300 Message-Id: <20180424130821.50987-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20180424130821.50987-1-vsementsov@virtuozzo.com> References: <20180424130821.50987-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [RFC 1/3] block: add bdrv_reconnect X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, famz@redhat.com, armbru@redhat.com, mreitz@redhat.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It will be used to reconnect NBD connection. Signed-off-by: Vladimir Sementsov-Ogievskiy --- include/block/block.h | 2 ++ include/block/block_int.h | 3 +++ block.c | 22 ++++++++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/include/block/block.h b/include/block/block.h index cdec3639a3..912e3f3dcc 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -604,4 +604,6 @@ bool bdrv_can_store_new_dirty_bitmap(BlockDriverState *= bs, const char *name, */ void bdrv_register_buf(BlockDriverState *bs, void *host, size_t size); void bdrv_unregister_buf(BlockDriverState *bs, void *host); + +int bdrv_reconnect(BlockDriverState *bs, Error **errp); #endif diff --git a/include/block/block_int.h b/include/block/block_int.h index c4dd1d4bb8..ab9018f1c4 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -475,6 +475,9 @@ struct BlockDriver { */ void (*bdrv_register_buf)(BlockDriverState *bs, void *host, size_t siz= e); void (*bdrv_unregister_buf)(BlockDriverState *bs, void *host); + + int (*bdrv_reconnect)(BlockDriverState *bs, Error **errp); + QLIST_ENTRY(BlockDriver) list; }; =20 diff --git a/block.c b/block.c index a2caadf0a0..fab4413d59 100644 --- a/block.c +++ b/block.c @@ -4095,6 +4095,28 @@ int bdrv_has_zero_init(BlockDriverState *bs) return 0; } =20 +int bdrv_reconnect(BlockDriverState *bs, Error **errp) +{ + int ret; + + if (bs->drv && bs->drv->bdrv_reconnect) { + return bs->drv->bdrv_reconnect(bs, errp); + } + + if (bs->backing) { + ret =3D bdrv_reconnect(bs->backing->bs, errp); + if (ret < 0) { + return ret; + } + } + + if (bs->file) { + return bdrv_reconnect(bs->file->bs, errp); + } + + return 0; +} + bool bdrv_unallocated_blocks_are_zero(BlockDriverState *bs) { BlockDriverInfo bdi; --=20 2.11.1 From nobody Wed Oct 29 06:43:59 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1524575395167464.21077191934046; Tue, 24 Apr 2018 06:09:55 -0700 (PDT) Received: from localhost ([::1]:58422 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAxhg-0008Rg-Oc for importer@patchew.org; Tue, 24 Apr 2018 09:09:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAxgL-0007gn-72 for qemu-devel@nongnu.org; Tue, 24 Apr 2018 09:08:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAxgG-0005Tb-1n for qemu-devel@nongnu.org; Tue, 24 Apr 2018 09:08:29 -0400 Received: from relay.sw.ru ([185.231.240.75]:45494) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fAxgF-0005P3-QU; Tue, 24 Apr 2018 09:08:23 -0400 Received: from msk-vpn.virtuozzo.com ([195.214.232.6] helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1fAxgD-0007sT-Pg; Tue, 24 Apr 2018 16:08:21 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 24 Apr 2018 16:08:20 +0300 Message-Id: <20180424130821.50987-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20180424130821.50987-1-vsementsov@virtuozzo.com> References: <20180424130821.50987-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [RFC 2/3] nbd: add .bdrv_reconnect handler X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, famz@redhat.com, armbru@redhat.com, mreitz@redhat.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add handler, which reconnects to NBD server. For it: - separate connection code to nbd_reconnect() - store tlscreds and hostname in BDRVNBDState Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd.c | 60 ++++++++++++++++++++++++++++++++++++++++++++-------------= --- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 1e2b3ba2d3..371341dbcf 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -48,6 +48,10 @@ typedef struct BDRVNBDState { /* For nbd_refresh_filename() */ SocketAddress *saddr; char *export, *tlscredsid; + + /* For nbd_reconnect() */ + QCryptoTLSCreds *tlscreds; + const char *hostname; } BDRVNBDState; =20 static int nbd_parse_uri(const char *filename, QDict *options) @@ -392,6 +396,33 @@ static QemuOptsList nbd_runtime_opts =3D { }, }; =20 +static int nbd_reconnect(BlockDriverState *bs, Error **errp) +{ + int ret; + BDRVNBDState *s =3D bs->opaque; + QIOChannelSocket *sioc; + + /* close current connection if any */ + nbd_client_close(bs); + + memset(&s->client, 0, sizeof(s->client)); + s->client.quit =3D true; + + sioc =3D nbd_establish_connection(s->saddr, errp); + if (!sioc) { + return -ECONNREFUSED; + } + + ret =3D nbd_client_init(bs, sioc, s->export, s->tlscreds, s->hostname,= errp); + object_unref(OBJECT(sioc)); + if (ret < 0) { + return ret; + } + + s->client.quit =3D false; + return ret; +} + static int nbd_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { @@ -399,8 +430,6 @@ static int nbd_open(BlockDriverState *bs, QDict *option= s, int flags, QemuOpts *opts =3D NULL; Error *local_err =3D NULL; QIOChannelSocket *sioc =3D NULL; - QCryptoTLSCreds *tlscreds =3D NULL; - const char *hostname =3D NULL; int ret =3D -EINVAL; =20 opts =3D qemu_opts_create(&nbd_runtime_opts, NULL, 0, &error_abort); @@ -425,8 +454,8 @@ static int nbd_open(BlockDriverState *bs, QDict *option= s, int flags, =20 s->tlscredsid =3D g_strdup(qemu_opt_get(opts, "tls-creds")); if (s->tlscredsid) { - tlscreds =3D nbd_get_tls_creds(s->tlscredsid, errp); - if (!tlscreds) { + s->tlscreds =3D nbd_get_tls_creds(s->tlscredsid, errp); + if (!s->tlscreds) { goto error; } =20 @@ -435,29 +464,22 @@ static int nbd_open(BlockDriverState *bs, QDict *opti= ons, int flags, error_setg(errp, "TLS only supported over IP sockets"); goto error; } - hostname =3D s->saddr->u.inet.host; + s->hostname =3D s->saddr->u.inet.host; } =20 /* establish TCP connection, return error if it fails * TODO: Configurable retry-until-timeout behaviour. */ - sioc =3D nbd_establish_connection(s->saddr, errp); - if (!sioc) { - ret =3D -ECONNREFUSED; - goto error; - } + ret =3D nbd_reconnect(bs, errp); =20 - /* NBD handshake */ - ret =3D nbd_client_init(bs, sioc, s->export, - tlscreds, hostname, errp); error: if (sioc) { object_unref(OBJECT(sioc)); } - if (tlscreds) { - object_unref(OBJECT(tlscreds)); - } if (ret < 0) { + if (s->tlscreds) { + object_unref(OBJECT(s->tlscreds)); + } qapi_free_SocketAddress(s->saddr); g_free(s->export); g_free(s->tlscredsid); @@ -494,6 +516,9 @@ static void nbd_close(BlockDriverState *bs) =20 nbd_client_close(bs); =20 + if (s->tlscreds) { + object_unref(OBJECT(s->tlscreds)); + } qapi_free_SocketAddress(s->saddr); g_free(s->export); g_free(s->tlscredsid); @@ -574,6 +599,7 @@ static BlockDriver bdrv_nbd =3D { .instance_size =3D sizeof(BDRVNBDState), .bdrv_parse_filename =3D nbd_parse_filename, .bdrv_file_open =3D nbd_open, + .bdrv_reconnect =3D nbd_reconnect, .bdrv_co_preadv =3D nbd_client_co_preadv, .bdrv_co_pwritev =3D nbd_client_co_pwritev, .bdrv_co_pwrite_zeroes =3D nbd_client_co_pwrite_zeroes, @@ -594,6 +620,7 @@ static BlockDriver bdrv_nbd_tcp =3D { .instance_size =3D sizeof(BDRVNBDState), .bdrv_parse_filename =3D nbd_parse_filename, .bdrv_file_open =3D nbd_open, + .bdrv_reconnect =3D nbd_reconnect, .bdrv_co_preadv =3D nbd_client_co_preadv, .bdrv_co_pwritev =3D nbd_client_co_pwritev, .bdrv_co_pwrite_zeroes =3D nbd_client_co_pwrite_zeroes, @@ -614,6 +641,7 @@ static BlockDriver bdrv_nbd_unix =3D { .instance_size =3D sizeof(BDRVNBDState), .bdrv_parse_filename =3D nbd_parse_filename, .bdrv_file_open =3D nbd_open, + .bdrv_reconnect =3D nbd_reconnect, .bdrv_co_preadv =3D nbd_client_co_preadv, .bdrv_co_pwritev =3D nbd_client_co_pwritev, .bdrv_co_pwrite_zeroes =3D nbd_client_co_pwrite_zeroes, --=20 2.11.1 From nobody Wed Oct 29 06:43:59 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1524575517356169.78810376425804; Tue, 24 Apr 2018 06:11:57 -0700 (PDT) Received: from localhost ([::1]:58444 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAxjc-0001RX-9U for importer@patchew.org; Tue, 24 Apr 2018 09:11:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35573) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAxgL-0007gm-6n for qemu-devel@nongnu.org; Tue, 24 Apr 2018 09:08:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAxgG-0005V0-Gy for qemu-devel@nongnu.org; Tue, 24 Apr 2018 09:08:29 -0400 Received: from relay.sw.ru ([185.231.240.75]:45498) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fAxgG-0005PC-8h; Tue, 24 Apr 2018 09:08:24 -0400 Received: from msk-vpn.virtuozzo.com ([195.214.232.6] helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1fAxgE-0007sT-5G; Tue, 24 Apr 2018 16:08:22 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 24 Apr 2018 16:08:21 +0300 Message-Id: <20180424130821.50987-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20180424130821.50987-1-vsementsov@virtuozzo.com> References: <20180424130821.50987-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [RFC 3/3] blk: add 'reconnect' error action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, famz@redhat.com, armbru@redhat.com, mreitz@redhat.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" New action works as follows: Firstly, not stopping the vm, it tries to bdrv_reconnect several times with given pause. Then, if we failed to reconnect fallthrough to 'stop' error action. TODO: - qapi docs - support other disks (only scsi here) - support block jobs - add configuration of timeout and tries count parameters Signed-off-by: Vladimir Sementsov-Ogievskiy --- qapi/block-core.json | 4 ++-- block/block-backend.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- hw/scsi/scsi-disk.c | 4 +++- 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index c50517bff3..d4d87dbd4f 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1028,7 +1028,7 @@ # Since: 1.3 ## { 'enum': 'BlockdevOnError', - 'data': ['report', 'ignore', 'enospc', 'stop', 'auto'] } + 'data': ['report', 'ignore', 'enospc', 'stop', 'auto', 'reconnect'] } =20 ## # @MirrorSyncMode: @@ -4351,7 +4351,7 @@ # Since: 2.1 ## { 'enum': 'BlockErrorAction', - 'data': [ 'ignore', 'report', 'stop' ] } + 'data': [ 'ignore', 'report', 'stop', 'reconnect' ] } =20 =20 ## diff --git a/block/block-backend.c b/block/block-backend.c index 681b240b12..81eb9a7bd0 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -89,6 +89,11 @@ struct BlockBackend { */ unsigned int in_flight; AioWait wait; + + bool reconnect_failed; /* TODO: worth tri-state variable? */ + bool reconnecting; + unsigned int reconnect_max; + uint64_t reconnect_ns; }; =20 typedef struct BlockBackendAIOCB { @@ -322,6 +327,8 @@ BlockBackend *blk_new(uint64_t perm, uint64_t shared_pe= rm) blk->refcnt =3D 1; blk->perm =3D perm; blk->shared_perm =3D shared_perm; + blk->reconnect_max =3D 10; /* TODO configure */ + blk->reconnect_ns =3D 5000000000; /* 5 seconds, TODO configure */ blk_set_enable_write_cache(blk, true); =20 block_acct_init(&blk->stats); @@ -1079,6 +1086,7 @@ void blk_iostatus_disable(BlockBackend *blk) =20 void blk_iostatus_reset(BlockBackend *blk) { + blk->reconnect_failed =3D false; if (blk_iostatus_is_enabled(blk)) { BlockDriverState *bs =3D blk_bs(blk); blk->iostatus =3D BLOCK_DEVICE_IO_STATUS_OK; @@ -1635,6 +1643,9 @@ BlockErrorAction blk_get_error_action(BlockBackend *b= lk, bool is_read, BlockdevOnError on_err =3D blk_get_on_error(blk, is_read); =20 switch (on_err) { + case BLOCKDEV_ON_ERROR_RECONNECT: + return blk->reconnect_failed ? BLOCK_ERROR_ACTION_STOP : + BLOCK_ERROR_ACTION_RECONNECT; case BLOCKDEV_ON_ERROR_ENOSPC: return (error =3D=3D ENOSPC) ? BLOCK_ERROR_ACTION_STOP : BLOCK_ERROR_ACTION_REPORT; @@ -1665,6 +1676,29 @@ static void send_qmp_error_event(BlockBackend *blk, &error_abort); } =20 + +static void coroutine_fn blk_reconnect_co(void *opaque) +{ + BlockBackend *blk =3D opaque; + int i; + + for (i =3D 0; i < blk->reconnect_max; i++) { + int ret; + + qemu_co_sleep_ns(QEMU_CLOCK_REALTIME, blk->reconnect_ns); + + ret =3D bdrv_reconnect(blk_bs(blk), NULL); + if (ret =3D=3D 0) { + blk->reconnecting =3D false; + blk_iostatus_reset(blk); + return; + } + } + + blk->reconnecting =3D false; + blk->reconnect_failed =3D true; +} + /* This is done by device models because, while the block layer knows * about the error, it does not know whether an operation comes from * the device or the block layer (from a job, for example). @@ -1674,7 +1708,19 @@ void blk_error_action(BlockBackend *blk, BlockErrorA= ction action, { assert(error >=3D 0); =20 - if (action =3D=3D BLOCK_ERROR_ACTION_STOP) { + if (action =3D=3D BLOCK_ERROR_ACTION_RECONNECT) { + Coroutine *co; + blk_iostatus_set_err(blk, error); + + if (blk->reconnecting || blk->reconnect_failed) { + return; + } + + blk->reconnecting =3D true; + + co =3D qemu_coroutine_create(blk_reconnect_co, blk); + aio_co_enter(blk_get_aio_context(blk), co); + } else if (action =3D=3D BLOCK_ERROR_ACTION_STOP) { /* First set the iostatus, so that "info block" returns an iostatus * that matches the events raised so far (an additional error iost= atus * is fine, but not a lost one). diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index ded23d36ca..f1c166dfda 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -474,7 +474,9 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int er= ror, bool acct_failed) } =20 blk_error_action(s->qdev.conf.blk, action, is_read, error); - if (action =3D=3D BLOCK_ERROR_ACTION_STOP) { + if (action =3D=3D BLOCK_ERROR_ACTION_STOP || + action =3D=3D BLOCK_ERROR_ACTION_RECONNECT) + { scsi_req_retry(&r->req); } return action !=3D BLOCK_ERROR_ACTION_IGNORE; --=20 2.11.1