From nobody Thu May 2 16:02:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549026436973378.5093780914725; Fri, 1 Feb 2019 05:07:16 -0800 (PST) Received: from localhost ([127.0.0.1]:53799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYXL-0002mo-Fd for importer@patchew.org; Fri, 01 Feb 2019 08:07:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYSB-0007TO-C1 for qemu-devel@nongnu.org; Fri, 01 Feb 2019 08:01:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpYS7-0002yG-18 for qemu-devel@nongnu.org; Fri, 01 Feb 2019 08:01:54 -0500 Received: from relay.sw.ru ([185.231.240.75]:47236) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpYS6-0002rv-In; Fri, 01 Feb 2019 08:01:50 -0500 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1gpYRu-0001Oh-9P; Fri, 01 Feb 2019 16:01:38 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 1 Feb 2019 16:01:33 +0300 Message-Id: <20190201130138.94525-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190201130138.94525-1-vsementsov@virtuozzo.com> References: <20190201130138.94525-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v5 1/6] block/nbd-client: split channel errors from export errors 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, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" To implement nbd reconnect in further patches, we need to distinguish error codes, returned by nbd server, from channel errors, to reconnect only in the latter case. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/nbd-client.c | 83 ++++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 36 deletions(-) diff --git a/block/nbd-client.c b/block/nbd-client.c index 813539676d..b023a35d1d 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -504,11 +504,11 @@ static coroutine_fn int nbd_co_do_receive_one_chunk( */ static coroutine_fn int nbd_co_receive_one_chunk( NBDClientSession *s, uint64_t handle, bool only_structured, - QEMUIOVector *qiov, NBDReply *reply, void **payload, Error **errp) + int *request_ret, QEMUIOVector *qiov, NBDReply *reply, void **payl= oad, + Error **errp) { - int request_ret; int ret =3D nbd_co_do_receive_one_chunk(s, handle, only_structured, - &request_ret, qiov, payload, err= p); + request_ret, qiov, payload, errp= ); =20 if (ret < 0) { s->quit =3D true; @@ -518,7 +518,6 @@ static coroutine_fn int nbd_co_receive_one_chunk( *reply =3D s->reply; } s->reply.handle =3D 0; - ret =3D request_ret; } =20 if (s->read_reply_co) { @@ -530,22 +529,17 @@ static coroutine_fn int nbd_co_receive_one_chunk( =20 typedef struct NBDReplyChunkIter { int ret; - bool fatal; + int request_ret; Error *err; bool done, only_structured; } NBDReplyChunkIter; =20 -static void nbd_iter_error(NBDReplyChunkIter *iter, bool fatal, - int ret, Error **local_err) +static void nbd_iter_channel_error(NBDReplyChunkIter *iter, + int ret, Error **local_err) { assert(ret < 0); =20 - if ((fatal && !iter->fatal) || iter->ret =3D=3D 0) { - if (iter->ret !=3D 0) { - error_free(iter->err); - iter->err =3D NULL; - } - iter->fatal =3D fatal; + if (!iter->ret) { iter->ret =3D ret; error_propagate(&iter->err, *local_err); } else { @@ -555,6 +549,15 @@ static void nbd_iter_error(NBDReplyChunkIter *iter, bo= ol fatal, *local_err =3D NULL; } =20 +static void nbd_iter_request_error(NBDReplyChunkIter *iter, int ret) +{ + assert(ret < 0); + + if (!iter->request_ret) { + iter->request_ret =3D ret; + } +} + /* NBD_FOREACH_REPLY_CHUNK */ #define NBD_FOREACH_REPLY_CHUNK(s, iter, handle, structured, \ @@ -570,13 +573,13 @@ static bool nbd_reply_chunk_iter_receive(NBDClientSes= sion *s, QEMUIOVector *qiov, NBDReply *rep= ly, void **payload) { - int ret; + int ret, request_ret; NBDReply local_reply; NBDStructuredReplyChunk *chunk; Error *local_err =3D NULL; if (s->quit) { error_setg(&local_err, "Connection closed"); - nbd_iter_error(iter, true, -EIO, &local_err); + nbd_iter_channel_error(iter, -EIO, &local_err); goto break_loop; } =20 @@ -590,10 +593,12 @@ static bool nbd_reply_chunk_iter_receive(NBDClientSes= sion *s, } =20 ret =3D nbd_co_receive_one_chunk(s, handle, iter->only_structured, - qiov, reply, payload, &local_err); + &request_ret, qiov, reply, payload, + &local_err); if (ret < 0) { - /* If it is a fatal error s->quit is set by nbd_co_receive_one_chu= nk */ - nbd_iter_error(iter, s->quit, ret, &local_err); + nbd_iter_channel_error(iter, ret, &local_err); + } else if (request_ret < 0) { + nbd_iter_request_error(iter, request_ret); } =20 /* Do not execute the body of NBD_FOREACH_REPLY_CHUNK for simple reply= . */ @@ -630,7 +635,7 @@ break_loop: } =20 static int nbd_co_receive_return_code(NBDClientSession *s, uint64_t handle, - Error **errp) + int *request_ret, Error **errp) { NBDReplyChunkIter iter; =20 @@ -639,12 +644,13 @@ static int nbd_co_receive_return_code(NBDClientSessio= n *s, uint64_t handle, } =20 error_propagate(errp, iter.err); + *request_ret =3D iter.request_ret; return iter.ret; } =20 static int nbd_co_receive_cmdread_reply(NBDClientSession *s, uint64_t hand= le, uint64_t offset, QEMUIOVector *qio= v, - Error **errp) + int *request_ret, Error **errp) { NBDReplyChunkIter iter; NBDReply reply; @@ -669,7 +675,7 @@ static int nbd_co_receive_cmdread_reply(NBDClientSessio= n *s, uint64_t handle, offset, qiov, &local_err); if (ret < 0) { s->quit =3D true; - nbd_iter_error(&iter, true, ret, &local_err); + nbd_iter_channel_error(&iter, ret, &local_err); } break; default: @@ -679,7 +685,7 @@ static int nbd_co_receive_cmdread_reply(NBDClientSessio= n *s, uint64_t handle, error_setg(&local_err, "Unexpected reply type: %d (%s) for CMD_READ", chunk->type, nbd_reply_type_lookup(chunk->type)= ); - nbd_iter_error(&iter, true, -EINVAL, &local_err); + nbd_iter_channel_error(&iter, -EINVAL, &local_err); } } =20 @@ -688,12 +694,14 @@ static int nbd_co_receive_cmdread_reply(NBDClientSess= ion *s, uint64_t handle, } =20 error_propagate(errp, iter.err); + *request_ret =3D iter.request_ret; return iter.ret; } =20 static int nbd_co_receive_blockstatus_reply(NBDClientSession *s, uint64_t handle, uint64_t leng= th, - NBDExtent *extent, Error **err= p) + NBDExtent *extent, + int *request_ret, Error **errp) { NBDReplyChunkIter iter; NBDReply reply; @@ -715,7 +723,7 @@ static int nbd_co_receive_blockstatus_reply(NBDClientSe= ssion *s, if (received) { s->quit =3D true; error_setg(&local_err, "Several BLOCK_STATUS chunks in rep= ly"); - nbd_iter_error(&iter, true, -EINVAL, &local_err); + nbd_iter_channel_error(&iter, -EINVAL, &local_err); } received =3D true; =20 @@ -724,7 +732,7 @@ static int nbd_co_receive_blockstatus_reply(NBDClientSe= ssion *s, &local_err); if (ret < 0) { s->quit =3D true; - nbd_iter_error(&iter, true, ret, &local_err); + nbd_iter_channel_error(&iter, ret, &local_err); } break; default: @@ -734,7 +742,7 @@ static int nbd_co_receive_blockstatus_reply(NBDClientSe= ssion *s, "Unexpected reply type: %d (%s) " "for CMD_BLOCK_STATUS", chunk->type, nbd_reply_type_lookup(chunk->type)= ); - nbd_iter_error(&iter, true, -EINVAL, &local_err); + nbd_iter_channel_error(&iter, -EINVAL, &local_err); } } =20 @@ -749,14 +757,16 @@ static int nbd_co_receive_blockstatus_reply(NBDClient= Session *s, iter.ret =3D -EIO; } } + error_propagate(errp, iter.err); + *request_ret =3D iter.request_ret; return iter.ret; } =20 static int nbd_co_request(BlockDriverState *bs, NBDRequest *request, QEMUIOVector *write_qiov) { - int ret; + int ret, request_ret; Error *local_err =3D NULL; NBDClientSession *client =3D nbd_get_client_session(bs); =20 @@ -772,7 +782,8 @@ static int nbd_co_request(BlockDriverState *bs, NBDRequ= est *request, return ret; } =20 - ret =3D nbd_co_receive_return_code(client, request->handle, &local_err= ); + ret =3D nbd_co_receive_return_code(client, request->handle, + &request_ret, &local_err); if (local_err) { trace_nbd_co_request_fail(request->from, request->len, request->ha= ndle, request->flags, request->type, @@ -780,13 +791,13 @@ static int nbd_co_request(BlockDriverState *bs, NBDRe= quest *request, ret, error_get_pretty(local_err)); error_free(local_err); } - return ret; + return ret ? ret : request_ret; } =20 int nbd_client_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags) { - int ret; + int ret, request_ret; Error *local_err =3D NULL; NBDClientSession *client =3D nbd_get_client_session(bs); NBDRequest request =3D { @@ -807,7 +818,7 @@ int nbd_client_co_preadv(BlockDriverState *bs, uint64_t= offset, } =20 ret =3D nbd_co_receive_cmdread_reply(client, request.handle, offset, q= iov, - &local_err); + &request_ret, &local_err); if (local_err) { trace_nbd_co_request_fail(request.from, request.len, request.handl= e, request.flags, request.type, @@ -815,7 +826,7 @@ int nbd_client_co_preadv(BlockDriverState *bs, uint64_t= offset, ret, error_get_pretty(local_err)); error_free(local_err); } - return ret; + return ret ? ret : request_ret; } =20 int nbd_client_co_pwritev(BlockDriverState *bs, uint64_t offset, @@ -909,7 +920,7 @@ int coroutine_fn nbd_client_co_block_status(BlockDriver= State *bs, int64_t *pnum, int64_t *map, BlockDriverState **file) { - int64_t ret; + int ret, request_ret; NBDExtent extent =3D { 0 }; NBDClientSession *client =3D nbd_get_client_session(bs); Error *local_err =3D NULL; @@ -934,7 +945,7 @@ int coroutine_fn nbd_client_co_block_status(BlockDriver= State *bs, } =20 ret =3D nbd_co_receive_blockstatus_reply(client, request.handle, bytes, - &extent, &local_err); + &extent, &request_ret, &local_e= rr); if (local_err) { trace_nbd_co_request_fail(request.from, request.len, request.handl= e, request.flags, request.type, @@ -942,8 +953,8 @@ int coroutine_fn nbd_client_co_block_status(BlockDriver= State *bs, ret, error_get_pretty(local_err)); error_free(local_err); } - if (ret < 0) { - return ret; + if (ret < 0 || request_ret < 0) { + return ret ? ret : request_ret; } =20 assert(extent.length); --=20 2.18.0 From nobody Thu May 2 16:02:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549026269251820.1961636651565; Fri, 1 Feb 2019 05:04:29 -0800 (PST) Received: from localhost ([127.0.0.1]:53737 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYUd-0000Gu-Pl for importer@patchew.org; Fri, 01 Feb 2019 08:04:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYSC-0007Tl-Ms for qemu-devel@nongnu.org; Fri, 01 Feb 2019 08:01:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpYS6-0002xV-FP for qemu-devel@nongnu.org; Fri, 01 Feb 2019 08:01:56 -0500 Received: from relay.sw.ru ([185.231.240.75]:47240) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpYS6-0002ru-5W; Fri, 01 Feb 2019 08:01:50 -0500 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1gpYRu-0001Oh-F4; Fri, 01 Feb 2019 16:01:38 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 1 Feb 2019 16:01:34 +0300 Message-Id: <20190201130138.94525-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190201130138.94525-1-vsementsov@virtuozzo.com> References: <20190201130138.94525-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v5 2/6] block/nbd: move connection code from block/nbd to block/nbd-client 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, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Keep all connection code in one file, to be able to implement reconnect in further patches. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- Notes: v5: rebase on master, object_unref under fail:. fix comment to "/*\n" style. block/nbd-client.h | 2 +- block/nbd-client.c | 40 ++++++++++++++++++++++++++++++++++++++-- block/nbd.c | 40 ++-------------------------------------- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/block/nbd-client.h b/block/nbd-client.h index cfc90550b9..2f047ba614 100644 --- a/block/nbd-client.h +++ b/block/nbd-client.h @@ -41,7 +41,7 @@ typedef struct NBDClientSession { NBDClientSession *nbd_get_client_session(BlockDriverState *bs); =20 int nbd_client_init(BlockDriverState *bs, - QIOChannelSocket *sock, + SocketAddress *saddr, const char *export_name, QCryptoTLSCreds *tlscreds, const char *hostname, diff --git a/block/nbd-client.c b/block/nbd-client.c index b023a35d1d..641666d3bc 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -991,8 +991,31 @@ void nbd_client_close(BlockDriverState *bs) nbd_teardown_connection(bs); } =20 +static QIOChannelSocket *nbd_establish_connection(SocketAddress *saddr, + Error **errp) +{ + QIOChannelSocket *sioc; + Error *local_err =3D NULL; + + sioc =3D qio_channel_socket_new(); + qio_channel_set_name(QIO_CHANNEL(sioc), "nbd-client"); + + qio_channel_socket_connect_sync(sioc, + saddr, + &local_err); + if (local_err) { + object_unref(OBJECT(sioc)); + error_propagate(errp, local_err); + return NULL; + } + + qio_channel_set_delay(QIO_CHANNEL(sioc), false); + + return sioc; +} + int nbd_client_init(BlockDriverState *bs, - QIOChannelSocket *sioc, + SocketAddress *saddr, const char *export, QCryptoTLSCreds *tlscreds, const char *hostname, @@ -1002,6 +1025,16 @@ int nbd_client_init(BlockDriverState *bs, NBDClientSession *client =3D nbd_get_client_session(bs); int ret; =20 + /* + * establish TCP connection, return error if it fails + * TODO: Configurable retry-until-timeout behaviour. + */ + QIOChannelSocket *sioc =3D nbd_establish_connection(saddr, errp); + + if (!sioc) { + return -ECONNREFUSED; + } + /* NBD handshake */ logout("session init %s\n", export); qio_channel_set_blocking(QIO_CHANNEL(sioc), true, NULL); @@ -1017,6 +1050,7 @@ int nbd_client_init(BlockDriverState *bs, g_free(client->info.name); if (ret < 0) { logout("Failed to negotiate with the NBD server\n"); + object_unref(OBJECT(sioc)); return ret; } if (x_dirty_bitmap && !client->info.base_allocation) { @@ -1042,7 +1076,6 @@ int nbd_client_init(BlockDriverState *bs, qemu_co_mutex_init(&client->send_mutex); qemu_co_queue_init(&client->free_sema); client->sioc =3D sioc; - object_ref(OBJECT(client->sioc)); =20 if (!client->ioc) { client->ioc =3D QIO_CHANNEL(sioc); @@ -1068,6 +1101,9 @@ int nbd_client_init(BlockDriverState *bs, NBDRequest request =3D { .type =3D NBD_CMD_DISC }; =20 nbd_send_request(client->ioc ?: QIO_CHANNEL(sioc), &request); + + object_unref(OBJECT(sioc)); + return ret; } } diff --git a/block/nbd.c b/block/nbd.c index e87699fb73..9db5eded89 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -295,30 +295,6 @@ NBDClientSession *nbd_get_client_session(BlockDriverSt= ate *bs) return &s->client; } =20 -static QIOChannelSocket *nbd_establish_connection(SocketAddress *saddr, - Error **errp) -{ - QIOChannelSocket *sioc; - Error *local_err =3D NULL; - - sioc =3D qio_channel_socket_new(); - qio_channel_set_name(QIO_CHANNEL(sioc), "nbd-client"); - - qio_channel_socket_connect_sync(sioc, - saddr, - &local_err); - if (local_err) { - object_unref(OBJECT(sioc)); - error_propagate(errp, local_err); - return NULL; - } - - qio_channel_set_delay(QIO_CHANNEL(sioc), false); - - return sioc; -} - - static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, Error **errp) { Object *obj; @@ -394,7 +370,6 @@ static int nbd_open(BlockDriverState *bs, QDict *option= s, int flags, BDRVNBDState *s =3D bs->opaque; 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; @@ -434,22 +409,11 @@ static int nbd_open(BlockDriverState *bs, QDict *opti= ons, int flags, 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; - } - /* NBD handshake */ - ret =3D nbd_client_init(bs, sioc, s->export, tlscreds, hostname, + ret =3D nbd_client_init(bs, s->saddr, s->export, tlscreds, hostname, qemu_opt_get(opts, "x-dirty-bitmap"), errp); + error: - if (sioc) { - object_unref(OBJECT(sioc)); - } if (tlscreds) { object_unref(OBJECT(tlscreds)); } --=20 2.18.0 From nobody Thu May 2 16:02:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549026262095721.3893659232049; Fri, 1 Feb 2019 05:04:22 -0800 (PST) Received: from localhost ([127.0.0.1]:53731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYUV-00007V-Da for importer@patchew.org; Fri, 01 Feb 2019 08:04:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38595) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYS9-0007TJ-ST for qemu-devel@nongnu.org; Fri, 01 Feb 2019 08:01:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpYS6-0002xq-Jq for qemu-devel@nongnu.org; Fri, 01 Feb 2019 08:01:52 -0500 Received: from relay.sw.ru ([185.231.240.75]:47226) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpYS6-0002rr-9M; Fri, 01 Feb 2019 08:01:50 -0500 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1gpYRu-0001Oh-LD; Fri, 01 Feb 2019 16:01:38 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 1 Feb 2019 16:01:35 +0300 Message-Id: <20190201130138.94525-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190201130138.94525-1-vsementsov@virtuozzo.com> References: <20190201130138.94525-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v5 3/6] block/nbd-client: split connection from initialization 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, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Split connection code to reuse it for reconnect. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/nbd-client.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/block/nbd-client.c b/block/nbd-client.c index 641666d3bc..a8ce0824c2 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -1014,13 +1014,13 @@ static QIOChannelSocket *nbd_establish_connection(S= ocketAddress *saddr, return sioc; } =20 -int nbd_client_init(BlockDriverState *bs, - SocketAddress *saddr, - const char *export, - QCryptoTLSCreds *tlscreds, - const char *hostname, - const char *x_dirty_bitmap, - Error **errp) +static int nbd_client_connect(BlockDriverState *bs, + SocketAddress *saddr, + const char *export, + QCryptoTLSCreds *tlscreds, + const char *hostname, + const char *x_dirty_bitmap, + Error **errp) { NBDClientSession *client =3D nbd_get_client_session(bs); int ret; @@ -1073,8 +1073,6 @@ int nbd_client_init(BlockDriverState *bs, bs->supported_zero_flags |=3D BDRV_REQ_MAY_UNMAP; } =20 - qemu_co_mutex_init(&client->send_mutex); - qemu_co_queue_init(&client->free_sema); client->sioc =3D sioc; =20 if (!client->ioc) { @@ -1107,3 +1105,20 @@ int nbd_client_init(BlockDriverState *bs, return ret; } } + +int nbd_client_init(BlockDriverState *bs, + SocketAddress *saddr, + const char *export, + QCryptoTLSCreds *tlscreds, + const char *hostname, + const char *x_dirty_bitmap, + Error **errp) +{ + NBDClientSession *client =3D nbd_get_client_session(bs); + + qemu_co_mutex_init(&client->send_mutex); + qemu_co_queue_init(&client->free_sema); + + return nbd_client_connect(bs, saddr, export, tlscreds, hostname, + x_dirty_bitmap, errp); +} --=20 2.18.0 From nobody Thu May 2 16:02:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549026558990813.086835785199; Fri, 1 Feb 2019 05:09:18 -0800 (PST) Received: from localhost ([127.0.0.1]:53823 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYZJ-00042M-Dc for importer@patchew.org; Fri, 01 Feb 2019 08:09:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYS9-0007TH-0j for qemu-devel@nongnu.org; Fri, 01 Feb 2019 08:01:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpYS6-0002xU-F4 for qemu-devel@nongnu.org; Fri, 01 Feb 2019 08:01:52 -0500 Received: from relay.sw.ru ([185.231.240.75]:47228) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpYS6-0002rw-5U; Fri, 01 Feb 2019 08:01:50 -0500 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1gpYRu-0001Oh-Nd; Fri, 01 Feb 2019 16:01:38 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 1 Feb 2019 16:01:36 +0300 Message-Id: <20190201130138.94525-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190201130138.94525-1-vsementsov@virtuozzo.com> References: <20190201130138.94525-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v5 4/6] block/nbd-client: fix nbd_reply_chunk_iter_receive 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, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use exported report, not the variable to be reused (should not really matter). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/nbd-client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/nbd-client.c b/block/nbd-client.c index a8ce0824c2..8e9b3dbedd 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -602,7 +602,7 @@ static bool nbd_reply_chunk_iter_receive(NBDClientSessi= on *s, } =20 /* Do not execute the body of NBD_FOREACH_REPLY_CHUNK for simple reply= . */ - if (nbd_reply_is_simple(&s->reply) || s->quit) { + if (nbd_reply_is_simple(reply) || s->quit) { goto break_loop; } =20 --=20 2.18.0 From nobody Thu May 2 16:02:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549026447660360.1638848335342; Fri, 1 Feb 2019 05:07:27 -0800 (PST) Received: from localhost ([127.0.0.1]:53801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYXW-0002qN-5v for importer@patchew.org; Fri, 01 Feb 2019 08:07:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYSH-0007Wv-0e for qemu-devel@nongnu.org; Fri, 01 Feb 2019 08:02:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpYS9-0002zT-SW for qemu-devel@nongnu.org; Fri, 01 Feb 2019 08:02:00 -0500 Received: from relay.sw.ru ([185.231.240.75]:47242) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpYS6-0002rs-Ud; Fri, 01 Feb 2019 08:01:52 -0500 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1gpYRu-0001Oh-Qc; Fri, 01 Feb 2019 16:01:38 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 1 Feb 2019 16:01:37 +0300 Message-Id: <20190201130138.94525-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190201130138.94525-1-vsementsov@virtuozzo.com> References: <20190201130138.94525-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v5 5/6] block/nbd-client: don't check ioc 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, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We have several paranoid checks for ioc !=3D NULL. But ioc may become NULL only on close, which should not happen during requests handling. Also, we check ioc only sometimes, not after each yield, which is inconsistent. Let's drop these checks. However, for safety, let's leave asserts instead. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- Notes: v5: fix commit message a bit [Eric] block/nbd-client.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/block/nbd-client.c b/block/nbd-client.c index 8e9b3dbedd..d8bf1bbb8b 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -53,9 +53,7 @@ static void nbd_teardown_connection(BlockDriverState *bs) { NBDClientSession *client =3D nbd_get_client_session(bs); =20 - if (!client->ioc) { /* Already closed */ - return; - } + assert(client->ioc); =20 /* finish any pending coroutines */ qio_channel_shutdown(client->ioc, @@ -153,10 +151,7 @@ static int nbd_co_send_request(BlockDriverState *bs, rc =3D -EIO; goto err; } - if (!s->ioc) { - rc =3D -EPIPE; - goto err; - } + assert(s->ioc); =20 if (qiov) { qio_channel_set_cork(s->ioc, true); @@ -429,10 +424,11 @@ static coroutine_fn int nbd_co_do_receive_one_chunk( s->requests[i].receiving =3D true; qemu_coroutine_yield(); s->requests[i].receiving =3D false; - if (!s->ioc || s->quit) { + if (s->quit) { error_setg(errp, "Connection closed"); return -EIO; } + assert(s->ioc); =20 assert(s->reply.handle =3D=3D handle); =20 @@ -982,9 +978,7 @@ void nbd_client_close(BlockDriverState *bs) NBDClientSession *client =3D nbd_get_client_session(bs); NBDRequest request =3D { .type =3D NBD_CMD_DISC }; =20 - if (client->ioc =3D=3D NULL) { - return; - } + assert(client->ioc); =20 nbd_send_request(client->ioc, &request); =20 --=20 2.18.0 From nobody Thu May 2 16:02:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549026698357727.478825476855; Fri, 1 Feb 2019 05:11:38 -0800 (PST) Received: from localhost ([127.0.0.1]:53883 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYat-0005Bh-2m for importer@patchew.org; Fri, 01 Feb 2019 08:10:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYSC-0007Ti-Lu for qemu-devel@nongnu.org; Fri, 01 Feb 2019 08:02:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpYSA-0002zo-LH for qemu-devel@nongnu.org; Fri, 01 Feb 2019 08:01:56 -0500 Received: from relay.sw.ru ([185.231.240.75]:47220) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpYS6-0002rq-Ux; Fri, 01 Feb 2019 08:01:52 -0500 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1gpYRu-0001Oh-U4; Fri, 01 Feb 2019 16:01:38 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 1 Feb 2019 16:01:38 +0300 Message-Id: <20190201130138.94525-7-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190201130138.94525-1-vsementsov@virtuozzo.com> References: <20190201130138.94525-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v5 6/6] block/nbd-client: rename read_reply_co to connection_co 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, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This coroutine will serve nbd reconnects, so, rename it to be something more generic. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/nbd-client.h | 4 ++-- block/nbd-client.c | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/block/nbd-client.h b/block/nbd-client.h index 2f047ba614..d990207a5c 100644 --- a/block/nbd-client.h +++ b/block/nbd-client.h @@ -20,7 +20,7 @@ typedef struct { Coroutine *coroutine; uint64_t offset; /* original offset of the request */ - bool receiving; /* waiting for read_reply_co? */ + bool receiving; /* waiting for connection_co? */ } NBDClientRequest; =20 typedef struct NBDClientSession { @@ -30,7 +30,7 @@ typedef struct NBDClientSession { =20 CoMutex send_mutex; CoQueue free_sema; - Coroutine *read_reply_co; + Coroutine *connection_co; int in_flight; =20 NBDClientRequest requests[MAX_NBD_REQUESTS]; diff --git a/block/nbd-client.c b/block/nbd-client.c index d8bf1bbb8b..d9e33751ad 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -59,7 +59,7 @@ static void nbd_teardown_connection(BlockDriverState *bs) qio_channel_shutdown(client->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL); - BDRV_POLL_WHILE(bs, client->read_reply_co); + BDRV_POLL_WHILE(bs, client->connection_co); =20 nbd_client_detach_aio_context(bs); object_unref(OBJECT(client->sioc)); @@ -68,7 +68,7 @@ static void nbd_teardown_connection(BlockDriverState *bs) client->ioc =3D NULL; } =20 -static coroutine_fn void nbd_read_reply_entry(void *opaque) +static coroutine_fn void nbd_connection_entry(void *opaque) { NBDClientSession *s =3D opaque; uint64_t i; @@ -100,14 +100,14 @@ static coroutine_fn void nbd_read_reply_entry(void *o= paque) } =20 /* We're woken up again by the request itself. Note that there - * is no race between yielding and reentering read_reply_co. This + * is no race between yielding and reentering connection_co. This * is because: * * - if the request runs on the same AioContext, it is only * entered after we yield * * - if the request runs on a different AioContext, reentering - * read_reply_co happens through a bottom half, which can only + * connection_co happens through a bottom half, which can only * run after we yield. */ aio_co_wake(s->requests[i].coroutine); @@ -116,7 +116,7 @@ static coroutine_fn void nbd_read_reply_entry(void *opa= que) =20 s->quit =3D true; nbd_recv_coroutines_wake_all(s); - s->read_reply_co =3D NULL; + s->connection_co =3D NULL; } =20 static int nbd_co_send_request(BlockDriverState *bs, @@ -420,7 +420,7 @@ static coroutine_fn int nbd_co_do_receive_one_chunk( } *request_ret =3D 0; =20 - /* Wait until we're woken up by nbd_read_reply_entry. */ + /* Wait until we're woken up by nbd_connection_entry. */ s->requests[i].receiving =3D true; qemu_coroutine_yield(); s->requests[i].receiving =3D false; @@ -495,7 +495,7 @@ static coroutine_fn int nbd_co_do_receive_one_chunk( } =20 /* nbd_co_receive_one_chunk - * Read reply, wake up read_reply_co and set s->quit if needed. + * Read reply, wake up connection_co and set s->quit if needed. * Return value is a fatal error code or normal nbd reply error code */ static coroutine_fn int nbd_co_receive_one_chunk( @@ -509,15 +509,15 @@ static coroutine_fn int nbd_co_receive_one_chunk( if (ret < 0) { s->quit =3D true; } else { - /* For assert at loop start in nbd_read_reply_entry */ + /* For assert at loop start in nbd_connection_entry */ if (reply) { *reply =3D s->reply; } s->reply.handle =3D 0; } =20 - if (s->read_reply_co) { - aio_co_wake(s->read_reply_co); + if (s->connection_co) { + aio_co_wake(s->connection_co); } =20 return ret; @@ -970,7 +970,7 @@ void nbd_client_attach_aio_context(BlockDriverState *bs, { NBDClientSession *client =3D nbd_get_client_session(bs); qio_channel_attach_aio_context(QIO_CHANNEL(client->ioc), new_context); - aio_co_schedule(new_context, client->read_reply_co); + aio_co_schedule(new_context, client->connection_co); } =20 void nbd_client_close(BlockDriverState *bs) @@ -1077,7 +1077,7 @@ static int nbd_client_connect(BlockDriverState *bs, /* Now that we're connected, set the socket to be non-blocking and * kick the reply mechanism. */ qio_channel_set_blocking(QIO_CHANNEL(sioc), false, NULL); - client->read_reply_co =3D qemu_coroutine_create(nbd_read_reply_entry, = client); + client->connection_co =3D qemu_coroutine_create(nbd_connection_entry, = client); nbd_client_attach_aio_context(bs, bdrv_get_aio_context(bs)); =20 logout("Established connection with NBD server\n"); --=20 2.18.0