Series comparison

-[PULL 0/2] Block patches
+[PULL for-6.1 0/3] Block patches
-The following changes since commit 58560ad254fbda71d4daa6622d71683190070ee2:
+The following changes since commit 3521ade3510eb5cefb2e27a101667f25dad89935:
-  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.2-20191024' into staging (2019-10-24 16:22:58 +0100)
+  Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-07-29' into staging (2021-07-29 13:17:20 +0100)
 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 d154ef37ff885918fa3e512fd7a8e42870291667:
+for you to fetch changes up to cc8eecd7f105a1dff5876adeb238a14696061a4a:
-  yield_until_fd_readable: make it work with any AioContect (2019-10-25 14:38:29 +0200)
+  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver (2021-07-29 17:17:34 +0100)
 ----------------------------------------------------------------
 Pull request
+The main fix here is for io_uring. Spurious -EAGAIN errors can happen and the
+request needs to be resubmitted.
+The MAINTAINERS changes carry no risk and we might as well include them in QEMU
+.1.
 ----------------------------------------------------------------
-Dietmar Maurer (1):
+Fabian Ebner (1):
-  yield_until_fd_readable: make it work with any AioContect
+  block/io_uring: resubmit when result is -EAGAIN
-Julia Suvorova (1):
+Philippe Mathieu-Daudé (1):
-  virtio-blk: Add blk_drain() to virtio_blk_device_unrealize()
+  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver
- hw/block/virtio-blk.c    | 1 +
+Stefano Garzarella (1):
- util/qemu-coroutine-io.c | 7 +++++--
+  MAINTAINERS: add Stefano Garzarella as io_uring reviewer
-files changed, 6 insertions(+), 2 deletions(-)
  MAINTAINERS      |  2 ++
  block/io_uring.c | 16 +++++++++++++++-
 files changed, 17 insertions(+), 1 deletion(-)
 --
-.21.0
+.31.1

-New patch
+[PULL for-6.1 1/3] MAINTAINERS: add Stefano Garzarella as io_uring reviewer
+From: Stefano Garzarella <sgarzare@redhat.com>
+I've been working with io_uring for a while so I'd like to help
+with reviews.
+Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
+Message-Id: <20210728131515.131045-1-sgarzare@redhat.com>
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ MAINTAINERS | 1 +
+file changed, 1 insertion(+)
+diff --git a/MAINTAINERS b/MAINTAINERS
+index XXXXXXX..XXXXXXX 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -XXX,XX +XXX,XX @@ Linux io_uring
+ M: Aarushi Mehta <mehta.aaru20@gmail.com>
+ M: Julia Suvorova <jusual@redhat.com>
+ M: Stefan Hajnoczi <stefanha@redhat.com>
++R: Stefano Garzarella <sgarzare@redhat.com>
+ L: qemu-block@nongnu.org
+ S: Maintained
+ F: block/io_uring.c
+--
+.31.1

-[PULL 2/2] yield_until_fd_readable: make it work with any AioContect
+[PULL for-6.1 2/3] block/io_uring: resubmit when result is -EAGAIN
-From: Dietmar Maurer <dietmar@proxmox.com>
+From: Fabian Ebner <f.ebner@proxmox.com>
-Simply use qemu_get_current_aio_context().
+Linux SCSI can throw spurious -EAGAIN in some corner cases in its
 completion path, which will end up being the result in the completed
 io_uring request.
-Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
+Resubmitting such requests should allow block jobs to complete, even
-Message-Id: <20191024045610.9071-1-dietmar@proxmox.com>
+if such spurious errors are encountered.
 Co-authored-by: Stefan Hajnoczi <stefanha@gmail.com>
 Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
 Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
 Message-id: 20210729091029.65369-1-f.ebner@proxmox.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- util/qemu-coroutine-io.c | 7 +++++--
+ block/io_uring.c | 16 +++++++++++++++-
-file changed, 5 insertions(+), 2 deletions(-)
+file changed, 15 insertions(+), 1 deletion(-)
-diff --git a/util/qemu-coroutine-io.c b/util/qemu-coroutine-io.c
+diff --git a/block/io_uring.c b/block/io_uring.c
 index XXXXXXX..XXXXXXX 100644
---- a/util/qemu-coroutine-io.c
+--- a/block/io_uring.c
-+++ b/util/qemu-coroutine-io.c
++++ b/block/io_uring.c
-@@ -XXX,XX +XXX,XX @@ qemu_co_send_recv(int sockfd, void *buf, size_t bytes, bool do_send)
+@@ -XXX,XX +XXX,XX @@ static void luring_process_completions(LuringState *s)
- }
+         total_bytes = ret + luringcb->total_read;
- typedef struct {
+         if (ret < 0) {
-+    AioContext *ctx;
+-            if (ret == -EINTR) {
-     Coroutine *co;
++            /*
-     int fd;
++             * Only writev/readv/fsync requests on regular files or host block
- } FDYieldUntilData;
++             * devices are submitted. Therefore -EAGAIN is not expected but it's
-@@ -XXX,XX +XXX,XX @@ typedef struct {
++             * known to happen sometimes with Linux SCSI. Submit again and hope
- static void fd_coroutine_enter(void *opaque)
++             * the request completes successfully.
- {
++             *
-     FDYieldUntilData *data = opaque;
++             * For more information, see:
--    qemu_set_fd_handler(data->fd, NULL, NULL, NULL);
++             * https://lore.kernel.org/io-uring/20210727165811.284510-3-axboe@kernel.dk/T/#u
-+    aio_set_fd_handler(data->ctx, data->fd, false, NULL, NULL, NULL, NULL);
++             *
-     qemu_coroutine_enter(data->co);
++             * If the code is changed to submit other types of requests in the
- }
++             * future, then this workaround may need to be extended to deal with
++             * genuine -EAGAIN results that should not be resubmitted
-@@ -XXX,XX +XXX,XX @@ void coroutine_fn yield_until_fd_readable(int fd)
++             * immediately.
-     FDYieldUntilData data;
++             */
++            if (ret == -EINTR || ret == -EAGAIN) {
-     assert(qemu_in_coroutine());
+                 luring_resubmit(s, luringcb);
-+    data.ctx = qemu_get_current_aio_context();
+                 continue;
-     data.co = qemu_coroutine_self();
+             }
      data.fd = fd;
 -    qemu_set_fd_handler(fd, fd_coroutine_enter, NULL, &data);
 +    aio_set_fd_handler(
 +        data.ctx, fd, false, fd_coroutine_enter, NULL, NULL, &data);
      qemu_coroutine_yield();
  }
 --
-.21.0
+.31.1

-[PULL 1/2] virtio-blk: Add blk_drain() to virtio_blk_device_unrealize()
+[PULL for-6.1 3/3] MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver
-From: Julia Suvorova <jusual@redhat.com>
+From: Philippe Mathieu-Daudé <philmd@redhat.com>
-QEMU does not wait for completed I/O requests, assuming that the guest
+I'm interested in following the activity around the NVMe bdrv.
 driver will reset the device before calling unrealize(). This does not
 happen on Windows, and QEMU crashes in virtio_notify(), getting the
 result of a completed I/O request on hot-unplugged device.
-Signed-off-by: Julia Suvorova <jusual@redhat.com>
+Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Message-Id: <20191018142856.31870-1-jusual@redhat.com>
+Message-id: 20210728183340.2018313-1-philmd@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- hw/block/virtio-blk.c | 1 +
+ MAINTAINERS | 1 +
 file changed, 1 insertion(+)
-diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
+diff --git a/MAINTAINERS b/MAINTAINERS
 index XXXXXXX..XXXXXXX 100644
---- a/hw/block/virtio-blk.c
+--- a/MAINTAINERS
-+++ b/hw/block/virtio-blk.c
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@ static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp)
+@@ -XXX,XX +XXX,XX @@ F: block/null.c
-     VirtIODevice *vdev = VIRTIO_DEVICE(dev);
+ NVMe Block Driver
-     VirtIOBlock *s = VIRTIO_BLK(dev);
+ M: Stefan Hajnoczi <stefanha@redhat.com>
+ R: Fam Zheng <fam@euphon.net>
-+    blk_drain(s->blk);
++R: Philippe Mathieu-Daudé <philmd@redhat.com>
-     virtio_blk_data_plane_destroy(s->dataplane);
+ L: qemu-block@nongnu.org
-     s->dataplane = NULL;
+ S: Supported
-     qemu_del_vm_change_state_handler(s->change);
+ F: block/nvme*
 --
-.21.0
+.31.1

From: Julia Suvorova <jusual@redhat.com>

QEMU does not wait for completed I/O requests, assuming that the guest
driver will reset the device before calling unrealize(). This does not
happen on Windows, and QEMU crashes in virtio_notify(), getting the
result of a completed I/O request on hot-unplugged device.

Signed-off-by: Julia Suvorova <jusual@redhat.com>
Message-Id: <20191018142856.31870-1-jusual@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/block/virtio-blk.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp)
     VirtIODevice *vdev = VIRTIO_DEVICE(dev);
     VirtIOBlock *s = VIRTIO_BLK(dev);
 
+    blk_drain(s->blk);
     virtio_blk_data_plane_destroy(s->dataplane);
     s->dataplane = NULL;
     qemu_del_vm_change_state_handler(s->change);
-- 
2.21.0

From: Dietmar Maurer <dietmar@proxmox.com>

Simply use qemu_get_current_aio_context().

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
Message-Id: <20191024045610.9071-1-dietmar@proxmox.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 util/qemu-coroutine-io.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/util/qemu-coroutine-io.c b/util/qemu-coroutine-io.c
index XXXXXXX..XXXXXXX 100644
--- a/util/qemu-coroutine-io.c
+++ b/util/qemu-coroutine-io.c
@@ -XXX,XX +XXX,XX @@ qemu_co_send_recv(int sockfd, void *buf, size_t bytes, bool do_send)
 }
 
 typedef struct {
+    AioContext *ctx;
     Coroutine *co;
     int fd;
 } FDYieldUntilData;
@@ -XXX,XX +XXX,XX @@ typedef struct {
 static void fd_coroutine_enter(void *opaque)
 {
     FDYieldUntilData *data = opaque;
-    qemu_set_fd_handler(data->fd, NULL, NULL, NULL);
+    aio_set_fd_handler(data->ctx, data->fd, false, NULL, NULL, NULL, NULL);
     qemu_coroutine_enter(data->co);
 }
 
@@ -XXX,XX +XXX,XX @@ void coroutine_fn yield_until_fd_readable(int fd)
     FDYieldUntilData data;
 
     assert(qemu_in_coroutine());
+    data.ctx = qemu_get_current_aio_context();
     data.co = qemu_coroutine_self();
     data.fd = fd;
-    qemu_set_fd_handler(fd, fd_coroutine_enter, NULL, &data);
+    aio_set_fd_handler(
+        data.ctx, fd, false, fd_coroutine_enter, NULL, NULL, &data);
     qemu_coroutine_yield();
 }
-- 
2.21.0

The following changes since commit 3521ade3510eb5cefb2e27a101667f25dad89935:

Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-07-29' into staging (2021-07-29 13:17:20 +0100)

are available in the Git repository at:

https://gitlab.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to cc8eecd7f105a1dff5876adeb238a14696061a4a:

MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver (2021-07-29 17:17:34 +0100)

----------------------------------------------------------------
Pull request

The main fix here is for io_uring. Spurious -EAGAIN errors can happen and the
request needs to be resubmitted.

The MAINTAINERS changes carry no risk and we might as well include them in QEMU
6.1.

----------------------------------------------------------------

Fabian Ebner (1):
  block/io_uring: resubmit when result is -EAGAIN

Philippe Mathieu-Daudé (1):
  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver

Stefano Garzarella (1):
  MAINTAINERS: add Stefano Garzarella as io_uring reviewer

MAINTAINERS      |  2 ++
 block/io_uring.c | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

-- 
2.31.1

From: Fabian Ebner <f.ebner@proxmox.com>

Linux SCSI can throw spurious -EAGAIN in some corner cases in its
completion path, which will end up being the result in the completed
io_uring request.

Resubmitting such requests should allow block jobs to complete, even
if such spurious errors are encountered.

Co-authored-by: Stefan Hajnoczi <stefanha@gmail.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
Message-id: 20210729091029.65369-1-f.ebner@proxmox.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/io_uring.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/block/io_uring.c b/block/io_uring.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io_uring.c
+++ b/block/io_uring.c
@@ -XXX,XX +XXX,XX @@ static void luring_process_completions(LuringState *s)
         total_bytes = ret + luringcb->total_read;
 
         if (ret < 0) {
-            if (ret == -EINTR) {
+            /*
+             * Only writev/readv/fsync requests on regular files or host block
+             * devices are submitted. Therefore -EAGAIN is not expected but it's
+             * known to happen sometimes with Linux SCSI. Submit again and hope
+             * the request completes successfully.
+             *
+             * For more information, see:
+             * https://lore.kernel.org/io-uring/20210727165811.284510-3-axboe@kernel.dk/T/#u
+             *
+             * If the code is changed to submit other types of requests in the
+             * future, then this workaround may need to be extended to deal with
+             * genuine -EAGAIN results that should not be resubmitted
+             * immediately.
+             */
+            if (ret == -EINTR || ret == -EAGAIN) {
                 luring_resubmit(s, luringcb);
                 continue;
             }
-- 
2.31.1