From nobody Tue Feb 10 19:47:58 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505743299752127.39474299889082; Mon, 18 Sep 2017 07:01:39 -0700 (PDT) Received: from localhost ([::1]:36793 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtwcE-00035l-PQ for importer@patchew.org; Mon, 18 Sep 2017 10:01:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtwaR-0001iM-A1 for qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:59:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dtwaN-0001Q9-Eb for qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:59:47 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:32117 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dtwaM-0001PB-UM for qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:59:43 -0400 Received: from kvm.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v8IDxZdX022049; Mon, 18 Sep 2017 16:59:37 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Mon, 18 Sep 2017 16:59:31 +0300 Message-Id: <20170918135935.255591-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170918135935.255591-1-vsementsov@virtuozzo.com> References: <20170918135935.255591-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH v2 3/7] block/nbd-client: refactor reading reply 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, 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" Read the whole reply in one place - in nbd_read_reply_entry. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd-client.h | 1 + block/nbd-client.c | 42 ++++++++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/block/nbd-client.h b/block/nbd-client.h index b1900e6a6d..3f97d31013 100644 --- a/block/nbd-client.h +++ b/block/nbd-client.h @@ -21,6 +21,7 @@ typedef struct { Coroutine *coroutine; bool receiving; /* waiting for read_reply_co? */ NBDRequest *request; + QEMUIOVector *qiov; } NBDClientRequest; =20 typedef struct NBDClientSession { diff --git a/block/nbd-client.c b/block/nbd-client.c index 5f241ecc22..f7b642f079 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -98,6 +98,21 @@ static coroutine_fn void nbd_read_reply_entry(void *opaq= ue) break; } =20 + if (s->reply.error =3D=3D 0 && + s->requests[i].request->type =3D=3D NBD_CMD_READ) + { + QEMUIOVector *qiov =3D s->requests[i].qiov; + assert(qiov !=3D NULL); + assert(s->requests[i].request->len =3D=3D + iov_size(qiov->iov, qiov->niov)); + if (qio_channel_readv_all(s->ioc, qiov->iov, qiov->niov, + NULL) < 0) + { + s->reply.error =3D EIO; + break; + } + } + /* We're woken up again by the request itself. Note that there * is no race between yielding and reentering read_reply_co. This * is because: @@ -118,6 +133,7 @@ static coroutine_fn void nbd_read_reply_entry(void *opa= que) s->read_reply_co =3D NULL; } =20 +/* qiov should be provided for READ and WRITE */ static int nbd_co_send_request(BlockDriverState *bs, NBDRequest *request, QEMUIOVector *qiov) @@ -145,6 +161,7 @@ static int nbd_co_send_request(BlockDriverState *bs, =20 request->handle =3D INDEX_TO_HANDLE(s, i); s->requests[i].request =3D request; + s->requests[i].qiov =3D qiov; =20 if (s->quit) { rc =3D -EIO; @@ -155,7 +172,8 @@ static int nbd_co_send_request(BlockDriverState *bs, goto err; } =20 - if (qiov) { + if (s->requests[i].request->type =3D=3D NBD_CMD_WRITE) { + assert(qiov); qio_channel_set_cork(s->ioc, true); rc =3D nbd_send_request(s->ioc, request); if (rc >=3D 0 && !s->quit) { @@ -181,9 +199,7 @@ err: return rc; } =20 -static int nbd_co_receive_reply(NBDClientSession *s, - NBDRequest *request, - QEMUIOVector *qiov) +static int nbd_co_receive_reply(NBDClientSession *s, NBDRequest *request) { int ret; int i =3D HANDLE_TO_INDEX(s, request->handle); @@ -197,14 +213,6 @@ static int nbd_co_receive_reply(NBDClientSession *s, } else { assert(s->reply.handle =3D=3D request->handle); ret =3D -s->reply.error; - if (qiov && s->reply.error =3D=3D 0) { - assert(request->len =3D=3D iov_size(qiov->iov, qiov->niov)); - if (qio_channel_readv_all(s->ioc, qiov->iov, qiov->niov, - NULL) < 0) { - ret =3D -EIO; - s->quit =3D true; - } - } =20 /* Tell the read handler to read another header. */ s->reply.handle =3D 0; @@ -232,16 +240,14 @@ static int nbd_co_request(BlockDriverState *bs, NBDClientSession *client =3D nbd_get_client_session(bs); int ret; =20 - assert(!qiov || request->type =3D=3D NBD_CMD_WRITE || - request->type =3D=3D NBD_CMD_READ); - ret =3D nbd_co_send_request(bs, request, - request->type =3D=3D NBD_CMD_WRITE ? qiov : = NULL); + assert((qiov =3D=3D NULL) !=3D + (request->type =3D=3D NBD_CMD_WRITE || request->type =3D=3D NBD= _CMD_READ)); + ret =3D nbd_co_send_request(bs, request, qiov); if (ret < 0) { return ret; } =20 - return nbd_co_receive_reply(client, request, - request->type =3D=3D NBD_CMD_READ ? qiov := NULL); + return nbd_co_receive_reply(client, request); } =20 int nbd_client_co_preadv(BlockDriverState *bs, uint64_t offset, --=20 2.11.1