qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: dgilbert@redhat.com, lvivier@redhat.com, peterx@redhat.com
Subject: [Qemu-devel] [PATCH v7 08/22] qio: Create new qio_channel_{readv, writev}_all
Date: Wed,  6 Sep 2017 13:51:29 +0200	[thread overview]
Message-ID: <20170906115143.27451-9-quintela@redhat.com> (raw)
In-Reply-To: <20170906115143.27451-1-quintela@redhat.com>

The functions waits until it is able to write the full iov.

Signed-off-by: Juan Quintela <quintela@redhat.com>

--

Add tests.

fix reader to check for len == 0.

make reader wait on G_IO_IN (dave)
change tests to make sure that all combinations of call work with all backends
---
 include/io/channel.h          | 44 +++++++++++++++++++++++++
 io/channel.c                  | 77 +++++++++++++++++++++++++++++++++++++++++++
 migration/qemu-file-channel.c | 29 +---------------
 tests/io-channel-helpers.c    | 36 +++++++++++++++-----
 4 files changed, 149 insertions(+), 37 deletions(-)

diff --git a/include/io/channel.h b/include/io/channel.h
index 54f3dc252f..8e8e2faf1a 100644
--- a/include/io/channel.h
+++ b/include/io/channel.h
@@ -269,6 +269,50 @@ 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
+ */
+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 1cfb8b33a2..702e712798 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_IN);
+            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 e202d73834..457ea6c831 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 05e5579cf8..ea7b32b4e5 100644
--- a/tests/io-channel-helpers.c
+++ b/tests/io-channel-helpers.c
@@ -83,11 +83,21 @@ static gpointer test_io_thread_writer(gpointer opaque)
     qio_channel_set_blocking(data->src, data->blocking, NULL);
 
     while (niov) {
+        int use_all;
         ssize_t ret;
-        ret = qio_channel_writev(data->src,
-                                 iov,
-                                 niov,
-                                 &data->writeerr);
+        use_all = g_test_rand_int_range(0, 2);
+
+        if (use_all) {
+            ret = qio_channel_writev_all(data->src,
+                                         iov,
+                                         niov,
+                                         &data->writeerr);
+        } else {
+            ret = qio_channel_writev(data->src,
+                                     iov,
+                                     niov,
+                                     &data->writeerr);
+        }
         if (ret == QIO_CHANNEL_ERR_BLOCK) {
             if (data->blocking) {
                 error_setg(&data->writeerr,
@@ -124,13 +134,21 @@ static gpointer test_io_thread_reader(gpointer opaque)
     qio_channel_set_blocking(data->dst, data->blocking, NULL);
 
     while (niov) {
+        int use_all;
         ssize_t ret;
+        use_all = g_test_rand_int_range(0, 2);
 
-        ret = qio_channel_readv(data->dst,
-                                iov,
-                                niov,
-                                &data->readerr);
-
+        if (use_all) {
+            ret = qio_channel_readv_all(data->dst,
+                                        iov,
+                                        niov,
+                                        &data->readerr);
+        } else {
+            ret = qio_channel_readv(data->dst,
+                                    iov,
+                                    niov,
+                                    &data->readerr);
+        }
         if (ret == QIO_CHANNEL_ERR_BLOCK) {
             if (data->blocking) {
                 error_setg(&data->readerr,
-- 
2.13.5

  parent reply	other threads:[~2017-09-06 11:52 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-06 11:51 [Qemu-devel] [PATCH v7 00/22] Multifd Juan Quintela
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 01/22] Revert "io: add new qio_channel_{readv, writev, read, write}_all functions" Juan Quintela
2017-09-06 14:00   ` Eric Blake
2017-09-06 14:42     ` Juan Quintela
2017-09-06 16:09       ` Eric Blake
2017-09-06 16:32       ` Daniel P. Berrange
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 02/22] migration: Create migration_ioc_process_incoming() Juan Quintela
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 03/22] migration: Teach it about G_SOURCE_REMOVE Juan Quintela
2017-09-08 17:18   ` Dr. David Alan Gilbert
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 04/22] migration: Add comments to channel functions Juan Quintela
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 05/22] migration: Create migration_has_all_channels Juan Quintela
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 06/22] migration: Improve migration thread error handling Juan Quintela
2017-09-06 19:04   ` Dr. David Alan Gilbert
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 07/22] migration: Make migrate_fd_error() the owner of the Error Juan Quintela
2017-09-06 16:15   ` Eric Blake
2017-09-07 11:53     ` Juan Quintela
2017-09-11 18:58     ` Dr. David Alan Gilbert
2017-09-06 11:51 ` Juan Quintela [this message]
2017-09-06 14:03   ` [Qemu-devel] [PATCH v7 08/22] qio: Create new qio_channel_{readv, writev}_all Eric Blake
2017-09-06 14:11     ` Daniel P. Berrange
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 09/22] migration: Add multifd capability Juan Quintela
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 10/22] migration: Create x-multifd-threads parameter Juan Quintela
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 11/22] migration: Create x-multifd-group parameter Juan Quintela
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 12/22] migration: Create multifd migration threads Juan Quintela
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 13/22] migration: Split migration_fd_process_incoming Juan Quintela
2017-09-08 17:22   ` Dr. David Alan Gilbert
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 14/22] migration: Start of multiple fd work Juan Quintela
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 15/22] migration: Create ram_multifd_page Juan Quintela
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 16/22] migration: Really use multiple pages at a time Juan Quintela
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 17/22] migration: Send the fd number which we are going to use for this page Juan Quintela
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 18/22] migration: Create thread infrastructure for multifd recv side Juan Quintela
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 19/22] migration: Test new fd infrastructure Juan Quintela
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 20/22] migration: Rename initial_bytes Juan Quintela
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 21/22] migration: Transfer pages over new channels Juan Quintela
2017-09-06 11:51 ` [Qemu-devel] [PATCH v7 22/22] migration: Flush receive queue Juan Quintela

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170906115143.27451-9-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).