From patchwork Tue Aug 8 16:26:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 799348 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xRgLp5LByz9s5L for ; Wed, 9 Aug 2017 02:48:02 +1000 (AEST) Received: from localhost ([::1]:43664 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1df7fk-0006Vf-Ku for incoming@patchwork.ozlabs.org; Tue, 08 Aug 2017 12:48:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59925) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1df7Lj-00029Y-4z for qemu-devel@nongnu.org; Tue, 08 Aug 2017 12:27:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1df7Ld-0007li-9P for qemu-devel@nongnu.org; Tue, 08 Aug 2017 12:27:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42218) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1df7Ld-0007l3-0Y for qemu-devel@nongnu.org; Tue, 08 Aug 2017 12:27:13 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 00536285C8 for ; Tue, 8 Aug 2017 16:27:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 00536285C8 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=quintela@redhat.com Received: from secure.mitica (ovpn-117-165.ams2.redhat.com [10.36.117.165]) by smtp.corp.redhat.com (Postfix) with ESMTP id 032C0912AE; Tue, 8 Aug 2017 16:27:02 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 8 Aug 2017 18:26:15 +0200 Message-Id: <20170808162629.32493-6-quintela@redhat.com> In-Reply-To: <20170808162629.32493-1-quintela@redhat.com> References: <20170808162629.32493-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 (mx1.redhat.com [10.5.110.30]); Tue, 08 Aug 2017 16:27:12 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 05/19] qio: Create new qio_channel_{readv, writev}_all 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: lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The functions waits until it is able to write the full iov. Signed-off-by: Juan Quintela --- Add tests. fix reader to check for len == 0. --- include/io/channel.h | 46 +++++++++++++++++++++++++ io/channel.c | 77 ++++++++++++++++++++++++++++++++++++++++++ migration/qemu-file-channel.c | 29 +--------------- tests/io-channel-helpers.c | 55 ++++++++++++++++++++++++++++++ tests/io-channel-helpers.h | 4 +++ tests/test-io-channel-buffer.c | 55 ++++++++++++++++++++++++++++-- 6 files changed, 235 insertions(+), 31 deletions(-) diff --git a/include/io/channel.h b/include/io/channel.h index db9bb02..bfc97e2 100644 --- a/include/io/channel.h +++ b/include/io/channel.h @@ -269,6 +269,52 @@ ssize_t qio_channel_writev_full(QIOChannel *ioc, Error **errp); /** + * qio_channel_readv_all: + * @ioc: the channel object + * @iov: the array of memory regions to read data into + * @niov: the length of the @iov array + * @errp: pointer to a NULL-initialized error object + * + * Read data from the IO channel, storing it in the + * memory regions referenced by @iov. Each element + * in the @iov will be fully populated with data + * before the next one is used. The @niov parameter + * specifies the total number of elements in @iov. + * + * Returns: the number of bytes read, or -1 on error, + * or QIO_CHANNEL_ERR_BLOCK if no data is available + * and the channel is non-blocking + */ +ssize_t qio_channel_readv_all(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + Error **errp); + + +/** + * qio_channel_writev_all: + * @ioc: the channel object + * @iov: the array of memory regions to write data from + * @niov: the length of the @iov array + * @errp: pointer to a NULL-initialized error object + * + * Write data to the IO channel, reading it from the + * memory regions referenced by @iov. Each element + * in the @iov will be fully sent, before the next + * one is used. The @niov parameter specifies the + * total number of elements in @iov. + * + * It is required for all @iov data to be fully + * sent. + * + * Returns: the number of bytes sent, or -1 on error, + */ +ssize_t qio_channel_writev_all(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + Error **erp); + +/** * qio_channel_readv: * @ioc: the channel object * @iov: the array of memory regions to read data into diff --git a/io/channel.c b/io/channel.c index 1cfb8b3..0b521f9 100644 --- a/io/channel.c +++ b/io/channel.c @@ -22,6 +22,7 @@ #include "io/channel.h" #include "qapi/error.h" #include "qemu/main-loop.h" +#include "qemu/iov.h" bool qio_channel_has_feature(QIOChannel *ioc, QIOChannelFeature feature) @@ -85,6 +86,82 @@ ssize_t qio_channel_writev_full(QIOChannel *ioc, } + +ssize_t qio_channel_readv_all(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + Error **errp) +{ + ssize_t done = 0; + struct iovec *local_iov = g_new(struct iovec, niov); + struct iovec *local_iov_head = local_iov; + unsigned int nlocal_iov = niov; + + nlocal_iov = iov_copy(local_iov, nlocal_iov, + iov, niov, + 0, iov_size(iov, niov)); + + while (nlocal_iov > 0) { + ssize_t len; + len = qio_channel_readv(ioc, local_iov, nlocal_iov, errp); + if (len == QIO_CHANNEL_ERR_BLOCK) { + qio_channel_wait(ioc, G_IO_OUT); + continue; + } else if (len < 0) { + error_setg_errno(errp, EIO, + "Channel was not able to read full iov"); + done = -1; + goto cleanup; + } else if (len == 0) { + goto cleanup; + } + + iov_discard_front(&local_iov, &nlocal_iov, len); + done += len; + } + + cleanup: + g_free(local_iov_head); + return done; +} + +ssize_t qio_channel_writev_all(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + Error **errp) +{ + ssize_t done = 0; + struct iovec *local_iov = g_new(struct iovec, niov); + struct iovec *local_iov_head = local_iov; + unsigned int nlocal_iov = niov; + + nlocal_iov = iov_copy(local_iov, nlocal_iov, + iov, niov, + 0, iov_size(iov, niov)); + + while (nlocal_iov > 0) { + ssize_t len; + len = qio_channel_writev(ioc, local_iov, nlocal_iov, errp); + if (len == QIO_CHANNEL_ERR_BLOCK) { + qio_channel_wait(ioc, G_IO_OUT); + continue; + } + if (len < 0) { + error_setg_errno(errp, EIO, + "Channel was not able to write full iov"); + done = -1; + goto cleanup; + } + + iov_discard_front(&local_iov, &nlocal_iov, len); + done += len; + } + + cleanup: + g_free(local_iov_head); + return done; +} + ssize_t qio_channel_readv(QIOChannel *ioc, const struct iovec *iov, size_t niov, diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c index e202d73..457ea6c 100644 --- a/migration/qemu-file-channel.c +++ b/migration/qemu-file-channel.c @@ -36,35 +36,8 @@ static ssize_t channel_writev_buffer(void *opaque, int64_t pos) { QIOChannel *ioc = QIO_CHANNEL(opaque); - ssize_t done = 0; - struct iovec *local_iov = g_new(struct iovec, iovcnt); - struct iovec *local_iov_head = local_iov; - unsigned int nlocal_iov = iovcnt; - nlocal_iov = iov_copy(local_iov, nlocal_iov, - iov, iovcnt, - 0, iov_size(iov, iovcnt)); - - while (nlocal_iov > 0) { - ssize_t len; - len = qio_channel_writev(ioc, local_iov, nlocal_iov, NULL); - if (len == QIO_CHANNEL_ERR_BLOCK) { - qio_channel_wait(ioc, G_IO_OUT); - continue; - } - if (len < 0) { - /* XXX handle Error objects */ - done = -EIO; - goto cleanup; - } - - iov_discard_front(&local_iov, &nlocal_iov, len); - done += len; - } - - cleanup: - g_free(local_iov_head); - return done; + return qio_channel_writev_all(ioc, iov, iovcnt, NULL); } diff --git a/tests/io-channel-helpers.c b/tests/io-channel-helpers.c index 05e5579..3d76d95 100644 --- a/tests/io-channel-helpers.c +++ b/tests/io-channel-helpers.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "io-channel-helpers.h" #include "qapi/error.h" +#include "qemu/iov.h" struct QIOChannelTest { QIOChannel *src; @@ -153,6 +154,45 @@ static gpointer test_io_thread_reader(gpointer opaque) return NULL; } +static gpointer test_io_thread_writer_all(gpointer opaque) +{ + QIOChannelTest *data = opaque; + size_t niov = data->niov; + ssize_t ret; + + qio_channel_set_blocking(data->src, data->blocking, NULL); + + ret = qio_channel_writev_all(data->src, + data->inputv, + niov, + &data->writeerr); + if (ret != iov_size(data->inputv, data->niov)) { + error_setg(&data->writeerr, "Unexpected I/O error"); + } + + return NULL; +} + +/* This thread receives all data using iovecs */ +static gpointer test_io_thread_reader_all(gpointer opaque) +{ + QIOChannelTest *data = opaque; + size_t niov = data->niov; + ssize_t ret; + + qio_channel_set_blocking(data->dst, data->blocking, NULL); + + ret = qio_channel_readv_all(data->dst, + data->outputv, + niov, + &data->readerr); + + if (ret != iov_size(data->inputv, data->niov)) { + error_setg(&data->readerr, "Unexpected I/O error"); + } + + return NULL; +} QIOChannelTest *qio_channel_test_new(void) { @@ -231,6 +271,21 @@ void qio_channel_test_run_reader(QIOChannelTest *test, test->dst = NULL; } +void qio_channel_test_run_writer_all(QIOChannelTest *test, + QIOChannel *src) +{ + test->src = src; + test_io_thread_writer_all(test); + test->src = NULL; +} + +void qio_channel_test_run_reader_all(QIOChannelTest *test, + QIOChannel *dst) +{ + test->dst = dst; + test_io_thread_reader_all(test); + test->dst = NULL; +} void qio_channel_test_validate(QIOChannelTest *test) { diff --git a/tests/io-channel-helpers.h b/tests/io-channel-helpers.h index fedc64f..17b9647 100644 --- a/tests/io-channel-helpers.h +++ b/tests/io-channel-helpers.h @@ -36,6 +36,10 @@ void qio_channel_test_run_writer(QIOChannelTest *test, QIOChannel *src); void qio_channel_test_run_reader(QIOChannelTest *test, QIOChannel *dst); +void qio_channel_test_run_writer_all(QIOChannelTest *test, + QIOChannel *src); +void qio_channel_test_run_reader_all(QIOChannelTest *test, + QIOChannel *dst); void qio_channel_test_validate(QIOChannelTest *test); diff --git a/tests/test-io-channel-buffer.c b/tests/test-io-channel-buffer.c index 64722a2..4bf64ae 100644 --- a/tests/test-io-channel-buffer.c +++ b/tests/test-io-channel-buffer.c @@ -22,8 +22,7 @@ #include "io/channel-buffer.h" #include "io-channel-helpers.h" - -static void test_io_channel_buf(void) +static void test_io_channel_buf1(void) { QIOChannelBuffer *buf; QIOChannelTest *test; @@ -39,6 +38,53 @@ static void test_io_channel_buf(void) object_unref(OBJECT(buf)); } +static void test_io_channel_buf2(void) +{ + QIOChannelBuffer *buf; + QIOChannelTest *test; + + buf = qio_channel_buffer_new(0); + + test = qio_channel_test_new(); + qio_channel_test_run_writer_all(test, QIO_CHANNEL(buf)); + buf->offset = 0; + qio_channel_test_run_reader(test, QIO_CHANNEL(buf)); + qio_channel_test_validate(test); + + object_unref(OBJECT(buf)); +} + +static void test_io_channel_buf3(void) +{ + QIOChannelBuffer *buf; + QIOChannelTest *test; + + buf = qio_channel_buffer_new(0); + + test = qio_channel_test_new(); + qio_channel_test_run_writer(test, QIO_CHANNEL(buf)); + buf->offset = 0; + qio_channel_test_run_reader_all(test, QIO_CHANNEL(buf)); + qio_channel_test_validate(test); + + object_unref(OBJECT(buf)); +} + +static void test_io_channel_buf4(void) +{ + QIOChannelBuffer *buf; + QIOChannelTest *test; + + buf = qio_channel_buffer_new(0); + + test = qio_channel_test_new(); + qio_channel_test_run_writer_all(test, QIO_CHANNEL(buf)); + buf->offset = 0; + qio_channel_test_run_reader_all(test, QIO_CHANNEL(buf)); + qio_channel_test_validate(test); + + object_unref(OBJECT(buf)); +} int main(int argc, char **argv) { @@ -46,6 +92,9 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); - g_test_add_func("/io/channel/buf", test_io_channel_buf); + g_test_add_func("/io/channel/buf1", test_io_channel_buf1); + g_test_add_func("/io/channel/buf2", test_io_channel_buf2); + g_test_add_func("/io/channel/buf3", test_io_channel_buf3); + g_test_add_func("/io/channel/buf4", test_io_channel_buf4); return g_test_run(); }