Series comparison

-[Qemu-devel] [PULL for-2.10 0/3] Block patches
+[PULL for-6.1 0/3] Block patches
-The following changes since commit b38df311c174c98ef8cce7dec9f46603b083018e:
+The following changes since commit 3521ade3510eb5cefb2e27a101667f25dad89935:
-  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.10-20170809' into staging (2017-08-10 11:12:36 +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/stefanha/qemu.git tags/block-pull-request
+  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 17d0bc01bfcce0ad4fb5105d4502595224569ff0:
+for you to fetch changes up to cc8eecd7f105a1dff5876adeb238a14696061a4a:
-  virtio-blk: handle blk_getlength() errors (2017-08-10 14:33:43 +0100)
+  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.
 ----------------------------------------------------------------
-----------------------------------------------------------------
+Fabian Ebner (1):
   block/io_uring: resubmit when result is -EAGAIN
-Kevin Wolf (1):
+Philippe Mathieu-Daudé (1):
-  IDE: test flush on empty CDROM
+  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver
-Stefan Hajnoczi (2):
+Stefano Garzarella (1):
-  IDE: Do not flush empty CDROM drives
+  MAINTAINERS: add Stefano Garzarella as io_uring reviewer
   virtio-blk: handle blk_getlength() errors
- hw/block/virtio-blk.c |  4 +++-
+ MAINTAINERS      |  2 ++
- hw/ide/core.c         | 10 +++++++++-
+ block/io_uring.c | 16 +++++++++++++++-
- tests/ide-test.c      | 19 +++++++++++++++++++
+files changed, 17 insertions(+), 1 deletion(-)
 files changed, 31 insertions(+), 2 deletions(-)
 --
-.13.4
+.31.1

-[Qemu-devel] [PULL for-2.10 3/3] virtio-blk: handle blk_getlength() errors
+[PULL for-6.1 1/3] MAINTAINERS: add Stefano Garzarella as io_uring reviewer
-If blk_getlength() fails in virtio_blk_update_config() consider the disk
+From: Stefano Garzarella <sgarzare@redhat.com>
 image length to be 0 bytes.
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+I've been working with io_uring for a while so I'd like to help
-Reviewed-by: Fam Zheng <famz@redhat.com>
+with reviews.
-Message-id: 20170808122251.29815-1-stefanha@redhat.com
 Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
 Message-Id: <20210728131515.131045-1-sgarzare@redhat.com>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- hw/block/virtio-blk.c | 4 +++-
+ MAINTAINERS | 1 +
-file changed, 3 insertions(+), 1 deletion(-)
+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_update_config(VirtIODevice *vdev, uint8_t *config)
+@@ -XXX,XX +XXX,XX @@ Linux io_uring
-     BlockConf *conf = &s->conf.conf;
+ M: Aarushi Mehta <mehta.aaru20@gmail.com>
-     struct virtio_blk_config blkcfg;
+ M: Julia Suvorova <jusual@redhat.com>
-     uint64_t capacity;
+ M: Stefan Hajnoczi <stefanha@redhat.com>
-+    int64_t length;
++R: Stefano Garzarella <sgarzare@redhat.com>
-     int blk_size = conf->logical_block_size;
+ L: qemu-block@nongnu.org
+ S: Maintained
-     blk_get_geometry(s->blk, &capacity);
+ F: block/io_uring.c
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config)
       * divided by 512 - instead it is the amount of blk_size blocks
       * per track (cylinder).
       */
 -    if (blk_getlength(s->blk) /  conf->heads / conf->secs % blk_size) {
 +    length = blk_getlength(s->blk);
 +    if (length > 0 && length / conf->heads / conf->secs % blk_size) {
          blkcfg.geometry.sectors = conf->secs & ~s->sector_mask;
      } else {
          blkcfg.geometry.sectors = conf->secs;
 --
-.13.4
+.31.1

-[Qemu-devel] [PULL for-2.10 2/3] IDE: test flush on empty CDROM
+[PULL for-6.1 2/3] block/io_uring: resubmit when result is -EAGAIN
-From: Kevin Wolf <kwolf@redhat.com>
+From: Fabian Ebner <f.ebner@proxmox.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Linux SCSI can throw spurious -EAGAIN in some corner cases in its
-Signed-off-by: John Snow <jsnow@redhat.com>
+completion path, which will end up being the result in the completed
-Reviewed-by: Eric Blake <eblake@redhat.com>
+io_uring request.
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Message-id: 20170809160212.29976-3-stefanha@redhat.com
+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>
 ---
- tests/ide-test.c | 19 +++++++++++++++++++
+ block/io_uring.c | 16 +++++++++++++++-
-file changed, 19 insertions(+)
+file changed, 15 insertions(+), 1 deletion(-)
-diff --git a/tests/ide-test.c b/tests/ide-test.c
+diff --git a/block/io_uring.c b/block/io_uring.c
 index XXXXXXX..XXXXXXX 100644
---- a/tests/ide-test.c
+--- a/block/io_uring.c
-+++ b/tests/ide-test.c
++++ b/block/io_uring.c
-@@ -XXX,XX +XXX,XX @@ static void test_flush_nodev(void)
+@@ -XXX,XX +XXX,XX @@ static void luring_process_completions(LuringState *s)
-     ide_test_quit();
+         total_bytes = ret + luringcb->total_read;
- }
+         if (ret < 0) {
-+static void test_flush_empty_drive(void)
+-            if (ret == -EINTR) {
-+{
++            /*
-+    QPCIDevice *dev;
++             * Only writev/readv/fsync requests on regular files or host block
-+    QPCIBar bmdma_bar, ide_bar;
++             * devices are submitted. Therefore -EAGAIN is not expected but it's
-+
++             * known to happen sometimes with Linux SCSI. Submit again and hope
-+    ide_test_start("-device ide-cd,bus=ide.0");
++             * the request completes successfully.
-+    dev = get_pci_device(&bmdma_bar, &ide_bar);
++             *
-+
++             * For more information, see:
-+    /* FLUSH CACHE command on device 0 */
++             * https://lore.kernel.org/io-uring/20210727165811.284510-3-axboe@kernel.dk/T/#u
-+    qpci_io_writeb(dev, ide_bar, reg_device, 0);
++             *
-+    qpci_io_writeb(dev, ide_bar, reg_command, CMD_FLUSH_CACHE);
++             * 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
-+    /* Just testing that qemu doesn't crash... */
++             * genuine -EAGAIN results that should not be resubmitted
-+
++             * immediately.
-+    free_pci_device(dev);
++             */
-+    ide_test_quit();
++            if (ret == -EINTR || ret == -EAGAIN) {
-+}
+                 luring_resubmit(s, luringcb);
-+
+                 continue;
- static void test_pci_retry_flush(void)
+             }
  {
      test_retry_flush("pc");
@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv)
      qtest_add_func("/ide/flush", test_flush);
      qtest_add_func("/ide/flush/nodev", test_flush_nodev);
 +    qtest_add_func("/ide/flush/empty_drive", test_flush_empty_drive);
      qtest_add_func("/ide/flush/retry_pci", test_pci_retry_flush);
      qtest_add_func("/ide/flush/retry_isa", test_isa_retry_flush);
 --
-.13.4
+.31.1

-[Qemu-devel] [PULL for-2.10 1/3] IDE: Do not flush empty CDROM drives
+[PULL for-6.1 3/3] MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver
-The block backend changed in a way that flushing empty CDROM drives now
+From: Philippe Mathieu-Daudé <philmd@redhat.com>
 crashes.  Amend IDE to avoid doing so until the root problem can be
 addressed for 2.11.
-Original patch by John Snow <jsnow@redhat.com>.
+I'm interested in following the activity around the NVMe bdrv.
-Reported-by: Kieron Shorrock <kshorrock@paloaltonetworks.com>
+Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Message-id: 20210728183340.2018313-1-philmd@redhat.com
 Reviewed-by: Eric Blake <eblake@redhat.com>
 Message-id: 20170809160212.29976-2-stefanha@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- hw/ide/core.c | 10 +++++++++-
+ MAINTAINERS | 1 +
-file changed, 9 insertions(+), 1 deletion(-)
+file changed, 1 insertion(+)
-diff --git a/hw/ide/core.c b/hw/ide/core.c
+diff --git a/MAINTAINERS b/MAINTAINERS
 index XXXXXXX..XXXXXXX 100644
---- a/hw/ide/core.c
+--- a/MAINTAINERS
-+++ b/hw/ide/core.c
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@ static void ide_flush_cache(IDEState *s)
+@@ -XXX,XX +XXX,XX @@ F: block/null.c
-     s->status |= BUSY_STAT;
+ NVMe Block Driver
-     ide_set_retry(s);
+ M: Stefan Hajnoczi <stefanha@redhat.com>
-     block_acct_start(blk_get_stats(s->blk), &s->acct, 0, BLOCK_ACCT_FLUSH);
+ R: Fam Zheng <fam@euphon.net>
--    s->pio_aiocb = blk_aio_flush(s->blk, ide_flush_cb, s);
++R: Philippe Mathieu-Daudé <philmd@redhat.com>
-+
+ L: qemu-block@nongnu.org
-+    if (blk_bs(s->blk)) {
+ S: Supported
-+        s->pio_aiocb = blk_aio_flush(s->blk, ide_flush_cb, s);
+ F: block/nvme*
 +    } else {
 +        /* XXX blk_aio_flush() crashes when blk_bs(blk) is NULL, remove this
 +         * temporary workaround when blk_aio_*() functions handle NULL blk_bs.
 +         */
 +        ide_flush_cb(s, 0);
 +    }
  }
  static void ide_cfata_metadata_inquiry(IDEState *s)
 --
-.13.4
+.31.1

The block backend changed in a way that flushing empty CDROM drives now
crashes.  Amend IDE to avoid doing so until the root problem can be
addressed for 2.11.

Original patch by John Snow <jsnow@redhat.com>.

Reported-by: Kieron Shorrock <kshorrock@paloaltonetworks.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20170809160212.29976-2-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/ide/core.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/hw/ide/core.c b/hw/ide/core.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -XXX,XX +XXX,XX @@ static void ide_flush_cache(IDEState *s)
     s->status |= BUSY_STAT;
     ide_set_retry(s);
     block_acct_start(blk_get_stats(s->blk), &s->acct, 0, BLOCK_ACCT_FLUSH);
-    s->pio_aiocb = blk_aio_flush(s->blk, ide_flush_cb, s);
+
+    if (blk_bs(s->blk)) {
+        s->pio_aiocb = blk_aio_flush(s->blk, ide_flush_cb, s);
+    } else {
+        /* XXX blk_aio_flush() crashes when blk_bs(blk) is NULL, remove this
+         * temporary workaround when blk_aio_*() functions handle NULL blk_bs.
+         */
+        ide_flush_cb(s, 0);
+    }
 }
 
 static void ide_cfata_metadata_inquiry(IDEState *s)
-- 
2.13.4

From: Kevin Wolf <kwolf@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20170809160212.29976-3-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 tests/ide-test.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/ide-test.c b/tests/ide-test.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/ide-test.c
+++ b/tests/ide-test.c
@@ -XXX,XX +XXX,XX @@ static void test_flush_nodev(void)
     ide_test_quit();
 }
 
+static void test_flush_empty_drive(void)
+{
+    QPCIDevice *dev;
+    QPCIBar bmdma_bar, ide_bar;
+
+    ide_test_start("-device ide-cd,bus=ide.0");
+    dev = get_pci_device(&bmdma_bar, &ide_bar);
+
+    /* FLUSH CACHE command on device 0 */
+    qpci_io_writeb(dev, ide_bar, reg_device, 0);
+    qpci_io_writeb(dev, ide_bar, reg_command, CMD_FLUSH_CACHE);
+
+    /* Just testing that qemu doesn't crash... */
+
+    free_pci_device(dev);
+    ide_test_quit();
+}
+
 static void test_pci_retry_flush(void)
 {
     test_retry_flush("pc");
@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv)
 
     qtest_add_func("/ide/flush", test_flush);
     qtest_add_func("/ide/flush/nodev", test_flush_nodev);
+    qtest_add_func("/ide/flush/empty_drive", test_flush_empty_drive);
     qtest_add_func("/ide/flush/retry_pci", test_pci_retry_flush);
     qtest_add_func("/ide/flush/retry_isa", test_isa_retry_flush);
 
-- 
2.13.4

If blk_getlength() fails in virtio_blk_update_config() consider the disk
image length to be 0 bytes.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-id: 20170808122251.29815-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/block/virtio-blk.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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_update_config(VirtIODevice *vdev, uint8_t *config)
     BlockConf *conf = &s->conf.conf;
     struct virtio_blk_config blkcfg;
     uint64_t capacity;
+    int64_t length;
     int blk_size = conf->logical_block_size;
 
     blk_get_geometry(s->blk, &capacity);
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config)
      * divided by 512 - instead it is the amount of blk_size blocks
      * per track (cylinder).
      */
-    if (blk_getlength(s->blk) /  conf->heads / conf->secs % blk_size) {
+    length = blk_getlength(s->blk);
+    if (length > 0 && length / conf->heads / conf->secs % blk_size) {
         blkcfg.geometry.sectors = conf->secs & ~s->sector_mask;
     } else {
         blkcfg.geometry.sectors = conf->secs;
-- 
2.13.4

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