Series comparison

-[Qemu-devel] [PULL 0/2] Block patches
+[PULL for-6.1 0/3] Block patches
-The following changes since commit b05631954d6dfe93340d516660397e2c1a2a5dd6:
+The following changes since commit 3521ade3510eb5cefb2e27a101667f25dad89935:
-  Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20180131' into staging (2018-01-31 15:50:29 +0000)
+  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:
+are available in the Git repository at:
-  git://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 45a79646ea746fa3f32083d0aa70512aae29f6b3:
+for you to fetch changes up to cc8eecd7f105a1dff5876adeb238a14696061a4a:
-  iotests: Make 200 run on tmpfs (2018-01-31 22:37:00 -0500)
+  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver (2021-07-29 17:17:34 +0100)
 ----------------------------------------------------------------
-Block patches
+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.
 ----------------------------------------------------------------
-Max Reitz (1):
+Fabian Ebner (1):
-  iotests: Make 200 run on tmpfs
+  block/io_uring: resubmit when result is -EAGAIN
-Murilo Opsfelder Araujo (1):
+Philippe Mathieu-Daudé (1):
-  block/ssh: fix possible segmentation fault when .desc is not
+  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver
     null-terminated
- block/ssh.c            | 1 +
+Stefano Garzarella (1):
- tests/qemu-iotests/200 | 2 +-
+  MAINTAINERS: add Stefano Garzarella as io_uring reviewer
-files changed, 2 insertions(+), 1 deletion(-)
  MAINTAINERS      |  2 ++
  block/io_uring.c | 16 +++++++++++++++-
 files changed, 17 insertions(+), 1 deletion(-)
 --
-.9.5
+.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

-[Qemu-devel] [PULL 2/2] iotests: Make 200 run on tmpfs
+[PULL for-6.1 2/3] block/io_uring: resubmit when result is -EAGAIN
-From: Max Reitz <mreitz@redhat.com>
+From: Fabian Ebner <f.ebner@proxmox.com>
-currently fails on tmpfs because it sets cache=none.  However,
+Linux SCSI can throw spurious -EAGAIN in some corner cases in its
-without that (and aio=native), the test still works now and it fails
+completion path, which will end up being the result in the completed
-before Jeff's series (on fc7dbc119e0852a70dc9fa68bb41a318e49e4cd6).  So
+io_uring request.
 we can probably remove the aio=native safely, and replace cache=none by
 cache=$CACHEMODE.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Resubmitting such requests should allow block jobs to complete, even
-Reviewed-by: Jeff Cody <jcody@redhat.com>
+if such spurious errors are encountered.
-Message-id: 20180117135015.15051-1-mreitz@redhat.com
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+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>
 ---
- tests/qemu-iotests/200 | 2 +-
+ block/io_uring.c | 16 +++++++++++++++-
-file changed, 1 insertion(+), 1 deletion(-)
+file changed, 15 insertions(+), 1 deletion(-)
-diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
+diff --git a/block/io_uring.c b/block/io_uring.c
-index XXXXXXX..XXXXXXX 100755
+index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/200
+--- a/block/io_uring.c
-+++ b/tests/qemu-iotests/200
++++ b/block/io_uring.c
-@@ -XXX,XX +XXX,XX @@ qemu_comm_method="qmp"
+@@ -XXX,XX +XXX,XX @@ static void luring_process_completions(LuringState *s)
- _launch_qemu -device pci-bridge,id=bridge1,chassis_nr=1,bus=pci.0 \
+         total_bytes = ret + luringcb->total_read;
-              -object iothread,id=iothread0 \
-              -device virtio-scsi-pci,bus=bridge1,addr=0x1f,id=scsi0,iothread=iothread0 \
+         if (ret < 0) {
--             -drive file="${TEST_IMG}",media=disk,if=none,cache=none,id=drive_sysdisk,aio=native,format=$IMGFMT \
+-            if (ret == -EINTR) {
-+             -drive file="${TEST_IMG}",media=disk,if=none,cache=$CACHEMODE,id=drive_sysdisk,format=$IMGFMT \
++            /*
-              -device scsi-hd,drive=drive_sysdisk,bus=scsi0.0,id=sysdisk,bootindex=0
++             * Only writev/readv/fsync requests on regular files or host block
- h1=$QEMU_HANDLE
++             * 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;
              }
 --
-.9.5
+.31.1

-[Qemu-devel] [PULL 1/2] block/ssh: fix possible segmentation fault when .desc is not null-terminated
+[PULL for-6.1 3/3] MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver
-From: Murilo Opsfelder Araujo <muriloo@linux.vnet.ibm.com>
+From: Philippe Mathieu-Daudé <philmd@redhat.com>
-This patch prevents a possible segmentation fault when .desc members are checked
+I'm interested in following the activity around the NVMe bdrv.
 against NULL.
-The ssh_runtime_opts was added by commit
+Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-a6a80896d6af03b8ee0c17cdf37219eca2588a7 ("block/ssh: Use QemuOpts for runtime
+Message-id: 20210728183340.2018313-1-philmd@redhat.com
-options").
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 This fix was inspired by
 http://lists.nongnu.org/archive/html/qemu-devel/2018-01/msg00883.html.
 Fixes: 8a6a80896d6af03b8ee0c17cdf37219eca2588a7 ("block/ssh: Use QemuOpts for runtime options")
 Cc: Max Reitz <mreitz@redhat.com>
 Cc: Eric Blake <eblake@redhat.com>
 Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.vnet.ibm.com>
 Reviewed-by: Eric Blake <eblake@redhat.com>
 Reviewed-by: Jeff Cody <jcody@redhat.com>
 Signed-off-by: Jeff Cody <jcody@redhat.com>
 ---
- block/ssh.c | 1 +
+ MAINTAINERS | 1 +
 file changed, 1 insertion(+)
-diff --git a/block/ssh.c b/block/ssh.c
+diff --git a/MAINTAINERS b/MAINTAINERS
 index XXXXXXX..XXXXXXX 100644
---- a/block/ssh.c
+--- a/MAINTAINERS
-+++ b/block/ssh.c
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@ static QemuOptsList ssh_runtime_opts = {
+@@ -XXX,XX +XXX,XX @@ F: block/null.c
-             .type = QEMU_OPT_STRING,
+ NVMe Block Driver
-             .help = "Defines how and what to check the host key against",
+ M: Stefan Hajnoczi <stefanha@redhat.com>
-         },
+ R: Fam Zheng <fam@euphon.net>
-+        { /* end of list */ }
++R: Philippe Mathieu-Daudé <philmd@redhat.com>
-     },
+ L: qemu-block@nongnu.org
- };
+ S: Supported
+ F: block/nvme*
 --
-.9.5
+.31.1

From: Murilo Opsfelder Araujo <muriloo@linux.vnet.ibm.com>

This patch prevents a possible segmentation fault when .desc members are checked
against NULL.

The ssh_runtime_opts was added by commit
8a6a80896d6af03b8ee0c17cdf37219eca2588a7 ("block/ssh: Use QemuOpts for runtime
options").

This fix was inspired by
http://lists.nongnu.org/archive/html/qemu-devel/2018-01/msg00883.html.

Fixes: 8a6a80896d6af03b8ee0c17cdf37219eca2588a7 ("block/ssh: Use QemuOpts for runtime options")
Cc: Max Reitz <mreitz@redhat.com>
Cc: Eric Blake <eblake@redhat.com>
Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/ssh.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/block/ssh.c b/block/ssh.c
index XXXXXXX..XXXXXXX 100644
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -XXX,XX +XXX,XX @@ static QemuOptsList ssh_runtime_opts = {
             .type = QEMU_OPT_STRING,
             .help = "Defines how and what to check the host key against",
         },
+        { /* end of list */ }
     },
 };
 
-- 
2.9.5

From: Max Reitz <mreitz@redhat.com>

200 currently fails on tmpfs because it sets cache=none.  However,
without that (and aio=native), the test still works now and it fails
before Jeff's series (on fc7dbc119e0852a70dc9fa68bb41a318e49e4cd6).  So
we can probably remove the aio=native safely, and replace cache=none by
cache=$CACHEMODE.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Message-id: 20180117135015.15051-1-mreitz@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 tests/qemu-iotests/200 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/200
+++ b/tests/qemu-iotests/200
@@ -XXX,XX +XXX,XX @@ qemu_comm_method="qmp"
 _launch_qemu -device pci-bridge,id=bridge1,chassis_nr=1,bus=pci.0 \
              -object iothread,id=iothread0 \
              -device virtio-scsi-pci,bus=bridge1,addr=0x1f,id=scsi0,iothread=iothread0 \
-             -drive file="${TEST_IMG}",media=disk,if=none,cache=none,id=drive_sysdisk,aio=native,format=$IMGFMT \
+             -drive file="${TEST_IMG}",media=disk,if=none,cache=$CACHEMODE,id=drive_sysdisk,format=$IMGFMT \
              -device scsi-hd,drive=drive_sysdisk,bus=scsi0.0,id=sysdisk,bootindex=0
 h1=$QEMU_HANDLE
 
-- 
2.9.5

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