Series comparison

-[Qemu-devel] [PULL 0/1] Block patches
+[PULL for-6.1 0/3] Block patches
-The following changes since commit 2ab09bf2f9f55b9fb8d2de6eb2ba2a8570e268e2:
+The following changes since commit 3521ade3510eb5cefb2e27a101667f25dad89935:
-  Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180612-pull-request' into staging (2018-06-12 15:34:34 +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:
+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 b61acdecbf19c3c5a327baec1e8e4c06d0da68b7:
+for you to fetch changes up to cc8eecd7f105a1dff5876adeb238a14696061a4a:
-  block: Ignore generated job QAPI files (2018-06-13 10:51:49 -0400)
+  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver (2021-07-29 17:17:34 +0100)
 ----------------------------------------------------------------
-Block patch for .gitignore
+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.
 ----------------------------------------------------------------
-Eric Blake (1):
+Fabian Ebner (1):
-  block: Ignore generated job QAPI files
+  block/io_uring: resubmit when result is -EAGAIN
- .gitignore | 4 ++++
+Philippe Mathieu-Daudé (1):
-file changed, 4 insertions(+)
+  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 +++++++++++++++-
 files changed, 17 insertions(+), 1 deletion(-)
 --
-.13.6
+.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

-New patch
+[PULL for-6.1 2/3] block/io_uring: resubmit when result is -EAGAIN
+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 +++++++++++++++-
+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;
+             }
+--
+.31.1

-[Qemu-devel] [PULL 1/1] block: Ignore generated job QAPI files
+[PULL for-6.1 3/3] MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver
-From: Eric Blake <eblake@redhat.com>
+From: Philippe Mathieu-Daudé <philmd@redhat.com>
-Commit bf42508f introduced new generated files; make sure they
+I'm interested in following the activity around the NVMe bdrv.
 don't get accidentally committed from an in-tree build.
-Signed-off-by: Eric Blake <eblake@redhat.com>
+Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Reviewed-by: Jeff Cody <jcody@redhat.com>
+Message-id: 20210728183340.2018313-1-philmd@redhat.com
-Reviewed-by: Max Reitz <mreitz@redhat.com>
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: 20180531212435.165261-1-eblake@redhat.com
 Signed-off-by: Jeff Cody <jcody@redhat.com>
 ---
- .gitignore | 4 ++++
+ MAINTAINERS | 1 +
-file changed, 4 insertions(+)
+file changed, 1 insertion(+)
-diff --git a/.gitignore b/.gitignore
+diff --git a/MAINTAINERS b/MAINTAINERS
 index XXXXXXX..XXXXXXX 100644
---- a/.gitignore
+--- a/MAINTAINERS
-+++ b/.gitignore
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ F: block/null.c
- /qapi/qapi-commands-common.[ch]
+ NVMe Block Driver
- /qapi/qapi-commands-crypto.[ch]
+ M: Stefan Hajnoczi <stefanha@redhat.com>
- /qapi/qapi-commands-introspect.[ch]
+ R: Fam Zheng <fam@euphon.net>
-+/qapi/qapi-commands-job.[ch]
++R: Philippe Mathieu-Daudé <philmd@redhat.com>
- /qapi/qapi-commands-migration.[ch]
+ L: qemu-block@nongnu.org
- /qapi/qapi-commands-misc.[ch]
+ S: Supported
- /qapi/qapi-commands-net.[ch]
+ F: block/nvme*
@@ -XXX,XX +XXX,XX @@
  /qapi/qapi-events-common.[ch]
  /qapi/qapi-events-crypto.[ch]
  /qapi/qapi-events-introspect.[ch]
 +/qapi/qapi-events-job.[ch]
  /qapi/qapi-events-migration.[ch]
  /qapi/qapi-events-misc.[ch]
  /qapi/qapi-events-net.[ch]
@@ -XXX,XX +XXX,XX @@
  /qapi/qapi-types-common.[ch]
  /qapi/qapi-types-crypto.[ch]
  /qapi/qapi-types-introspect.[ch]
 +/qapi/qapi-types-job.[ch]
  /qapi/qapi-types-migration.[ch]
  /qapi/qapi-types-misc.[ch]
  /qapi/qapi-types-net.[ch]
@@ -XXX,XX +XXX,XX @@
  /qapi/qapi-visit-common.[ch]
  /qapi/qapi-visit-crypto.[ch]
  /qapi/qapi-visit-introspect.[ch]
 +/qapi/qapi-visit-job.[ch]
  /qapi/qapi-visit-migration.[ch]
  /qapi/qapi-visit-misc.[ch]
  /qapi/qapi-visit-net.[ch]
 --
-.13.6
+.31.1

From: Eric Blake <eblake@redhat.com>

Commit bf42508f introduced new generated files; make sure they
don't get accidentally committed from an in-tree build.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20180531212435.165261-1-eblake@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index XXXXXXX..XXXXXXX 100644
--- a/.gitignore
+++ b/.gitignore
@@ -XXX,XX +XXX,XX @@
 /qapi/qapi-commands-common.[ch]
 /qapi/qapi-commands-crypto.[ch]
 /qapi/qapi-commands-introspect.[ch]
+/qapi/qapi-commands-job.[ch]
 /qapi/qapi-commands-migration.[ch]
 /qapi/qapi-commands-misc.[ch]
 /qapi/qapi-commands-net.[ch]
@@ -XXX,XX +XXX,XX @@
 /qapi/qapi-events-common.[ch]
 /qapi/qapi-events-crypto.[ch]
 /qapi/qapi-events-introspect.[ch]
+/qapi/qapi-events-job.[ch]
 /qapi/qapi-events-migration.[ch]
 /qapi/qapi-events-misc.[ch]
 /qapi/qapi-events-net.[ch]
@@ -XXX,XX +XXX,XX @@
 /qapi/qapi-types-common.[ch]
 /qapi/qapi-types-crypto.[ch]
 /qapi/qapi-types-introspect.[ch]
+/qapi/qapi-types-job.[ch]
 /qapi/qapi-types-migration.[ch]
 /qapi/qapi-types-misc.[ch]
 /qapi/qapi-types-net.[ch]
@@ -XXX,XX +XXX,XX @@
 /qapi/qapi-visit-common.[ch]
 /qapi/qapi-visit-crypto.[ch]
 /qapi/qapi-visit-introspect.[ch]
+/qapi/qapi-visit-job.[ch]
 /qapi/qapi-visit-migration.[ch]
 /qapi/qapi-visit-misc.[ch]
 /qapi/qapi-visit-net.[ch]
-- 
2.13.6

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