{"id":810542,"url":"http://patchwork.ozlabs.org/api/patches/810542/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906115143.27451-9-quintela@redhat.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":"<20170906115143.27451-9-quintela@redhat.com>","list_archive_url":null,"date":"2017-09-06T11:51:29","name":"[v7,08/22] qio: Create new qio_channel_{readv, writev}_all","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"399a2a579738824d5c0c1cf881baf745a4e7e01c","submitter":{"id":2643,"url":"http://patchwork.ozlabs.org/api/people/2643/?format=json","name":"Juan Quintela","email":"quintela@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906115143.27451-9-quintela@redhat.com/mbox/","series":[{"id":1773,"url":"http://patchwork.ozlabs.org/api/series/1773/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1773","date":"2017-09-06T11:51:21","name":"Multifd","version":7,"mbox":"http://patchwork.ozlabs.org/series/1773/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810542/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810542/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=)","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=quintela@redhat.com"],"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 3xnMbB4SQBz9s81\n\tfor ;\n\tWed, 6 Sep 2017 22:00:06 +1000 (AEST)","from localhost ([::1]:35603 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpZ00-0005OS-Nf\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 08:00:04 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60232)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpYsP-0007RZ-JT\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:15 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpYsM-00080x-Vy\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:13 -0400","from mx1.redhat.com ([209.132.183.28]:56624)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpYsM-0007zu-Mo\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:10 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id AB2AC4E334\n\tfor ; Wed, 6 Sep 2017 11:52:09 +0000 (UTC)","from secure.mitica (ovpn-117-188.ams2.redhat.com [10.36.117.188])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 597DA19E35;\n\tWed, 6 Sep 2017 11:52:08 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com AB2AC4E334","From":"Juan Quintela ","To":"qemu-devel@nongnu.org","Date":"Wed, 6 Sep 2017 13:51:29 +0200","Message-Id":"<20170906115143.27451-9-quintela@redhat.com>","In-Reply-To":"<20170906115143.27451-1-quintela@redhat.com>","References":"<20170906115143.27451-1-quintela@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tWed, 06 Sep 2017 11:52:09 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v7 08/22] qio: Create new qio_channel_{readv,\n\twritev}_all","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":"lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"The functions waits until it is able to write the full iov.\n\nSigned-off-by: Juan Quintela \n\n--\n\nAdd tests.\n\nfix reader to check for len == 0.\n\nmake reader wait on G_IO_IN (dave)\nchange tests to make sure that all combinations of call work with all backends\n---\n include/io/channel.h | 44 +++++++++++++++++++++++++\n io/channel.c | 77 +++++++++++++++++++++++++++++++++++++++++++\n migration/qemu-file-channel.c | 29 +---------------\n tests/io-channel-helpers.c | 36 +++++++++++++++-----\n 4 files changed, 149 insertions(+), 37 deletions(-)","diff":"diff --git a/include/io/channel.h b/include/io/channel.h\nindex 54f3dc252f..8e8e2faf1a 100644\n--- a/include/io/channel.h\n+++ b/include/io/channel.h\n@@ -269,6 +269,50 @@ ssize_t qio_channel_writev_full(QIOChannel *ioc,\n Error **errp);\n \n /**\n+ * qio_channel_readv_all:\n+ * @ioc: the channel object\n+ * @iov: the array of memory regions to read data into\n+ * @niov: the length of the @iov array\n+ * @errp: pointer to a NULL-initialized error object\n+ *\n+ * Read data from the IO channel, storing it in the\n+ * memory regions referenced by @iov. Each element\n+ * in the @iov will be fully populated with data\n+ * before the next one is used. The @niov parameter\n+ * specifies the total number of elements in @iov.\n+ *\n+ * Returns: the number of bytes read, or -1 on error\n+ */\n+ssize_t qio_channel_readv_all(QIOChannel *ioc,\n+ const struct iovec *iov,\n+ size_t niov,\n+ Error **errp);\n+\n+\n+/**\n+ * qio_channel_writev_all:\n+ * @ioc: the channel object\n+ * @iov: the array of memory regions to write data from\n+ * @niov: the length of the @iov array\n+ * @errp: pointer to a NULL-initialized error object\n+ *\n+ * Write data to the IO channel, reading it from the\n+ * memory regions referenced by @iov. Each element\n+ * in the @iov will be fully sent, before the next\n+ * one is used. The @niov parameter specifies the\n+ * total number of elements in @iov.\n+ *\n+ * It is required for all @iov data to be fully\n+ * sent.\n+ *\n+ * Returns: the number of bytes sent, or -1 on error,\n+ */\n+ssize_t qio_channel_writev_all(QIOChannel *ioc,\n+ const struct iovec *iov,\n+ size_t niov,\n+ Error **erp);\n+\n+/**\n * qio_channel_readv:\n * @ioc: the channel object\n * @iov: the array of memory regions to read data into\ndiff --git a/io/channel.c b/io/channel.c\nindex 1cfb8b33a2..702e712798 100644\n--- a/io/channel.c\n+++ b/io/channel.c\n@@ -22,6 +22,7 @@\n #include \"io/channel.h\"\n #include \"qapi/error.h\"\n #include \"qemu/main-loop.h\"\n+#include \"qemu/iov.h\"\n \n bool qio_channel_has_feature(QIOChannel *ioc,\n QIOChannelFeature feature)\n@@ -85,6 +86,82 @@ ssize_t qio_channel_writev_full(QIOChannel *ioc,\n }\n \n \n+\n+ssize_t qio_channel_readv_all(QIOChannel *ioc,\n+ const struct iovec *iov,\n+ size_t niov,\n+ Error **errp)\n+{\n+ ssize_t done = 0;\n+ struct iovec *local_iov = g_new(struct iovec, niov);\n+ struct iovec *local_iov_head = local_iov;\n+ unsigned int nlocal_iov = niov;\n+\n+ nlocal_iov = iov_copy(local_iov, nlocal_iov,\n+ iov, niov,\n+ 0, iov_size(iov, niov));\n+\n+ while (nlocal_iov > 0) {\n+ ssize_t len;\n+ len = qio_channel_readv(ioc, local_iov, nlocal_iov, errp);\n+ if (len == QIO_CHANNEL_ERR_BLOCK) {\n+ qio_channel_wait(ioc, G_IO_IN);\n+ continue;\n+ } else if (len < 0) {\n+ error_setg_errno(errp, EIO,\n+ \"Channel was not able to read full iov\");\n+ done = -1;\n+ goto cleanup;\n+ } else if (len == 0) {\n+ goto cleanup;\n+ }\n+\n+ iov_discard_front(&local_iov, &nlocal_iov, len);\n+ done += len;\n+ }\n+\n+ cleanup:\n+ g_free(local_iov_head);\n+ return done;\n+}\n+\n+ssize_t qio_channel_writev_all(QIOChannel *ioc,\n+ const struct iovec *iov,\n+ size_t niov,\n+ Error **errp)\n+{\n+ ssize_t done = 0;\n+ struct iovec *local_iov = g_new(struct iovec, niov);\n+ struct iovec *local_iov_head = local_iov;\n+ unsigned int nlocal_iov = niov;\n+\n+ nlocal_iov = iov_copy(local_iov, nlocal_iov,\n+ iov, niov,\n+ 0, iov_size(iov, niov));\n+\n+ while (nlocal_iov > 0) {\n+ ssize_t len;\n+ len = qio_channel_writev(ioc, local_iov, nlocal_iov, errp);\n+ if (len == QIO_CHANNEL_ERR_BLOCK) {\n+ qio_channel_wait(ioc, G_IO_OUT);\n+ continue;\n+ }\n+ if (len < 0) {\n+ error_setg_errno(errp, EIO,\n+ \"Channel was not able to write full iov\");\n+ done = -1;\n+ goto cleanup;\n+ }\n+\n+ iov_discard_front(&local_iov, &nlocal_iov, len);\n+ done += len;\n+ }\n+\n+ cleanup:\n+ g_free(local_iov_head);\n+ return done;\n+}\n+\n ssize_t qio_channel_readv(QIOChannel *ioc,\n const struct iovec *iov,\n size_t niov,\ndiff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c\nindex e202d73834..457ea6c831 100644\n--- a/migration/qemu-file-channel.c\n+++ b/migration/qemu-file-channel.c\n@@ -36,35 +36,8 @@ static ssize_t channel_writev_buffer(void *opaque,\n int64_t pos)\n {\n QIOChannel *ioc = QIO_CHANNEL(opaque);\n- ssize_t done = 0;\n- struct iovec *local_iov = g_new(struct iovec, iovcnt);\n- struct iovec *local_iov_head = local_iov;\n- unsigned int nlocal_iov = iovcnt;\n \n- nlocal_iov = iov_copy(local_iov, nlocal_iov,\n- iov, iovcnt,\n- 0, iov_size(iov, iovcnt));\n-\n- while (nlocal_iov > 0) {\n- ssize_t len;\n- len = qio_channel_writev(ioc, local_iov, nlocal_iov, NULL);\n- if (len == QIO_CHANNEL_ERR_BLOCK) {\n- qio_channel_wait(ioc, G_IO_OUT);\n- continue;\n- }\n- if (len < 0) {\n- /* XXX handle Error objects */\n- done = -EIO;\n- goto cleanup;\n- }\n-\n- iov_discard_front(&local_iov, &nlocal_iov, len);\n- done += len;\n- }\n-\n- cleanup:\n- g_free(local_iov_head);\n- return done;\n+ return qio_channel_writev_all(ioc, iov, iovcnt, NULL);\n }\n \n \ndiff --git a/tests/io-channel-helpers.c b/tests/io-channel-helpers.c\nindex 05e5579cf8..ea7b32b4e5 100644\n--- a/tests/io-channel-helpers.c\n+++ b/tests/io-channel-helpers.c\n@@ -83,11 +83,21 @@ static gpointer test_io_thread_writer(gpointer opaque)\n qio_channel_set_blocking(data->src, data->blocking, NULL);\n \n while (niov) {\n+ int use_all;\n ssize_t ret;\n- ret = qio_channel_writev(data->src,\n- iov,\n- niov,\n- &data->writeerr);\n+ use_all = g_test_rand_int_range(0, 2);\n+\n+ if (use_all) {\n+ ret = qio_channel_writev_all(data->src,\n+ iov,\n+ niov,\n+ &data->writeerr);\n+ } else {\n+ ret = qio_channel_writev(data->src,\n+ iov,\n+ niov,\n+ &data->writeerr);\n+ }\n if (ret == QIO_CHANNEL_ERR_BLOCK) {\n if (data->blocking) {\n error_setg(&data->writeerr,\n@@ -124,13 +134,21 @@ static gpointer test_io_thread_reader(gpointer opaque)\n qio_channel_set_blocking(data->dst, data->blocking, NULL);\n \n while (niov) {\n+ int use_all;\n ssize_t ret;\n+ use_all = g_test_rand_int_range(0, 2);\n \n- ret = qio_channel_readv(data->dst,\n- iov,\n- niov,\n- &data->readerr);\n-\n+ if (use_all) {\n+ ret = qio_channel_readv_all(data->dst,\n+ iov,\n+ niov,\n+ &data->readerr);\n+ } else {\n+ ret = qio_channel_readv(data->dst,\n+ iov,\n+ niov,\n+ &data->readerr);\n+ }\n if (ret == QIO_CHANNEL_ERR_BLOCK) {\n if (data->blocking) {\n error_setg(&data->readerr,\n","prefixes":["v7","08/22"]}