Series comparison

-[Qemu-devel] [PULL 0/3] Block patches
+[PULL 0/2] Block patches
-The following changes since commit fe8ee082db5038a05dbd8872e946049e9a9c550e:
+The following changes since commit ca61fa4b803e5d0abaf6f1ceb690f23bb78a4def:
-  Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-02-22' into staging (2017-02-24 15:00:51 +0000)
+  Merge remote-tracking branch 'remotes/quic/tags/pull-hex-20211006' into staging (2021-10-06 12:11:14 -0700)
-are available in the git repository at:
+are available in the Git repository at:
-  https://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
+  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 1d393bdeae22fde2cb83c1ea719675747c85c40e:
+for you to fetch changes up to 1cc7eada97914f090125e588497986f6f7900514:
-  RBD: Add support readv,writev for rbd (2017-02-24 12:43:01 -0500)
+  iothread: use IOThreadParamInfo in iothread_[set|get]_param() (2021-10-07 15:29:50 +0100)
 ----------------------------------------------------------------
-Block patches for 2.9
+Pull request
 ----------------------------------------------------------------
-Peter Lieven (2):
+Stefano Garzarella (2):
-  block/nfs: convert to preadv / pwritev
+  iothread: rename PollParamInfo to IOThreadParamInfo
-  block/nfs: try to avoid the bounce buffer in pwritev
+  iothread: use IOThreadParamInfo in iothread_[set|get]_param()
-tianqing (1):
+ iothread.c | 28 +++++++++++++++-------------
-  RBD: Add support readv,writev for rbd
+file changed, 15 insertions(+), 13 deletions(-)
  block/nfs.c | 62 +++++++++++++++++++++++++----------------------
  block/rbd.c | 80 ++++++++++++++++++++++++++++++++++++++++++-------------------
 files changed, 90 insertions(+), 52 deletions(-)
 --
-.9.3
+.31.1

-[Qemu-devel] [PULL 3/3] RBD: Add support readv,writev for rbd
+[PULL 1/2] iothread: rename PollParamInfo to IOThreadParamInfo
-From: tianqing <tianqing@unitedstack.com>
+From: Stefano Garzarella <sgarzare@redhat.com>
-Rbd can do readv and writev directly, so wo do not need to transform
+Commit 1793ad0247 ("iothread: add aio-max-batch parameter") added
-iov to buf or vice versa any more.
+a new parameter (aio-max-batch) to IOThread and used PollParamInfo
 structure to handle it.
-Signed-off-by: tianqing <tianqing@unitedstack.com>
+Since it is not a parameter of the polling mechanism, we rename the
-Reviewed-by: Jeff Cody <jcody@redhat.com>
+structure to a more generic IOThreadParamInfo.
-Signed-off-by: Jeff Cody <jcody@redhat.com>
 Suggested-by: Kevin Wolf <kwolf@redhat.com>
 Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
 Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 Message-id: 20210727145936.147032-2-sgarzare@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/rbd.c | 80 ++++++++++++++++++++++++++++++++++++++++++-------------------
+ iothread.c | 14 +++++++-------
-file changed, 56 insertions(+), 24 deletions(-)
+file changed, 7 insertions(+), 7 deletions(-)
-diff --git a/block/rbd.c b/block/rbd.c
+diff --git a/iothread.c b/iothread.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/rbd.c
+--- a/iothread.c
-+++ b/block/rbd.c
++++ b/iothread.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ static void iothread_complete(UserCreatable *obj, Error **errp)
- #define RBD_MAX_SNAP_NAME_SIZE 128
+ typedef struct {
- #define RBD_MAX_SNAPS 100
+     const char *name;
+     ptrdiff_t offset; /* field's byte offset in IOThread struct */
-+/* The LIBRBD_SUPPORTS_IOVEC is defined in librbd.h */
+-} PollParamInfo;
-+#ifdef LIBRBD_SUPPORTS_IOVEC
++} IOThreadParamInfo;
-+#define LIBRBD_USE_IOVEC 1
-+#else
+-static PollParamInfo poll_max_ns_info = {
-+#define LIBRBD_USE_IOVEC 0
++static IOThreadParamInfo poll_max_ns_info = {
-+#endif
+     "poll-max-ns", offsetof(IOThread, poll_max_ns),
-+
+ };
- typedef enum {
+-static PollParamInfo poll_grow_info = {
-     RBD_AIO_READ,
++static IOThreadParamInfo poll_grow_info = {
-     RBD_AIO_WRITE,
+     "poll-grow", offsetof(IOThread, poll_grow),
-@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_set_conf(rados_t cluster, const char *conf,
+ };
-     return ret;
+-static PollParamInfo poll_shrink_info = {
- }
++static IOThreadParamInfo poll_shrink_info = {
+     "poll-shrink", offsetof(IOThread, poll_shrink),
-+static void qemu_rbd_memset(RADOSCB *rcb, int64_t offs)
+ };
-+{
+-static PollParamInfo aio_max_batch_info = {
-+    if (LIBRBD_USE_IOVEC) {
++static IOThreadParamInfo aio_max_batch_info = {
-+        RBDAIOCB *acb = rcb->acb;
+     "aio-max-batch", offsetof(IOThread, aio_max_batch),
-+        iov_memset(acb->qiov->iov, acb->qiov->niov, offs, 0,
+ };
-+                   acb->qiov->size - offs);
-+    } else {
+@@ -XXX,XX +XXX,XX @@ static void iothread_get_param(Object *obj, Visitor *v,
-+        memset(rcb->buf + offs, 0, rcb->size - offs);
+         const char *name, void *opaque, Error **errp)
 +    }
 +}
 +
  static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
  {
-     Error *local_err = NULL;
+     IOThread *iothread = IOTHREAD(obj);
-@@ -XXX,XX +XXX,XX @@ static void qemu_rbd_complete_aio(RADOSCB *rcb)
+-    PollParamInfo *info = opaque;
-         }
++    IOThreadParamInfo *info = opaque;
-     } else {
+     int64_t *field = (void *)iothread + info->offset;
-         if (r < 0) {
--            memset(rcb->buf, 0, rcb->size);
+     visit_type_int64(v, name, field, errp);
-+            qemu_rbd_memset(rcb, 0);
+@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
-             acb->ret = r;
+         const char *name, void *opaque, Error **errp)
-             acb->error = 1;
+ {
-         } else if (r < rcb->size) {
+     IOThread *iothread = IOTHREAD(obj);
--            memset(rcb->buf + r, 0, rcb->size - r);
+-    PollParamInfo *info = opaque;
-+            qemu_rbd_memset(rcb, r);
++    IOThreadParamInfo *info = opaque;
-             if (!acb->error) {
+     int64_t *field = (void *)iothread + info->offset;
-                 acb->ret = rcb->size;
+     int64_t value;
-             }
@@ -XXX,XX +XXX,XX @@ static void qemu_rbd_complete_aio(RADOSCB *rcb)
      g_free(rcb);
 -    if (acb->cmd == RBD_AIO_READ) {
 -        qemu_iovec_from_buf(acb->qiov, 0, acb->bounce, acb->qiov->size);
 +    if (!LIBRBD_USE_IOVEC) {
 +        if (acb->cmd == RBD_AIO_READ) {
 +            qemu_iovec_from_buf(acb->qiov, 0, acb->bounce, acb->qiov->size);
 +        }
 +        qemu_vfree(acb->bounce);
      }
 -    qemu_vfree(acb->bounce);
 +
      acb->common.cb(acb->common.opaque, (acb->ret > 0 ? 0 : acb->ret));
      qemu_aio_unref(acb);
@@ -XXX,XX +XXX,XX @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
      RBDAIOCB *acb;
      RADOSCB *rcb = NULL;
      rbd_completion_t c;
 -    char *buf;
      int r;
      BDRVRBDState *s = bs->opaque;
@@ -XXX,XX +XXX,XX @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
      acb->cmd = cmd;
      acb->qiov = qiov;
      assert(!qiov || qiov->size == size);
 -    if (cmd == RBD_AIO_DISCARD || cmd == RBD_AIO_FLUSH) {
 -        acb->bounce = NULL;
 -    } else {
 -        acb->bounce = qemu_try_blockalign(bs, qiov->size);
 -        if (acb->bounce == NULL) {
 -            goto failed;
 +
 +    rcb = g_new(RADOSCB, 1);
 +
 +    if (!LIBRBD_USE_IOVEC) {
 +        if (cmd == RBD_AIO_DISCARD || cmd == RBD_AIO_FLUSH) {
 +            acb->bounce = NULL;
 +        } else {
 +            acb->bounce = qemu_try_blockalign(bs, qiov->size);
 +            if (acb->bounce == NULL) {
 +                goto failed;
 +            }
          }
 +        if (cmd == RBD_AIO_WRITE) {
 +            qemu_iovec_to_buf(acb->qiov, 0, acb->bounce, qiov->size);
 +        }
 +        rcb->buf = acb->bounce;
      }
 +
      acb->ret = 0;
      acb->error = 0;
      acb->s = s;
 -    if (cmd == RBD_AIO_WRITE) {
 -        qemu_iovec_to_buf(acb->qiov, 0, acb->bounce, qiov->size);
 -    }
 -
 -    buf = acb->bounce;
 -
 -    rcb = g_new(RADOSCB, 1);
      rcb->acb = acb;
 -    rcb->buf = buf;
      rcb->s = acb->s;
      rcb->size = size;
      r = rbd_aio_create_completion(rcb, (rbd_callback_t) rbd_finish_aiocb, &c);
@@ -XXX,XX +XXX,XX @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
      switch (cmd) {
      case RBD_AIO_WRITE:
 -        r = rbd_aio_write(s->image, off, size, buf, c);
 +#ifdef LIBRBD_SUPPORTS_IOVEC
 +            r = rbd_aio_writev(s->image, qiov->iov, qiov->niov, off, c);
 +#else
 +            r = rbd_aio_write(s->image, off, size, rcb->buf, c);
 +#endif
          break;
      case RBD_AIO_READ:
 -        r = rbd_aio_read(s->image, off, size, buf, c);
 +#ifdef LIBRBD_SUPPORTS_IOVEC
 +            r = rbd_aio_readv(s->image, qiov->iov, qiov->niov, off, c);
 +#else
 +            r = rbd_aio_read(s->image, off, size, rcb->buf, c);
 +#endif
          break;
      case RBD_AIO_DISCARD:
          r = rbd_aio_discard_wrapper(s->image, off, size, c);
@@ -XXX,XX +XXX,XX @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
      if (r < 0) {
          goto failed_completion;
      }
 -
      return &acb->common;
  failed_completion:
      rbd_aio_release(c);
  failed:
      g_free(rcb);
 -    qemu_vfree(acb->bounce);
 +    if (!LIBRBD_USE_IOVEC) {
 +        qemu_vfree(acb->bounce);
 +    }
 +
      qemu_aio_unref(acb);
      return NULL;
  }
 --
-.9.3
+.31.1

-[Qemu-devel] [PULL 1/3] block/nfs: convert to preadv / pwritev
+[PULL 2/2] iothread: use IOThreadParamInfo in iothread_[set|get]_param()
-From: Peter Lieven <pl@kamp.de>
+From: Stefano Garzarella <sgarzare@redhat.com>
-Signed-off-by: Peter Lieven <pl@kamp.de>
+Commit 0445409d74 ("iothread: generalize
-Reviewed-by: Jeff Cody <jcody@redhat.com>
+iothread_set_param/iothread_get_param") moved common code to set and
-Message-id: 1487349541-10201-2-git-send-email-pl@kamp.de
+get IOThread parameters in two new functions.
-Signed-off-by: Jeff Cody <jcody@redhat.com>
 These functions are called inside callbacks, so we don't need to use an
 opaque pointer. Let's replace `void *opaque` parameter with
 `IOThreadParamInfo *info`.
 Suggested-by: Kevin Wolf <kwolf@redhat.com>
 Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
 Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 Message-id: 20210727145936.147032-3-sgarzare@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/nfs.c | 33 +++++++++++++++------------------
+ iothread.c | 18 ++++++++++--------
-file changed, 15 insertions(+), 18 deletions(-)
+file changed, 10 insertions(+), 8 deletions(-)
-diff --git a/block/nfs.c b/block/nfs.c
+diff --git a/iothread.c b/iothread.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/nfs.c
+--- a/iothread.c
-+++ b/block/nfs.c
++++ b/iothread.c
-@@ -XXX,XX +XXX,XX @@ nfs_co_generic_cb(int ret, struct nfs_context *nfs, void *data,
+@@ -XXX,XX +XXX,XX @@ static IOThreadParamInfo aio_max_batch_info = {
-                             nfs_co_generic_bh_cb, task);
+ };
  static void iothread_get_param(Object *obj, Visitor *v,
 -        const char *name, void *opaque, Error **errp)
 +        const char *name, IOThreadParamInfo *info, Error **errp)
  {
      IOThread *iothread = IOTHREAD(obj);
 -    IOThreadParamInfo *info = opaque;
      int64_t *field = (void *)iothread + info->offset;
      visit_type_int64(v, name, field, errp);
  }
--static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
+ static bool iothread_set_param(Object *obj, Visitor *v,
--                                     int64_t sector_num, int nb_sectors,
+-        const char *name, void *opaque, Error **errp)
--                                     QEMUIOVector *iov)
++        const char *name, IOThreadParamInfo *info, Error **errp)
 +static int coroutine_fn nfs_co_preadv(BlockDriverState *bs, uint64_t offset,
 +                                      uint64_t bytes, QEMUIOVector *iov,
 +                                      int flags)
  {
-     NFSClient *client = bs->opaque;
+     IOThread *iothread = IOTHREAD(obj);
-     NFSRPC task;
+-    IOThreadParamInfo *info = opaque;
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
+     int64_t *field = (void *)iothread + info->offset;
-     task.iov = iov;
+     int64_t value;
-     if (nfs_pread_async(client->context, client->fh,
+@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
--                        sector_num * BDRV_SECTOR_SIZE,
+ static void iothread_get_poll_param(Object *obj, Visitor *v,
--                        nb_sectors * BDRV_SECTOR_SIZE,
+         const char *name, void *opaque, Error **errp)
--                        nfs_co_generic_cb, &task) != 0) {
+ {
-+                        offset, bytes, nfs_co_generic_cb, &task) != 0) {
++    IOThreadParamInfo *info = opaque;
-         return -ENOMEM;
 -    iothread_get_param(obj, v, name, opaque, errp);
 +    iothread_get_param(obj, v, name, info, errp);
  }
  static void iothread_set_poll_param(Object *obj, Visitor *v,
          const char *name, void *opaque, Error **errp)
  {
      IOThread *iothread = IOTHREAD(obj);
 +    IOThreadParamInfo *info = opaque;
 -    if (!iothread_set_param(obj, v, name, opaque, errp)) {
 +    if (!iothread_set_param(obj, v, name, info, errp)) {
          return;
      }
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
+@@ -XXX,XX +XXX,XX @@ static void iothread_set_poll_param(Object *obj, Visitor *v,
-     return 0;
+ static void iothread_get_aio_param(Object *obj, Visitor *v,
          const char *name, void *opaque, Error **errp)
  {
 +    IOThreadParamInfo *info = opaque;
 -    iothread_get_param(obj, v, name, opaque, errp);
 +    iothread_get_param(obj, v, name, info, errp);
  }
--static int coroutine_fn nfs_co_writev(BlockDriverState *bs,
+ static void iothread_set_aio_param(Object *obj, Visitor *v,
--                                        int64_t sector_num, int nb_sectors,
+         const char *name, void *opaque, Error **errp)
 -                                        QEMUIOVector *iov)
 +static int coroutine_fn nfs_co_pwritev(BlockDriverState *bs, uint64_t offset,
 +                                       uint64_t bytes, QEMUIOVector *iov,
 +                                       int flags)
  {
-     NFSClient *client = bs->opaque;
+     IOThread *iothread = IOTHREAD(obj);
-     NFSRPC task;
++    IOThreadParamInfo *info = opaque;
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nfs_co_writev(BlockDriverState *bs,
+-    if (!iothread_set_param(obj, v, name, opaque, errp)) {
-     nfs_co_init_task(bs, &task);
++    if (!iothread_set_param(obj, v, name, info, errp)) {
+         return;
 -    buf = g_try_malloc(nb_sectors * BDRV_SECTOR_SIZE);
 -    if (nb_sectors && buf == NULL) {
 +    buf = g_try_malloc(bytes);
 +    if (bytes && buf == NULL) {
          return -ENOMEM;
      }
--    qemu_iovec_to_buf(iov, 0, buf, nb_sectors * BDRV_SECTOR_SIZE);
-+    qemu_iovec_to_buf(iov, 0, buf, bytes);
-     if (nfs_pwrite_async(client->context, client->fh,
--                         sector_num * BDRV_SECTOR_SIZE,
--                         nb_sectors * BDRV_SECTOR_SIZE,
--                         buf, nfs_co_generic_cb, &task) != 0) {
-+                         offset, bytes, buf,
-+                         nfs_co_generic_cb, &task) != 0) {
-         g_free(buf);
-         return -ENOMEM;
-     }
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nfs_co_writev(BlockDriverState *bs,
-     g_free(buf);
--    if (task.ret != nb_sectors * BDRV_SECTOR_SIZE) {
-+    if (task.ret != bytes) {
-         return task.ret < 0 ? task.ret : -EIO;
-     }
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_nfs = {
-     .bdrv_create                    = nfs_file_create,
-     .bdrv_reopen_prepare            = nfs_reopen_prepare,
--    .bdrv_co_readv                  = nfs_co_readv,
--    .bdrv_co_writev                 = nfs_co_writev,
-+    .bdrv_co_preadv                 = nfs_co_preadv,
-+    .bdrv_co_pwritev                = nfs_co_pwritev,
-     .bdrv_co_flush_to_disk          = nfs_co_flush,
-     .bdrv_detach_aio_context        = nfs_detach_aio_context,
 --
-.9.3
+.31.1

-[Qemu-devel] [PULL 2/3] block/nfs: try to avoid the bounce buffer in pwritev
+Deleted patch
-From: Peter Lieven <pl@kamp.de>
-if the passed qiov contains exactly one iov we can
-pass the buffer directly.
-Signed-off-by: Peter Lieven <pl@kamp.de>
-Reviewed-by: Jeff Cody <jcody@redhat.com>
-Message-id: 1487349541-10201-3-git-send-email-pl@kamp.de
-Signed-off-by: Jeff Cody <jcody@redhat.com>
----
- block/nfs.c | 35 ++++++++++++++++++++++-------------
-file changed, 22 insertions(+), 13 deletions(-)
-diff --git a/block/nfs.c b/block/nfs.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/nfs.c
-+++ b/block/nfs.c
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nfs_co_pwritev(BlockDriverState *bs, uint64_t offset,
-     NFSClient *client = bs->opaque;
-     NFSRPC task;
-     char *buf = NULL;
-+    bool my_buffer = false;
-     nfs_co_init_task(bs, &task);
--    buf = g_try_malloc(bytes);
--    if (bytes && buf == NULL) {
--        return -ENOMEM;
-+    if (iov->niov != 1) {
-+        buf = g_try_malloc(bytes);
-+        if (bytes && buf == NULL) {
-+            return -ENOMEM;
-+        }
-+        qemu_iovec_to_buf(iov, 0, buf, bytes);
-+        my_buffer = true;
-+    } else {
-+        buf = iov->iov[0].iov_base;
-     }
--    qemu_iovec_to_buf(iov, 0, buf, bytes);
--
-     if (nfs_pwrite_async(client->context, client->fh,
-                          offset, bytes, buf,
-                          nfs_co_generic_cb, &task) != 0) {
-+        if (my_buffer) {
-+            g_free(buf);
-+        }
-+        return -ENOMEM;
-+    }
-+
-+    nfs_set_events(client);
-+    while (!task.complete) {
-+        qemu_coroutine_yield();
-+    }
-+
-+    if (my_buffer) {
-         g_free(buf);
--        return -ENOMEM;
-     }
--    nfs_set_events(client);
--    while (!task.complete) {
--        qemu_coroutine_yield();
--    }
--
--    g_free(buf);
--
-     if (task.ret != bytes) {
-         return task.ret < 0 ? task.ret : -EIO;
-     }
---
-.9.3

From: Peter Lieven <pl@kamp.de>

Signed-off-by: Peter Lieven <pl@kamp.de>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Message-id: 1487349541-10201-2-git-send-email-pl@kamp.de
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/nfs.c | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/block/nfs.c b/block/nfs.c
index XXXXXXX..XXXXXXX 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -XXX,XX +XXX,XX @@ nfs_co_generic_cb(int ret, struct nfs_context *nfs, void *data,
                             nfs_co_generic_bh_cb, task);
 }
 
-static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
-                                     int64_t sector_num, int nb_sectors,
-                                     QEMUIOVector *iov)
+static int coroutine_fn nfs_co_preadv(BlockDriverState *bs, uint64_t offset,
+                                      uint64_t bytes, QEMUIOVector *iov,
+                                      int flags)
 {
     NFSClient *client = bs->opaque;
     NFSRPC task;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
     task.iov = iov;
 
     if (nfs_pread_async(client->context, client->fh,
-                        sector_num * BDRV_SECTOR_SIZE,
-                        nb_sectors * BDRV_SECTOR_SIZE,
-                        nfs_co_generic_cb, &task) != 0) {
+                        offset, bytes, nfs_co_generic_cb, &task) != 0) {
         return -ENOMEM;
     }
 
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
     return 0;
 }
 
-static int coroutine_fn nfs_co_writev(BlockDriverState *bs,
-                                        int64_t sector_num, int nb_sectors,
-                                        QEMUIOVector *iov)
+static int coroutine_fn nfs_co_pwritev(BlockDriverState *bs, uint64_t offset,
+                                       uint64_t bytes, QEMUIOVector *iov,
+                                       int flags)
 {
     NFSClient *client = bs->opaque;
     NFSRPC task;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nfs_co_writev(BlockDriverState *bs,
 
     nfs_co_init_task(bs, &task);
 
-    buf = g_try_malloc(nb_sectors * BDRV_SECTOR_SIZE);
-    if (nb_sectors && buf == NULL) {
+    buf = g_try_malloc(bytes);
+    if (bytes && buf == NULL) {
         return -ENOMEM;
     }
 
-    qemu_iovec_to_buf(iov, 0, buf, nb_sectors * BDRV_SECTOR_SIZE);
+    qemu_iovec_to_buf(iov, 0, buf, bytes);
 
     if (nfs_pwrite_async(client->context, client->fh,
-                         sector_num * BDRV_SECTOR_SIZE,
-                         nb_sectors * BDRV_SECTOR_SIZE,
-                         buf, nfs_co_generic_cb, &task) != 0) {
+                         offset, bytes, buf,
+                         nfs_co_generic_cb, &task) != 0) {
         g_free(buf);
         return -ENOMEM;
     }
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nfs_co_writev(BlockDriverState *bs,
 
     g_free(buf);
 
-    if (task.ret != nb_sectors * BDRV_SECTOR_SIZE) {
+    if (task.ret != bytes) {
         return task.ret < 0 ? task.ret : -EIO;
     }
 
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_nfs = {
     .bdrv_create                    = nfs_file_create,
     .bdrv_reopen_prepare            = nfs_reopen_prepare,
 
-    .bdrv_co_readv                  = nfs_co_readv,
-    .bdrv_co_writev                 = nfs_co_writev,
+    .bdrv_co_preadv                 = nfs_co_preadv,
+    .bdrv_co_pwritev                = nfs_co_pwritev,
     .bdrv_co_flush_to_disk          = nfs_co_flush,
 
     .bdrv_detach_aio_context        = nfs_detach_aio_context,
-- 
2.9.3

From: Peter Lieven <pl@kamp.de>

if the passed qiov contains exactly one iov we can
pass the buffer directly.

Signed-off-by: Peter Lieven <pl@kamp.de>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Message-id: 1487349541-10201-3-git-send-email-pl@kamp.de
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/nfs.c | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/block/nfs.c b/block/nfs.c
index XXXXXXX..XXXXXXX 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nfs_co_pwritev(BlockDriverState *bs, uint64_t offset,
     NFSClient *client = bs->opaque;
     NFSRPC task;
     char *buf = NULL;
+    bool my_buffer = false;
 
     nfs_co_init_task(bs, &task);
 
-    buf = g_try_malloc(bytes);
-    if (bytes && buf == NULL) {
-        return -ENOMEM;
+    if (iov->niov != 1) {
+        buf = g_try_malloc(bytes);
+        if (bytes && buf == NULL) {
+            return -ENOMEM;
+        }
+        qemu_iovec_to_buf(iov, 0, buf, bytes);
+        my_buffer = true;
+    } else {
+        buf = iov->iov[0].iov_base;
     }
 
-    qemu_iovec_to_buf(iov, 0, buf, bytes);
-
     if (nfs_pwrite_async(client->context, client->fh,
                          offset, bytes, buf,
                          nfs_co_generic_cb, &task) != 0) {
+        if (my_buffer) {
+            g_free(buf);
+        }
+        return -ENOMEM;
+    }
+
+    nfs_set_events(client);
+    while (!task.complete) {
+        qemu_coroutine_yield();
+    }
+
+    if (my_buffer) {
         g_free(buf);
-        return -ENOMEM;
     }
 
-    nfs_set_events(client);
-    while (!task.complete) {
-        qemu_coroutine_yield();
-    }
-
-    g_free(buf);
-
     if (task.ret != bytes) {
         return task.ret < 0 ? task.ret : -EIO;
     }
-- 
2.9.3

From: tianqing <tianqing@unitedstack.com>

Rbd can do readv and writev directly, so wo do not need to transform
iov to buf or vice versa any more.

Signed-off-by: tianqing <tianqing@unitedstack.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/rbd.c | 80 ++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 56 insertions(+), 24 deletions(-)

diff --git a/block/rbd.c b/block/rbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@
 #define RBD_MAX_SNAP_NAME_SIZE 128
 #define RBD_MAX_SNAPS 100
 
+/* The LIBRBD_SUPPORTS_IOVEC is defined in librbd.h */
+#ifdef LIBRBD_SUPPORTS_IOVEC
+#define LIBRBD_USE_IOVEC 1
+#else
+#define LIBRBD_USE_IOVEC 0
+#endif
+
 typedef enum {
     RBD_AIO_READ,
     RBD_AIO_WRITE,
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_set_conf(rados_t cluster, const char *conf,
     return ret;
 }
 
+static void qemu_rbd_memset(RADOSCB *rcb, int64_t offs)
+{
+    if (LIBRBD_USE_IOVEC) {
+        RBDAIOCB *acb = rcb->acb;
+        iov_memset(acb->qiov->iov, acb->qiov->niov, offs, 0,
+                   acb->qiov->size - offs);
+    } else {
+        memset(rcb->buf + offs, 0, rcb->size - offs);
+    }
+}
+
 static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
 {
     Error *local_err = NULL;
@@ -XXX,XX +XXX,XX @@ static void qemu_rbd_complete_aio(RADOSCB *rcb)
         }
     } else {
         if (r < 0) {
-            memset(rcb->buf, 0, rcb->size);
+            qemu_rbd_memset(rcb, 0);
             acb->ret = r;
             acb->error = 1;
         } else if (r < rcb->size) {
-            memset(rcb->buf + r, 0, rcb->size - r);
+            qemu_rbd_memset(rcb, r);
             if (!acb->error) {
                 acb->ret = rcb->size;
             }
@@ -XXX,XX +XXX,XX @@ static void qemu_rbd_complete_aio(RADOSCB *rcb)
 
     g_free(rcb);
 
-    if (acb->cmd == RBD_AIO_READ) {
-        qemu_iovec_from_buf(acb->qiov, 0, acb->bounce, acb->qiov->size);
+    if (!LIBRBD_USE_IOVEC) {
+        if (acb->cmd == RBD_AIO_READ) {
+            qemu_iovec_from_buf(acb->qiov, 0, acb->bounce, acb->qiov->size);
+        }
+        qemu_vfree(acb->bounce);
     }
-    qemu_vfree(acb->bounce);
+
     acb->common.cb(acb->common.opaque, (acb->ret > 0 ? 0 : acb->ret));
 
     qemu_aio_unref(acb);
@@ -XXX,XX +XXX,XX @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
     RBDAIOCB *acb;
     RADOSCB *rcb = NULL;
     rbd_completion_t c;
-    char *buf;
     int r;
 
     BDRVRBDState *s = bs->opaque;
@@ -XXX,XX +XXX,XX @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
     acb->cmd = cmd;
     acb->qiov = qiov;
     assert(!qiov || qiov->size == size);
-    if (cmd == RBD_AIO_DISCARD || cmd == RBD_AIO_FLUSH) {
-        acb->bounce = NULL;
-    } else {
-        acb->bounce = qemu_try_blockalign(bs, qiov->size);
-        if (acb->bounce == NULL) {
-            goto failed;
+
+    rcb = g_new(RADOSCB, 1);
+
+    if (!LIBRBD_USE_IOVEC) {
+        if (cmd == RBD_AIO_DISCARD || cmd == RBD_AIO_FLUSH) {
+            acb->bounce = NULL;
+        } else {
+            acb->bounce = qemu_try_blockalign(bs, qiov->size);
+            if (acb->bounce == NULL) {
+                goto failed;
+            }
         }
+        if (cmd == RBD_AIO_WRITE) {
+            qemu_iovec_to_buf(acb->qiov, 0, acb->bounce, qiov->size);
+        }
+        rcb->buf = acb->bounce;
     }
+
     acb->ret = 0;
     acb->error = 0;
     acb->s = s;
 
-    if (cmd == RBD_AIO_WRITE) {
-        qemu_iovec_to_buf(acb->qiov, 0, acb->bounce, qiov->size);
-    }
-
-    buf = acb->bounce;
-
-    rcb = g_new(RADOSCB, 1);
     rcb->acb = acb;
-    rcb->buf = buf;
     rcb->s = acb->s;
     rcb->size = size;
     r = rbd_aio_create_completion(rcb, (rbd_callback_t) rbd_finish_aiocb, &c);
@@ -XXX,XX +XXX,XX @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
 
     switch (cmd) {
     case RBD_AIO_WRITE:
-        r = rbd_aio_write(s->image, off, size, buf, c);
+#ifdef LIBRBD_SUPPORTS_IOVEC
+            r = rbd_aio_writev(s->image, qiov->iov, qiov->niov, off, c);
+#else
+            r = rbd_aio_write(s->image, off, size, rcb->buf, c);
+#endif
         break;
     case RBD_AIO_READ:
-        r = rbd_aio_read(s->image, off, size, buf, c);
+#ifdef LIBRBD_SUPPORTS_IOVEC
+            r = rbd_aio_readv(s->image, qiov->iov, qiov->niov, off, c);
+#else
+            r = rbd_aio_read(s->image, off, size, rcb->buf, c);
+#endif
         break;
     case RBD_AIO_DISCARD:
         r = rbd_aio_discard_wrapper(s->image, off, size, c);
@@ -XXX,XX +XXX,XX @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
     if (r < 0) {
         goto failed_completion;
     }
-
     return &acb->common;
 
 failed_completion:
     rbd_aio_release(c);
 failed:
     g_free(rcb);
-    qemu_vfree(acb->bounce);
+    if (!LIBRBD_USE_IOVEC) {
+        qemu_vfree(acb->bounce);
+    }
+
     qemu_aio_unref(acb);
     return NULL;
 }
-- 
2.9.3

From: Stefano Garzarella <sgarzare@redhat.com>

Commit 1793ad0247 ("iothread: add aio-max-batch parameter") added
a new parameter (aio-max-batch) to IOThread and used PollParamInfo
structure to handle it.

Since it is not a parameter of the polling mechanism, we rename the
structure to a more generic IOThreadParamInfo.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210727145936.147032-2-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 iothread.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/iothread.c b/iothread.c
index XXXXXXX..XXXXXXX 100644
--- a/iothread.c
+++ b/iothread.c
@@ -XXX,XX +XXX,XX @@ static void iothread_complete(UserCreatable *obj, Error **errp)
 typedef struct {
     const char *name;
     ptrdiff_t offset; /* field's byte offset in IOThread struct */
-} PollParamInfo;
+} IOThreadParamInfo;
 
-static PollParamInfo poll_max_ns_info = {
+static IOThreadParamInfo poll_max_ns_info = {
     "poll-max-ns", offsetof(IOThread, poll_max_ns),
 };
-static PollParamInfo poll_grow_info = {
+static IOThreadParamInfo poll_grow_info = {
     "poll-grow", offsetof(IOThread, poll_grow),
 };
-static PollParamInfo poll_shrink_info = {
+static IOThreadParamInfo poll_shrink_info = {
     "poll-shrink", offsetof(IOThread, poll_shrink),
 };
-static PollParamInfo aio_max_batch_info = {
+static IOThreadParamInfo aio_max_batch_info = {
     "aio-max-batch", offsetof(IOThread, aio_max_batch),
 };
 
@@ -XXX,XX +XXX,XX @@ static void iothread_get_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
-    PollParamInfo *info = opaque;
+    IOThreadParamInfo *info = opaque;
     int64_t *field = (void *)iothread + info->offset;
 
     visit_type_int64(v, name, field, errp);
@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
-    PollParamInfo *info = opaque;
+    IOThreadParamInfo *info = opaque;
     int64_t *field = (void *)iothread + info->offset;
     int64_t value;
 
-- 
2.31.1

From: Stefano Garzarella <sgarzare@redhat.com>

Commit 0445409d74 ("iothread: generalize
iothread_set_param/iothread_get_param") moved common code to set and
get IOThread parameters in two new functions.

These functions are called inside callbacks, so we don't need to use an
opaque pointer. Let's replace `void *opaque` parameter with
`IOThreadParamInfo *info`.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210727145936.147032-3-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 iothread.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/iothread.c b/iothread.c
index XXXXXXX..XXXXXXX 100644
--- a/iothread.c
+++ b/iothread.c
@@ -XXX,XX +XXX,XX @@ static IOThreadParamInfo aio_max_batch_info = {
 };
 
 static void iothread_get_param(Object *obj, Visitor *v,
-        const char *name, void *opaque, Error **errp)
+        const char *name, IOThreadParamInfo *info, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
-    IOThreadParamInfo *info = opaque;
     int64_t *field = (void *)iothread + info->offset;
 
     visit_type_int64(v, name, field, errp);
 }
 
 static bool iothread_set_param(Object *obj, Visitor *v,
-        const char *name, void *opaque, Error **errp)
+        const char *name, IOThreadParamInfo *info, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
-    IOThreadParamInfo *info = opaque;
     int64_t *field = (void *)iothread + info->offset;
     int64_t value;
 
@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
 static void iothread_get_poll_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
+    IOThreadParamInfo *info = opaque;
 
-    iothread_get_param(obj, v, name, opaque, errp);
+    iothread_get_param(obj, v, name, info, errp);
 }
 
 static void iothread_set_poll_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
+    IOThreadParamInfo *info = opaque;
 
-    if (!iothread_set_param(obj, v, name, opaque, errp)) {
+    if (!iothread_set_param(obj, v, name, info, errp)) {
         return;
     }
 
@@ -XXX,XX +XXX,XX @@ static void iothread_set_poll_param(Object *obj, Visitor *v,
 static void iothread_get_aio_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
+    IOThreadParamInfo *info = opaque;
 
-    iothread_get_param(obj, v, name, opaque, errp);
+    iothread_get_param(obj, v, name, info, errp);
 }
 
 static void iothread_set_aio_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
+    IOThreadParamInfo *info = opaque;
 
-    if (!iothread_set_param(obj, v, name, opaque, errp)) {
+    if (!iothread_set_param(obj, v, name, info, errp)) {
         return;
     }
 
-- 
2.31.1