Series comparison

-[Qemu-devel] [PULL 0/1] Block patches
+[PULL for-5.0 0/1] Block patches
-The following changes since commit 063833a6ec2a6747e27c5f9866bb44c7e8de1265:
+The following changes since commit 29e0855c5af62bbb0b0b6fed792e004dad92ba95:
-  Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging (2017-10-19 18:42:51 +0100)
+  Merge remote-tracking branch 'remotes/elmarco/tags/slirp-pull-request' into staging (2020-03-22 21:00:38 +0000)
-are available in the git repository at:
+are available in the Git repository at:
-  git://github.com/stefanha/qemu.git tags/block-pull-request
+  https://github.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to e947d47da0b16e80d237c510e9d2e80799578c7f:
+for you to fetch changes up to ff807d559205a434fd37d3343f01a0ab128bd190:
-  oslib-posix: Fix compiler warning and some data types (2017-10-20 11:16:27 +0200)
+  aio-posix: fix io_uring with external events (2020-03-23 11:05:44 +0000)
 ----------------------------------------------------------------
 Pull request
 ----------------------------------------------------------------
-----------------------------------------------------------------
+Stefan Hajnoczi (1):
   aio-posix: fix io_uring with external events
-Stefan Weil (1):
+ util/fdmon-io_uring.c | 13 ++++++++++++-
-  oslib-posix: Fix compiler warning and some data types
+file changed, 12 insertions(+), 1 deletion(-)
  util/oslib-posix.c | 15 ++++++++-------
 file changed, 8 insertions(+), 7 deletions(-)
 --
-.13.6
+.24.1

-[Qemu-devel] [PULL 1/1] oslib-posix: Fix compiler warning and some data types
+[PULL for-5.0 1/1] aio-posix: fix io_uring with external events
-From: Stefan Weil <sw@weilnetz.de>
+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.
-gcc warning:
+It is also necessary to call ->wait() when AioHandlers have changed
 because io_uring is asynchronous and we must submit new sqes.
-/qemu/util/oslib-posix.c:304:11: error:
+Both of these changes to ->need_wait() together fix tests/test-aio -p
- variable ‘addr’ might be clobbered by ‘longjmp’ or ‘vfork’
+/aio/external-client, which failed with:
  [-Werror=clobbered]
-Fix also some related data types:
+  test-aio: tests/test-aio.c:404: test_aio_external_client: Assertion `aio_poll(ctx, false)' failed.
-numpages, hpagesize are used as pointer offset.
+Reported-by: Julia Suvorova <jusual@redhat.com>
-Always use size_t for them and also for the derived
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-numpages_per_thread and size_per_thread.
+Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
+Message-id: 20200319163559.117903-1-stefanha@redhat.com
 Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
 Signed-off-by: Stefan Weil <sw@weilnetz.de>
 Message-id: 20171016202912.1117-1-sw@weilnetz.de
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- util/oslib-posix.c | 15 ++++++++-------
+ util/fdmon-io_uring.c | 13 ++++++++++++-
-file changed, 8 insertions(+), 7 deletions(-)
+file changed, 12 insertions(+), 1 deletion(-)
-diff --git a/util/oslib-posix.c b/util/oslib-posix.c
+diff --git a/util/fdmon-io_uring.c b/util/fdmon-io_uring.c
 index XXXXXXX..XXXXXXX 100644
---- a/util/oslib-posix.c
+--- a/util/fdmon-io_uring.c
-+++ b/util/oslib-posix.c
++++ b/util/fdmon-io_uring.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ static int fdmon_io_uring_wait(AioContext *ctx, AioHandlerList *ready_list,
- struct MemsetThread {
+ static bool fdmon_io_uring_need_wait(AioContext *ctx)
      char *addr;
 -    uint64_t numpages;
 -    uint64_t hpagesize;
 +    size_t numpages;
 +    size_t hpagesize;
      QemuThread pgthread;
      sigjmp_buf env;
  };
@@ -XXX,XX +XXX,XX @@ static void sigbus_handler(int signal)
  static void *do_touch_pages(void *arg)
  {
-     MemsetThread *memset_args = (MemsetThread *)arg;
+-    return io_uring_cq_ready(&ctx->fdmon_io_uring);
--    char *addr = memset_args->addr;
++    /* Have io_uring events completed? */
--    uint64_t numpages = memset_args->numpages;
++    if (io_uring_cq_ready(&ctx->fdmon_io_uring)) {
--    uint64_t hpagesize = memset_args->hpagesize;
++        return true;
-     sigset_t set, oldset;
++    }
--    int i = 0;
++
++    /* Do we need to submit new io_uring sqes? */
-     /* unblock SIGBUS */
++    if (!QSLIST_EMPTY_RCU(&ctx->submit_list)) {
-     sigemptyset(&set);
++        return true;
-@@ -XXX,XX +XXX,XX @@ static void *do_touch_pages(void *arg)
++    }
-     if (sigsetjmp(memset_args->env, 1)) {
++
-         memset_thread_failed = true;
++    /* Are we falling back to fdmon-poll? */
-     } else {
++    return atomic_read(&ctx->external_disable_cnt);
-+        char *addr = memset_args->addr;
+ }
-+        size_t numpages = memset_args->numpages;
-+        size_t hpagesize = memset_args->hpagesize;
+ static const FDMonOps fdmon_io_uring_ops = {
 +        size_t i;
          for (i = 0; i < numpages; i++) {
              /*
               * Read & write back the same value, so we don't
@@ -XXX,XX +XXX,XX @@ static inline int get_memset_num_threads(int smp_cpus)
  static bool touch_all_pages(char *area, size_t hpagesize, size_t numpages,
                              int smp_cpus)
  {
 -    uint64_t numpages_per_thread, size_per_thread;
 +    size_t numpages_per_thread;
 +    size_t size_per_thread;
      char *addr = area;
      int i = 0;
 --
-.13.6
+.24.1

From: Stefan Weil <sw@weilnetz.de>

gcc warning:

/qemu/util/oslib-posix.c:304:11: error:
 variable ‘addr’ might be clobbered by ‘longjmp’ or ‘vfork’
 [-Werror=clobbered]

Fix also some related data types:

numpages, hpagesize are used as pointer offset.
Always use size_t for them and also for the derived
numpages_per_thread and size_per_thread.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-id: 20171016202912.1117-1-sw@weilnetz.de
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 util/oslib-posix.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -XXX,XX +XXX,XX @@
 
 struct MemsetThread {
     char *addr;
-    uint64_t numpages;
-    uint64_t hpagesize;
+    size_t numpages;
+    size_t hpagesize;
     QemuThread pgthread;
     sigjmp_buf env;
 };
@@ -XXX,XX +XXX,XX @@ static void sigbus_handler(int signal)
 static void *do_touch_pages(void *arg)
 {
     MemsetThread *memset_args = (MemsetThread *)arg;
-    char *addr = memset_args->addr;
-    uint64_t numpages = memset_args->numpages;
-    uint64_t hpagesize = memset_args->hpagesize;
     sigset_t set, oldset;
-    int i = 0;
 
     /* unblock SIGBUS */
     sigemptyset(&set);
@@ -XXX,XX +XXX,XX @@ static void *do_touch_pages(void *arg)
     if (sigsetjmp(memset_args->env, 1)) {
         memset_thread_failed = true;
     } else {
+        char *addr = memset_args->addr;
+        size_t numpages = memset_args->numpages;
+        size_t hpagesize = memset_args->hpagesize;
+        size_t i;
         for (i = 0; i < numpages; i++) {
             /*
              * Read & write back the same value, so we don't
@@ -XXX,XX +XXX,XX @@ static inline int get_memset_num_threads(int smp_cpus)
 static bool touch_all_pages(char *area, size_t hpagesize, size_t numpages,
                             int smp_cpus)
 {
-    uint64_t numpages_per_thread, size_per_thread;
+    size_t numpages_per_thread;
+    size_t size_per_thread;
     char *addr = area;
     int i = 0;
 
-- 
2.13.6

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