From nobody Wed Oct 29 17:12:36 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