Series comparison

-[PULL for-5.0 0/1] Block patches
+[PULL 0/2] Block patches
-The following changes since commit 29e0855c5af62bbb0b0b6fed792e004dad92ba95:
+The following changes since commit ca61fa4b803e5d0abaf6f1ceb690f23bb78a4def:
-  Merge remote-tracking branch 'remotes/elmarco/tags/slirp-pull-request' into staging (2020-03-22 21:00:38 +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:
-  https://github.com/stefanha/qemu.git tags/block-pull-request
+  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to ff807d559205a434fd37d3343f01a0ab128bd190:
+for you to fetch changes up to 1cc7eada97914f090125e588497986f6f7900514:
-  aio-posix: fix io_uring with external events (2020-03-23 11:05:44 +0000)
+  iothread: use IOThreadParamInfo in iothread_[set|get]_param() (2021-10-07 15:29:50 +0100)
 ----------------------------------------------------------------
 Pull request
 ----------------------------------------------------------------
-Stefan Hajnoczi (1):
+Stefano Garzarella (2):
-  aio-posix: fix io_uring with external events
+  iothread: rename PollParamInfo to IOThreadParamInfo
   iothread: use IOThreadParamInfo in iothread_[set|get]_param()
- util/fdmon-io_uring.c | 13 ++++++++++++-
+ iothread.c | 28 +++++++++++++++-------------
-file changed, 12 insertions(+), 1 deletion(-)
+file changed, 15 insertions(+), 13 deletions(-)
 --
-.24.1
+.31.1

-New patch
+[PULL 1/2] iothread: rename PollParamInfo to IOThreadParamInfo
+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 +++++++-------
+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;
+--
+.31.1

-[PULL for-5.0 1/1] aio-posix: fix io_uring with external events
+[PULL 2/2] iothread: use IOThreadParamInfo in iothread_[set|get]_param()
-When external event sources are disabled fdmon-io_uring falls back to
+From: Stefano Garzarella <sgarzare@redhat.com>
 fdmon-poll.  The ->need_wait() callback needs to watch for this so it
 can return true when external event sources are disabled.
-It is also necessary to call ->wait() when AioHandlers have changed
+Commit 0445409d74 ("iothread: generalize
-because io_uring is asynchronous and we must submit new sqes.
+iothread_set_param/iothread_get_param") moved common code to set and
 get IOThread parameters in two new functions.
-Both of these changes to ->need_wait() together fix tests/test-aio -p
+These functions are called inside callbacks, so we don't need to use an
-/aio/external-client, which failed with:
+opaque pointer. Let's replace `void *opaque` parameter with
 `IOThreadParamInfo *info`.
-  test-aio: tests/test-aio.c:404: test_aio_external_client: Assertion `aio_poll(ctx, false)' failed.
+Suggested-by: Kevin Wolf <kwolf@redhat.com>
+Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Reported-by: Julia Suvorova <jusual@redhat.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Message-id: 20210727145936.147032-3-sgarzare@redhat.com
 Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
 Message-id: 20200319163559.117903-1-stefanha@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- util/fdmon-io_uring.c | 13 ++++++++++++-
+ iothread.c | 18 ++++++++++--------
-file changed, 12 insertions(+), 1 deletion(-)
+file changed, 10 insertions(+), 8 deletions(-)
-diff --git a/util/fdmon-io_uring.c b/util/fdmon-io_uring.c
+diff --git a/iothread.c b/iothread.c
 index XXXXXXX..XXXXXXX 100644
---- a/util/fdmon-io_uring.c
+--- a/iothread.c
-+++ b/util/fdmon-io_uring.c
++++ b/iothread.c
-@@ -XXX,XX +XXX,XX @@ static int fdmon_io_uring_wait(AioContext *ctx, AioHandlerList *ready_list,
+@@ -XXX,XX +XXX,XX @@ static IOThreadParamInfo aio_max_batch_info = {
+ };
- static bool fdmon_io_uring_need_wait(AioContext *ctx)
  static void iothread_get_param(Object *obj, Visitor *v,
 -        const char *name, void *opaque, Error **errp)
 +        const char *name, IOThreadParamInfo *info, Error **errp)
  {
--    return io_uring_cq_ready(&ctx->fdmon_io_uring);
+     IOThread *iothread = IOTHREAD(obj);
-+    /* Have io_uring events completed? */
+-    IOThreadParamInfo *info = opaque;
-+    if (io_uring_cq_ready(&ctx->fdmon_io_uring)) {
+     int64_t *field = (void *)iothread + info->offset;
-+        return true;
-+    }
+     visit_type_int64(v, name, field, errp);
 +
 +    /* Do we need to submit new io_uring sqes? */
 +    if (!QSLIST_EMPTY_RCU(&ctx->submit_list)) {
 +        return true;
 +    }
 +
 +    /* Are we falling back to fdmon-poll? */
 +    return atomic_read(&ctx->external_disable_cnt);
  }
- static const FDMonOps fdmon_io_uring_ops = {
+ 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;
      }
 --
-.24.1
+.31.1

When external event sources are disabled fdmon-io_uring falls back to
fdmon-poll.  The ->need_wait() callback needs to watch for this so it
can return true when external event sources are disabled.

It is also necessary to call ->wait() when AioHandlers have changed
because io_uring is asynchronous and we must submit new sqes.

Both of these changes to ->need_wait() together fix tests/test-aio -p
/aio/external-client, which failed with:

test-aio: tests/test-aio.c:404: test_aio_external_client: Assertion `aio_poll(ctx, false)' failed.

Reported-by: Julia Suvorova <jusual@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Message-id: 20200319163559.117903-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 util/fdmon-io_uring.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/util/fdmon-io_uring.c b/util/fdmon-io_uring.c
index XXXXXXX..XXXXXXX 100644
--- a/util/fdmon-io_uring.c
+++ b/util/fdmon-io_uring.c
@@ -XXX,XX +XXX,XX @@ static int fdmon_io_uring_wait(AioContext *ctx, AioHandlerList *ready_list,
 
 static bool fdmon_io_uring_need_wait(AioContext *ctx)
 {
-    return io_uring_cq_ready(&ctx->fdmon_io_uring);
+    /* Have io_uring events completed? */
+    if (io_uring_cq_ready(&ctx->fdmon_io_uring)) {
+        return true;
+    }
+
+    /* Do we need to submit new io_uring sqes? */
+    if (!QSLIST_EMPTY_RCU(&ctx->submit_list)) {
+        return true;
+    }
+
+    /* Are we falling back to fdmon-poll? */
+    return atomic_read(&ctx->external_disable_cnt);
 }
 
 static const FDMonOps fdmon_io_uring_ops = {
-- 
2.24.1

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