Series comparison

-[Qemu-devel] [0 0/2] Block patches
+[PULL for-6.1 0/3] Block patches
-The following changes since commit 285278ca785f5fa9a570927e1c0958a2ca2b2150:
+The following changes since commit 3521ade3510eb5cefb2e27a101667f25dad89935:
-  Merge remote-tracking branch 'remotes/famz/tags/testing-pull-request' into staging (2018-10-27 19:55:08 +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:
-  git://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 bd54b11062c4baa7d2e4efadcf71b8cfd55311fd:
+for you to fetch changes up to cc8eecd7f105a1dff5876adeb238a14696061a4a:
-  nvdimm: Add docs hint for Linux driver name (2018-10-29 13:35:22 +0000)
+  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver (2021-07-29 17:17:34 +0100)
 ----------------------------------------------------------------
 Pull request
-No changelog entries necessary, just small tweaks.
+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.
 ----------------------------------------------------------------
-Kees Cook (1):
+Fabian Ebner (1):
-  nvdimm: Add docs hint for Linux driver name
+  block/io_uring: resubmit when result is -EAGAIN
-Li Qiang (1):
+Philippe Mathieu-Daudé (1):
-  util: aio-posix: fix a typo
+  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver
- docs/nvdimm.txt  | 5 +++--
+Stefano Garzarella (1):
- util/aio-posix.c | 2 +-
+  MAINTAINERS: add Stefano Garzarella as io_uring reviewer
-files changed, 4 insertions(+), 3 deletions(-)
  MAINTAINERS      |  2 ++
  block/io_uring.c | 16 +++++++++++++++-
 files changed, 17 insertions(+), 1 deletion(-)
 --
-.17.2
+.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] [0 2/2] nvdimm: Add docs hint for Linux driver name
+[PULL for-6.1 2/3] block/io_uring: resubmit when result is -EAGAIN
-From: Kees Cook <keescook@chromium.org>
+From: Fabian Ebner <f.ebner@proxmox.com>
-I spent way too much time trying to figure out why the emulated NVDIMM
+Linux SCSI can throw spurious -EAGAIN in some corner cases in its
-was missing under Linux. In an effort to help others who might be looking
+completion path, which will end up being the result in the completed
-for these kinds of things in the future, include a hint.
+io_uring request.
-Signed-off-by: Kees Cook <keescook@chromium.org>
+Resubmitting such requests should allow block jobs to complete, even
-Message-id: 20181018201351.GA25286@beast
+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>
 ---
- docs/nvdimm.txt | 5 +++--
+ block/io_uring.c | 16 +++++++++++++++-
-file changed, 3 insertions(+), 2 deletions(-)
+file changed, 15 insertions(+), 1 deletion(-)
-diff --git a/docs/nvdimm.txt b/docs/nvdimm.txt
+diff --git a/block/io_uring.c b/block/io_uring.c
 index XXXXXXX..XXXXXXX 100644
---- a/docs/nvdimm.txt
+--- a/block/io_uring.c
-+++ b/docs/nvdimm.txt
++++ b/block/io_uring.c
-@@ -XXX,XX +XXX,XX @@ Multiple vNVDIMM devices can be created if multiple pairs of "-object"
+@@ -XXX,XX +XXX,XX @@ static void luring_process_completions(LuringState *s)
- and "-device" are provided.
+         total_bytes = ret + luringcb->total_read;
- For above command line options, if the guest OS has the proper NVDIMM
+         if (ret < 0) {
--driver, it should be able to detect a NVDIMM device which is in the
+-            if (ret == -EINTR) {
--persistent memory mode and whose size is $NVDIMM_SIZE.
++            /*
-+driver (e.g. "CONFIG_ACPI_NFIT=y" under Linux), it should be able to
++             * Only writev/readv/fsync requests on regular files or host block
-+detect a NVDIMM device which is in the persistent memory mode and whose
++             * devices are submitted. Therefore -EAGAIN is not expected but it's
-+size is $NVDIMM_SIZE.
++             * known to happen sometimes with Linux SCSI. Submit again and hope
++             * the request completes successfully.
- Note:
++             *
++             * 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;
              }
 --
-.17.2
+.31.1

-[Qemu-devel] [0 1/2] util: aio-posix: fix a typo
+[PULL for-6.1 3/3] MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver
-From: Li Qiang <liq3ea@gmail.com>
+From: Philippe Mathieu-Daudé <philmd@redhat.com>
-Cc: qemu-trivial@nongnu.org
+I'm interested in following the activity around the NVMe bdrv.
-Signed-off-by: Li Qiang <liq3ea@gmail.com>
-Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
+Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Reviewed-by: Fam Zheng <famz@redhat.com>
+Message-id: 20210728183340.2018313-1-philmd@redhat.com
 Message-id: 1538964972-3223-1-git-send-email-liq3ea@gmail.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- util/aio-posix.c | 2 +-
+ MAINTAINERS | 1 +
-file changed, 1 insertion(+), 1 deletion(-)
+file changed, 1 insertion(+)
-diff --git a/util/aio-posix.c b/util/aio-posix.c
+diff --git a/MAINTAINERS b/MAINTAINERS
 index XXXXXXX..XXXXXXX 100644
---- a/util/aio-posix.c
+--- a/MAINTAINERS
-+++ b/util/aio-posix.c
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@ struct AioHandler
+@@ -XXX,XX +XXX,XX @@ F: block/null.c
+ NVMe Block Driver
- #ifdef CONFIG_EPOLL_CREATE1
+ M: Stefan Hajnoczi <stefanha@redhat.com>
+ R: Fam Zheng <fam@euphon.net>
--/* The fd number threashold to switch to epoll */
++R: Philippe Mathieu-Daudé <philmd@redhat.com>
-+/* The fd number threshold to switch to epoll */
+ L: qemu-block@nongnu.org
- #define EPOLL_ENABLE_THRESHOLD 64
+ S: Supported
+ F: block/nvme*
  static void aio_epoll_disable(AioContext *ctx)
 --
-.17.2
+.31.1

From: Kees Cook <keescook@chromium.org>

I spent way too much time trying to figure out why the emulated NVDIMM
was missing under Linux. In an effort to help others who might be looking
for these kinds of things in the future, include a hint.

Signed-off-by: Kees Cook <keescook@chromium.org>
Message-id: 20181018201351.GA25286@beast
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 docs/nvdimm.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/nvdimm.txt b/docs/nvdimm.txt
index XXXXXXX..XXXXXXX 100644
--- a/docs/nvdimm.txt
+++ b/docs/nvdimm.txt
@@ -XXX,XX +XXX,XX @@ Multiple vNVDIMM devices can be created if multiple pairs of "-object"
 and "-device" are provided.
 
 For above command line options, if the guest OS has the proper NVDIMM
-driver, it should be able to detect a NVDIMM device which is in the
-persistent memory mode and whose size is $NVDIMM_SIZE.
+driver (e.g. "CONFIG_ACPI_NFIT=y" under Linux), it should be able to
+detect a NVDIMM device which is in the persistent memory mode and whose
+size is $NVDIMM_SIZE.
 
 Note:
 
-- 
2.17.2

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