{"id":814945,"url":"http://patchwork.ozlabs.org/api/patches/814945/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918135935.255591-4-vsementsov@virtuozzo.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170918135935.255591-4-vsementsov@virtuozzo.com>","list_archive_url":null,"date":"2017-09-18T13:59:31","name":"[v2,3/7] block/nbd-client: refactor reading reply","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8ae5c1a332fc482fa7b186b118def37ef6a6b87b","submitter":{"id":66592,"url":"http://patchwork.ozlabs.org/api/people/66592/?format=json","name":"Vladimir Sementsov-Ogievskiy","email":"vsementsov@virtuozzo.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918135935.255591-4-vsementsov@virtuozzo.com/mbox/","series":[{"id":3654,"url":"http://patchwork.ozlabs.org/api/series/3654/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3654","date":"2017-09-18T13:59:31","name":"nbd client refactoring and fixing","version":2,"mbox":"http://patchwork.ozlabs.org/series/3654/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814945/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814945/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xwnhc51XQz9s7M\n\tfor ;\n\tTue, 19 Sep 2017 00:00:32 +1000 (AEST)","from localhost ([::1]:36778 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtwb8-0001lh-Kw\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 10:00:30 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:38438)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtwaR-0001iM-A1\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:59:48 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtwaN-0001Q9-Eb\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:59:47 -0400","from mailhub.sw.ru ([195.214.232.25]:32117 helo=relay.sw.ru)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dtwaM-0001PB-UM\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:59:43 -0400","from kvm.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6])\n\tby relay.sw.ru (8.13.4/8.13.4) with ESMTP id v8IDxZdX022049;\n\tMon, 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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"kwolf@redhat.com, vsementsov@virtuozzo.com, mreitz@redhat.com,\n\tden@openvz.org, pbonzini@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Read the whole reply in one place - in nbd_read_reply_entry.\n\nSigned-off-by: Vladimir Sementsov-Ogievskiy \n---\n block/nbd-client.h | 1 +\n block/nbd-client.c | 42 ++++++++++++++++++++++++------------------\n 2 files changed, 25 insertions(+), 18 deletions(-)","diff":"diff --git a/block/nbd-client.h b/block/nbd-client.h\nindex b1900e6a6d..3f97d31013 100644\n--- a/block/nbd-client.h\n+++ b/block/nbd-client.h\n@@ -21,6 +21,7 @@ typedef struct {\n Coroutine *coroutine;\n bool receiving; /* waiting for read_reply_co? */\n NBDRequest *request;\n+ QEMUIOVector *qiov;\n } NBDClientRequest;\n \n typedef struct NBDClientSession {\ndiff --git a/block/nbd-client.c b/block/nbd-client.c\nindex 5f241ecc22..f7b642f079 100644\n--- a/block/nbd-client.c\n+++ b/block/nbd-client.c\n@@ -98,6 +98,21 @@ static coroutine_fn void nbd_read_reply_entry(void *opaque)\n break;\n }\n \n+ if (s->reply.error == 0 &&\n+ s->requests[i].request->type == NBD_CMD_READ)\n+ {\n+ QEMUIOVector *qiov = s->requests[i].qiov;\n+ assert(qiov != NULL);\n+ assert(s->requests[i].request->len ==\n+ iov_size(qiov->iov, qiov->niov));\n+ if (qio_channel_readv_all(s->ioc, qiov->iov, qiov->niov,\n+ NULL) < 0)\n+ {\n+ s->reply.error = EIO;\n+ break;\n+ }\n+ }\n+\n /* We're woken up again by the request itself. Note that there\n * is no race between yielding and reentering read_reply_co. This\n * is because:\n@@ -118,6 +133,7 @@ static coroutine_fn void nbd_read_reply_entry(void *opaque)\n s->read_reply_co = NULL;\n }\n \n+/* qiov should be provided for READ and WRITE */\n static int nbd_co_send_request(BlockDriverState *bs,\n NBDRequest *request,\n QEMUIOVector *qiov)\n@@ -145,6 +161,7 @@ static int nbd_co_send_request(BlockDriverState *bs,\n \n request->handle = INDEX_TO_HANDLE(s, i);\n s->requests[i].request = request;\n+ s->requests[i].qiov = qiov;\n \n if (s->quit) {\n rc = -EIO;\n@@ -155,7 +172,8 @@ static int nbd_co_send_request(BlockDriverState *bs,\n goto err;\n }\n \n- if (qiov) {\n+ if (s->requests[i].request->type == NBD_CMD_WRITE) {\n+ assert(qiov);\n qio_channel_set_cork(s->ioc, true);\n rc = nbd_send_request(s->ioc, request);\n if (rc >= 0 && !s->quit) {\n@@ -181,9 +199,7 @@ err:\n return rc;\n }\n \n-static int nbd_co_receive_reply(NBDClientSession *s,\n- NBDRequest *request,\n- QEMUIOVector *qiov)\n+static int nbd_co_receive_reply(NBDClientSession *s, NBDRequest *request)\n {\n int ret;\n int i = HANDLE_TO_INDEX(s, request->handle);\n@@ -197,14 +213,6 @@ static int nbd_co_receive_reply(NBDClientSession *s,\n } else {\n assert(s->reply.handle == request->handle);\n ret = -s->reply.error;\n- if (qiov && s->reply.error == 0) {\n- assert(request->len == iov_size(qiov->iov, qiov->niov));\n- if (qio_channel_readv_all(s->ioc, qiov->iov, qiov->niov,\n- NULL) < 0) {\n- ret = -EIO;\n- s->quit = true;\n- }\n- }\n \n /* Tell the read handler to read another header. */\n s->reply.handle = 0;\n@@ -232,16 +240,14 @@ static int nbd_co_request(BlockDriverState *bs,\n NBDClientSession *client = nbd_get_client_session(bs);\n int ret;\n \n- assert(!qiov || request->type == NBD_CMD_WRITE ||\n- request->type == NBD_CMD_READ);\n- ret = nbd_co_send_request(bs, request,\n- request->type == NBD_CMD_WRITE ? qiov : NULL);\n+ assert((qiov == NULL) !=\n+ (request->type == NBD_CMD_WRITE || request->type == NBD_CMD_READ));\n+ ret = nbd_co_send_request(bs, request, qiov);\n if (ret < 0) {\n return ret;\n }\n \n- return nbd_co_receive_reply(client, request,\n- request->type == NBD_CMD_READ ? qiov : NULL);\n+ return nbd_co_receive_reply(client, request);\n }\n \n int nbd_client_co_preadv(BlockDriverState *bs, uint64_t offset,\n","prefixes":["v2","3/7"]}