Series comparison

-[PULL 00/11] Block patches
+[PULL 0/3] Block patches
-The following changes since commit 66234fee9c2d37bfbc523aa8d0ae5300a14cc10e:
+The following changes since commit 7208429223963c405c62fa2611398f1aa8033593:
-  Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-202=
+  Merge tag 'mem-2022-10-28' of https://github.com/davidhildenbrand/qemu into staging (2022-10-30 18:31:59 -0400)
 ' into staging (2020-06-04 11:38:48 +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 7d2410cea154bf915fb30179ebda3b17ac36e70e:
+for you to fetch changes up to 6c32fc0df9cd901add75618c831fb26a9eb742cb:
-  block: Factor out bdrv_run_co() (2020-06-05 09:54:48 +0100)
+  block/blkio: Make driver nvme-io_uring take a "path" instead of a "filename" (2022-10-31 14:35:14 -0400)
 ----------------------------------------------------------------
 Pull request
+Note that we're still discussing "block/blkio: Make driver nvme-io_uring take a
+"path" instead of a "filename"". I have sent the pull request now so everything
+is ready for the soft freeze tomorrow if we decide to go ahead with the patch.
 ----------------------------------------------------------------
-Alexander Bulekov (4):
+Alberto Faria (3):
-  fuzz: add datadir for oss-fuzz compatability
+  block/blkio: Add virtio-blk-vfio-pci BlockDriver
-  fuzz: fix typo in i440fx-qtest-reboot arguments
+  block/blkio: Tolerate device size changes
-  fuzz: add mangled object name to linker script
+  block/blkio: Make driver nvme-io_uring take a "path" instead of a
-  fuzz: run the main-loop in fork-server process
+    "filename"
-Philippe Mathieu-Daud=C3=A9 (4):
+ qapi/block-core.json | 22 +++++++++++++++++++--
-  memory: Rename memory_region_do_writeback -> memory_region_writeback
+ block/blkio.c        | 47 ++++++++++++++++++++++++++++++++++++++++----
-  memory: Extract memory_region_msync() from memory_region_writeback()
+files changed, 63 insertions(+), 6 deletions(-)
   hw/block: Let the NVMe emulated device be target-agnostic
   exec: Rename qemu_ram_writeback() as qemu_ram_msync()
-Stefano Garzarella (2):
+--
-  io_uring: retry io_uring_submit() if it fails with errno=3DEINTR
+.38.1
   io_uring: use io_uring_cq_ready() to check for ready cqes
 Vladimir Sementsov-Ogievskiy (1):
   block: Factor out bdrv_run_co()
  hw/block/Makefile.objs              |   2 +-
  include/exec/memory.h               |  15 ++-
  include/exec/ram_addr.h             |   4 +-
  include/sysemu/sysemu.h             |   2 +
  block/io.c                          | 193 +++++++++++-----------------
  block/io_uring.c                    |  11 +-
  exec.c                              |   2 +-
  hw/block/nvme.c                     |   6 +-
  memory.c                            |  12 +-
  softmmu/vl.c                        |   2 +-
  target/arm/helper.c                 |   2 +-
  tests/qtest/fuzz/fuzz.c             |  15 +++
  tests/qtest/fuzz/i440fx_fuzz.c      |   3 +-
  tests/qtest/fuzz/virtio_net_fuzz.c  |   2 +
  tests/qtest/fuzz/virtio_scsi_fuzz.c |   2 +
  tests/qtest/fuzz/fork_fuzz.ld       |   5 +
 files changed, 134 insertions(+), 144 deletions(-)
 --=20
 .25.4

-[PULL 01/11] io_uring: retry io_uring_submit() if it fails with errno=EINTR
+Deleted patch
-From: Stefano Garzarella <sgarzare@redhat.com>
-As recently documented [1], io_uring_enter(2) syscall can return an
-error (errno=EINTR) if the operation was interrupted by a delivery
-of a signal before it could complete.
-This should happen when IORING_ENTER_GETEVENTS flag is used, for
-example during io_uring_submit_and_wait() or during io_uring_submit()
-when IORING_SETUP_IOPOLL is enabled.
-We shouldn't have this problem for now, but it's better to prevent it.
-[1] https://github.com/axboe/liburing/commit/344355ec6619de8f4e64584c9736530b5346e4f4
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Message-id: 20200519133041.112138-1-sgarzare@redhat.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- block/io_uring.c | 2 +-
-file changed, 1 insertion(+), 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 int ioq_submit(LuringState *s)
-         trace_luring_io_uring_submit(s, ret);
-         /* Prevent infinite loop if submission is refused */
-         if (ret <= 0) {
--            if (ret == -EAGAIN) {
-+            if (ret == -EAGAIN || ret == -EINTR) {
-                 continue;
-             }
-             break;
---
-.25.4

-[PULL 02/11] io_uring: use io_uring_cq_ready() to check for ready cqes
+Deleted patch
-From: Stefano Garzarella <sgarzare@redhat.com>
-In qemu_luring_poll_cb() we are not using the cqe peeked from the
-CQ ring. We are using io_uring_peek_cqe() only to see if there
-are cqes ready, so we can replace it with io_uring_cq_ready().
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Message-id: 20200519134942.118178-1-sgarzare@redhat.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- block/io_uring.c | 9 +++------
-file changed, 3 insertions(+), 6 deletions(-)
-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 qemu_luring_completion_cb(void *opaque)
- static bool qemu_luring_poll_cb(void *opaque)
- {
-     LuringState *s = opaque;
--    struct io_uring_cqe *cqes;
--    if (io_uring_peek_cqe(&s->ring, &cqes) == 0) {
--        if (cqes) {
--            luring_process_completions_and_submit(s);
--            return true;
--        }
-+    if (io_uring_cq_ready(&s->ring)) {
-+        luring_process_completions_and_submit(s);
-+        return true;
-     }
-     return false;
---
-.25.4

-[PULL 03/11] fuzz: add datadir for oss-fuzz compatability
+Deleted patch
-From: Alexander Bulekov <alxndr@bu.edu>
-This allows us to keep pc-bios in executable_dir/pc-bios, rather than
-executable_dir/../pc-bios, which is incompatible with oss-fuzz' file
-structure.
-Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
-Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
-Message-id: 20200512030133.29896-2-alxndr@bu.edu
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- include/sysemu/sysemu.h |  2 ++
- softmmu/vl.c            |  2 +-
- tests/qtest/fuzz/fuzz.c | 15 +++++++++++++++
-files changed, 18 insertions(+), 1 deletion(-)
-diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/sysemu/sysemu.h
-+++ b/include/sysemu/sysemu.h
-@@ -XXX,XX +XXX,XX @@ extern const char *qemu_name;
- extern QemuUUID qemu_uuid;
- extern bool qemu_uuid_set;
-+void qemu_add_data_dir(const char *path);
-+
- void qemu_add_exit_notifier(Notifier *notify);
- void qemu_remove_exit_notifier(Notifier *notify);
-diff --git a/softmmu/vl.c b/softmmu/vl.c
-index XXXXXXX..XXXXXXX 100644
---- a/softmmu/vl.c
-+++ b/softmmu/vl.c
-@@ -XXX,XX +XXX,XX @@ char *qemu_find_file(int type, const char *name)
-     return NULL;
- }
--static void qemu_add_data_dir(const char *path)
-+void qemu_add_data_dir(const char *path)
- {
-     int i;
-diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qtest/fuzz/fuzz.c
-+++ b/tests/qtest/fuzz/fuzz.c
-@@ -XXX,XX +XXX,XX @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
- {
-     char *target_name;
-+    char *dir;
-     /* Initialize qgraph and modules */
-     qos_graph_init();
-@@ -XXX,XX +XXX,XX @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
-     target_name = strstr(**argv, "-target-");
-     if (target_name) {        /* The binary name specifies the target */
-         target_name += strlen("-target-");
-+        /*
-+         * With oss-fuzz, the executable is kept in the root of a directory (we
-+         * cannot assume the path). All data (including bios binaries) must be
-+         * in the same dir, or a subdir. Thus, we cannot place the pc-bios so
-+         * that it would be in exec_dir/../pc-bios.
-+         * As a workaround, oss-fuzz allows us to use argv[0] to get the
-+         * location of the executable. Using this we add exec_dir/pc-bios to
-+         * the datadirs.
-+         */
-+        dir = g_build_filename(g_path_get_dirname(**argv), "pc-bios", NULL);
-+        if (g_file_test(dir, G_FILE_TEST_IS_DIR)) {
-+            qemu_add_data_dir(dir);
-+        }
-+        g_free(dir);
-     } else if (*argc > 1) {  /* The target is specified as an argument */
-         target_name = (*argv)[1];
-         if (!strstr(target_name, "--fuzz-target=")) {
---
-.25.4

-[PULL 04/11] fuzz: fix typo in i440fx-qtest-reboot arguments
+Deleted patch
-From: Alexander Bulekov <alxndr@bu.edu>
-Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
-Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Message-id: 20200512030133.29896-3-alxndr@bu.edu
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- tests/qtest/fuzz/i440fx_fuzz.c | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/tests/qtest/fuzz/i440fx_fuzz.c b/tests/qtest/fuzz/i440fx_fuzz.c
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qtest/fuzz/i440fx_fuzz.c
-+++ b/tests/qtest/fuzz/i440fx_fuzz.c
-@@ -XXX,XX +XXX,XX @@ static void i440fx_fuzz_qos_fork(QTestState *s,
- }
- static const char *i440fx_qtest_argv = TARGET_NAME " -machine accel=qtest"
--                                       "-m 0 -display none";
-+                                       " -m 0 -display none";
- static const char *i440fx_argv(FuzzTarget *t)
- {
-     return i440fx_qtest_argv;
---
-.25.4

-[PULL 05/11] fuzz: add mangled object name to linker script
+Deleted patch
-From: Alexander Bulekov <alxndr@bu.edu>
-Previously, we relied on "FuzzerTracePC*(.bss*)" to place libfuzzer's
-fuzzer::TPC object into our contiguous shared-memory region. This does
-not work for some libfuzzer builds, so this addition identifies the
-region by its mangled name: *(.bss._ZN6fuzzer3TPCE);
-Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
-Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
-Message-id: 20200512030133.29896-4-alxndr@bu.edu
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- tests/qtest/fuzz/fork_fuzz.ld | 5 +++++
-file changed, 5 insertions(+)
-diff --git a/tests/qtest/fuzz/fork_fuzz.ld b/tests/qtest/fuzz/fork_fuzz.ld
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qtest/fuzz/fork_fuzz.ld
-+++ b/tests/qtest/fuzz/fork_fuzz.ld
-@@ -XXX,XX +XXX,XX @@ SECTIONS
-       /* Internal Libfuzzer TracePC object which contains the ValueProfileMap */
-       FuzzerTracePC*(.bss*);
-+      /*
-+       * In case the above line fails, explicitly specify the (mangled) name of
-+       * the object we care about
-+       */
-+       *(.bss._ZN6fuzzer3TPCE);
-   }
-   .data.fuzz_end : ALIGN(4K)
-   {
---
-.25.4

-[PULL 06/11] fuzz: run the main-loop in fork-server process
+[PULL 1/3] block/blkio: Add virtio-blk-vfio-pci BlockDriver
-From: Alexander Bulekov <alxndr@bu.edu>
+From: Alberto Faria <afaria@redhat.com>
-Without this, the time since the last main-loop keeps increasing, as the
+libblkio 1.1.0 [1] introduces a virtio-blk-vfio-pci driver, which
-fuzzer runs. The forked children need to handle all the "past-due"
+accesses a virtio-blk PCI device using VFIO. Add a corresponding
-timers, slowing them down, over time. With this change, the
+BlockDriver.
 parent/fork-server process runs the main-loop, while waiting on the
 child, ensuring that the timer events do not pile up, over time.
-Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
+[1] https://gitlab.com/libblkio/libblkio/-/tree/v1.1.0
-Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
-Message-id: 20200512030133.29896-5-alxndr@bu.edu
+Signed-off-by: Alberto Faria <afaria@redhat.com>
 Message-id: 20221028131635.710267-1-afaria@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- tests/qtest/fuzz/i440fx_fuzz.c      | 1 +
+ qapi/block-core.json | 18 ++++++++++++++++++
- tests/qtest/fuzz/virtio_net_fuzz.c  | 2 ++
+ block/blkio.c        |  8 ++++++++
- tests/qtest/fuzz/virtio_scsi_fuzz.c | 2 ++
+files changed, 26 insertions(+)
 files changed, 5 insertions(+)
-diff --git a/tests/qtest/fuzz/i440fx_fuzz.c b/tests/qtest/fuzz/i440fx_fuzz.c
+diff --git a/qapi/block-core.json b/qapi/block-core.json
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qtest/fuzz/i440fx_fuzz.c
+--- a/qapi/block-core.json
-+++ b/tests/qtest/fuzz/i440fx_fuzz.c
++++ b/qapi/block-core.json
-@@ -XXX,XX +XXX,XX @@ static void i440fx_fuzz_qos_fork(QTestState *s,
+@@ -XXX,XX +XXX,XX @@
-         i440fx_fuzz_qos(s, Data, Size);
+             'raw', 'rbd',
-         _Exit(0);
+             { 'name': 'replication', 'if': 'CONFIG_REPLICATION' },
-     } else {
+             'ssh', 'throttle', 'vdi', 'vhdx',
-+        flush_events(s);
++            { 'name': 'virtio-blk-vfio-pci', 'if': 'CONFIG_BLKIO' },
-         wait(NULL);
+             { 'name': 'virtio-blk-vhost-user', 'if': 'CONFIG_BLKIO' },
-     }
+             { 'name': 'virtio-blk-vhost-vdpa', 'if': 'CONFIG_BLKIO' },
- }
+             'vmdk', 'vpc', 'vvfat' ] }
-diff --git a/tests/qtest/fuzz/virtio_net_fuzz.c b/tests/qtest/fuzz/virtio_net_fuzz.c
+@@ -XXX,XX +XXX,XX @@
    'data': { 'filename': 'str' },
    'if': 'CONFIG_BLKIO' }
 +##
 +# @BlockdevOptionsVirtioBlkVfioPci:
 +#
 +# Driver specific block device options for the virtio-blk-vfio-pci backend.
 +#
 +# @path: path to the PCI device's sysfs directory (e.g.
 +#        /sys/bus/pci/devices/0000:00:01.0).
 +#
 +# Since: 7.2
 +##
 +{ 'struct': 'BlockdevOptionsVirtioBlkVfioPci',
 +  'data': { 'path': 'str' },
 +  'if': 'CONFIG_BLKIO' }
 +
  ##
  # @BlockdevOptionsVirtioBlkVhostUser:
  #
@@ -XXX,XX +XXX,XX @@
        'throttle':   'BlockdevOptionsThrottle',
        'vdi':        'BlockdevOptionsGenericFormat',
        'vhdx':       'BlockdevOptionsGenericFormat',
 +      'virtio-blk-vfio-pci':
 +                    { 'type': 'BlockdevOptionsVirtioBlkVfioPci',
 +                      'if': 'CONFIG_BLKIO' },
        'virtio-blk-vhost-user':
                      { 'type': 'BlockdevOptionsVirtioBlkVhostUser',
                        'if': 'CONFIG_BLKIO' },
 diff --git a/block/blkio.c b/block/blkio.c
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qtest/fuzz/virtio_net_fuzz.c
+--- a/block/blkio.c
-+++ b/tests/qtest/fuzz/virtio_net_fuzz.c
++++ b/block/blkio.c
-@@ -XXX,XX +XXX,XX @@ static void virtio_net_fork_fuzz(QTestState *s,
+@@ -XXX,XX +XXX,XX @@
-         flush_events(s);
+  */
-         _Exit(0);
+ #define DRIVER_IO_URING "io_uring"
-     } else {
+ #define DRIVER_NVME_IO_URING "nvme-io_uring"
-+        flush_events(s);
++#define DRIVER_VIRTIO_BLK_VFIO_PCI "virtio-blk-vfio-pci"
-         wait(NULL);
+ #define DRIVER_VIRTIO_BLK_VHOST_USER "virtio-blk-vhost-user"
-     }
+ #define DRIVER_VIRTIO_BLK_VHOST_VDPA "virtio-blk-vhost-vdpa"
- }
-@@ -XXX,XX +XXX,XX @@ static void virtio_net_fork_fuzz_check_used(QTestState *s,
+@@ -XXX,XX +XXX,XX @@ static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags,
-         flush_events(s);
+         ret = blkio_io_uring_open(bs, options, flags, errp);
-         _Exit(0);
+     } else if (strcmp(blkio_driver, DRIVER_NVME_IO_URING) == 0) {
-     } else {
+         ret = blkio_nvme_io_uring(bs, options, flags, errp);
-+        flush_events(s);
++    } else if (strcmp(blkio_driver, DRIVER_VIRTIO_BLK_VFIO_PCI) == 0) {
-         wait(NULL);
++        ret = blkio_virtio_blk_common_open(bs, options, flags, errp);
-     }
+     } else if (strcmp(blkio_driver, DRIVER_VIRTIO_BLK_VHOST_USER) == 0) {
- }
+         ret = blkio_virtio_blk_common_open(bs, options, flags, errp);
-diff --git a/tests/qtest/fuzz/virtio_scsi_fuzz.c b/tests/qtest/fuzz/virtio_scsi_fuzz.c
+     } else if (strcmp(blkio_driver, DRIVER_VIRTIO_BLK_VHOST_VDPA) == 0) {
-index XXXXXXX..XXXXXXX 100644
+@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_nvme_io_uring = BLKIO_DRIVER(
---- a/tests/qtest/fuzz/virtio_scsi_fuzz.c
+     .bdrv_needs_filename = true,
-+++ b/tests/qtest/fuzz/virtio_scsi_fuzz.c
+ );
-@@ -XXX,XX +XXX,XX @@ static void virtio_scsi_fork_fuzz(QTestState *s,
-         flush_events(s);
++static BlockDriver bdrv_virtio_blk_vfio_pci = BLKIO_DRIVER(
-         _Exit(0);
++    DRIVER_VIRTIO_BLK_VFIO_PCI
-     } else {
++);
-+        flush_events(s);
++
-         wait(NULL);
+ static BlockDriver bdrv_virtio_blk_vhost_user = BLKIO_DRIVER(
-     }
+     DRIVER_VIRTIO_BLK_VHOST_USER
- }
+ );
-@@ -XXX,XX +XXX,XX @@ static void virtio_scsi_with_flag_fuzz(QTestState *s,
+@@ -XXX,XX +XXX,XX @@ static void bdrv_blkio_init(void)
-         }
+ {
-         _Exit(0);
+     bdrv_register(&bdrv_io_uring);
-     } else {
+     bdrv_register(&bdrv_nvme_io_uring);
-+        flush_events(s);
++    bdrv_register(&bdrv_virtio_blk_vfio_pci);
-         wait(NULL);
+     bdrv_register(&bdrv_virtio_blk_vhost_user);
-     }
+     bdrv_register(&bdrv_virtio_blk_vhost_vdpa);
  }
 --
-.25.4
+.38.1

-[PULL 07/11] memory: Rename memory_region_do_writeback -> memory_region_writeback
+Deleted patch
-From: Philippe Mathieu-Daudé <philmd@redhat.com>
-We usually use '_do_' for internal functions. Rename
-memory_region_do_writeback() as memory_region_writeback().
-Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
-Message-id: 20200508062456.23344-2-philmd@redhat.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- include/exec/memory.h | 4 ++--
- memory.c              | 2 +-
- target/arm/helper.c   | 2 +-
-files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/include/exec/memory.h b/include/exec/memory.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/exec/memory.h
-+++ b/include/exec/memory.h
-@@ -XXX,XX +XXX,XX @@ void *memory_region_get_ram_ptr(MemoryRegion *mr);
- void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize,
-                               Error **errp);
- /**
-- * memory_region_do_writeback: Trigger cache writeback or msync for
-+ * memory_region_writeback: Trigger cache writeback or msync for
-  * selected address range
-  *
-  * @mr: the memory region to be updated
-  * @addr: the initial address of the range to be written back
-  * @size: the size of the range to be written back
-  */
--void memory_region_do_writeback(MemoryRegion *mr, hwaddr addr, hwaddr size);
-+void memory_region_writeback(MemoryRegion *mr, hwaddr addr, hwaddr size);
- /**
-  * memory_region_set_log: Turn dirty logging on or off for a region.
-diff --git a/memory.c b/memory.c
-index XXXXXXX..XXXXXXX 100644
---- a/memory.c
-+++ b/memory.c
-@@ -XXX,XX +XXX,XX @@ void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize, Error **errp
- }
--void memory_region_do_writeback(MemoryRegion *mr, hwaddr addr, hwaddr size)
-+void memory_region_writeback(MemoryRegion *mr, hwaddr addr, hwaddr size)
- {
-     /*
-      * Might be extended case needed to cover
-diff --git a/target/arm/helper.c b/target/arm/helper.c
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/helper.c
-+++ b/target/arm/helper.c
-@@ -XXX,XX +XXX,XX @@ static void dccvap_writefn(CPUARMState *env, const ARMCPRegInfo *opaque,
-         mr = memory_region_from_host(haddr, &offset);
-         if (mr) {
--            memory_region_do_writeback(mr, offset, dline_size);
-+            memory_region_writeback(mr, offset, dline_size);
-         }
-     }
- }
---
-.25.4

-[PULL 08/11] memory: Extract memory_region_msync() from memory_region_writeback()
+Deleted patch
-From: Philippe Mathieu-Daudé <philmd@redhat.com>
-Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
-Message-id: 20200508062456.23344-3-philmd@redhat.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- include/exec/memory.h | 13 ++++++++++++-
- memory.c              | 10 ++++++++--
-files changed, 20 insertions(+), 3 deletions(-)
-diff --git a/include/exec/memory.h b/include/exec/memory.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/exec/memory.h
-+++ b/include/exec/memory.h
-@@ -XXX,XX +XXX,XX @@ void *memory_region_get_ram_ptr(MemoryRegion *mr);
-  */
- void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize,
-                               Error **errp);
-+
- /**
-- * memory_region_writeback: Trigger cache writeback or msync for
-+ * memory_region_msync: Synchronize selected address range of
-+ * a memory mapped region
-+ *
-+ * @mr: the memory region to be msync
-+ * @addr: the initial address of the range to be sync
-+ * @size: the size of the range to be sync
-+ */
-+void memory_region_msync(MemoryRegion *mr, hwaddr addr, hwaddr size);
-+
-+/**
-+ * memory_region_writeback: Trigger cache writeback for
-  * selected address range
-  *
-  * @mr: the memory region to be updated
-diff --git a/memory.c b/memory.c
-index XXXXXXX..XXXXXXX 100644
---- a/memory.c
-+++ b/memory.c
-@@ -XXX,XX +XXX,XX @@ void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize, Error **errp
-     qemu_ram_resize(mr->ram_block, newsize, errp);
- }
-+void memory_region_msync(MemoryRegion *mr, hwaddr addr, hwaddr size)
-+{
-+    if (mr->ram_block) {
-+        qemu_ram_writeback(mr->ram_block, addr, size);
-+    }
-+}
- void memory_region_writeback(MemoryRegion *mr, hwaddr addr, hwaddr size)
- {
-@@ -XXX,XX +XXX,XX @@ void memory_region_writeback(MemoryRegion *mr, hwaddr addr, hwaddr size)
-      * Might be extended case needed to cover
-      * different types of memory regions
-      */
--    if (mr->ram_block && mr->dirty_log_mask) {
--        qemu_ram_writeback(mr->ram_block, addr, size);
-+    if (mr->dirty_log_mask) {
-+        memory_region_msync(mr, addr, size);
-     }
- }
---
-.25.4

-[PULL 09/11] hw/block: Let the NVMe emulated device be target-agnostic
+Deleted patch
-From: Philippe Mathieu-Daudé <philmd@redhat.com>
-Now than the non-target specific memory_region_msync() function
-is available, use it to make this device target-agnostic.
-Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
-Message-id: 20200508062456.23344-4-philmd@redhat.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- hw/block/Makefile.objs | 2 +-
- hw/block/nvme.c        | 6 ++----
-files changed, 3 insertions(+), 5 deletions(-)
-diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs
-index XXXXXXX..XXXXXXX 100644
---- a/hw/block/Makefile.objs
-+++ b/hw/block/Makefile.objs
-@@ -XXX,XX +XXX,XX @@ common-obj-$(CONFIG_SH4) += tc58128.o
- obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o
- obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk.o
--obj-$(CONFIG_NVME_PCI) += nvme.o
-+common-obj-$(CONFIG_NVME_PCI) += nvme.o
- obj-y += dataplane/
-diff --git a/hw/block/nvme.c b/hw/block/nvme.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/block/nvme.c
-+++ b/hw/block/nvme.c
-@@ -XXX,XX +XXX,XX @@
- #include "qapi/visitor.h"
- #include "sysemu/hostmem.h"
- #include "sysemu/block-backend.h"
--#include "exec/ram_addr.h"
--
-+#include "exec/memory.h"
- #include "qemu/log.h"
- #include "qemu/module.h"
- #include "qemu/cutils.h"
-@@ -XXX,XX +XXX,XX @@ static uint64_t nvme_mmio_read(void *opaque, hwaddr addr, unsigned size)
-          */
-         if (addr == 0xE08 &&
-             (NVME_PMRCAP_PMRWBM(n->bar.pmrcap) & 0x02)) {
--            qemu_ram_writeback(n->pmrdev->mr.ram_block,
--                               0, n->pmrdev->size);
-+            memory_region_msync(&n->pmrdev->mr, 0, n->pmrdev->size);
-         }
-         memcpy(&val, ptr + addr, size);
-     } else {
---
-.25.4

-[PULL 11/11] block: Factor out bdrv_run_co()
+[PULL 2/3] block/blkio: Tolerate device size changes
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+From: Alberto Faria <afaria@redhat.com>
-We have a few bdrv_*() functions that can either spawn a new coroutine
+Some libblkio drivers may be able to work with regular files (e.g.,
-and wait for it with BDRV_POLL_WHILE() or use a fastpath if they are
+io_uring) or otherwise resizable devices. Conservatively set
-alreeady running in a coroutine. All of them duplicate basically the
+BlockDriver::has_variable_length to true to ensure bdrv_nb_sectors()
-same code.
+always gives up-to-date results.
-Factor the common code into a new function bdrv_run_co().
+Also implement BlockDriver::bdrv_co_truncate for the case where no
 preallocation is needed and the device already has a size compatible
 with what was requested.
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Signed-off-by: Alberto Faria <afaria@redhat.com>
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Message-id: 20221029122031.975273-1-afaria@redhat.com
 Message-id: 20200520144901.16589-1-vsementsov@virtuozzo.com
    [Factor out bdrv_run_co_entry too]
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/io.c | 193 ++++++++++++++++++++---------------------------------
+ block/blkio.c | 27 +++++++++++++++++++++++++++
-file changed, 72 insertions(+), 121 deletions(-)
+file changed, 27 insertions(+)
-diff --git a/block/io.c b/block/io.c
+diff --git a/block/blkio.c b/block/blkio.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/io.c
+--- a/block/blkio.c
-+++ b/block/io.c
++++ b/block/blkio.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ static int64_t blkio_getlength(BlockDriverState *bs)
- #include "qemu/main-loop.h"
+     return capacity;
  #include "sysemu/replay.h"
 -#define NOT_DONE 0x7fffffff /* used while emulated sync operation in progress */
 -
  /* Maximum bounce buffer for copy-on-read and write zeroes, in bytes */
  #define MAX_BOUNCE_BUFFER (32768 << BDRV_SECTOR_BITS)
@@ -XXX,XX +XXX,XX @@ static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset,
      return 0;
  }
-+typedef int coroutine_fn BdrvRequestEntry(void *opaque);
++static int coroutine_fn blkio_truncate(BlockDriverState *bs, int64_t offset,
-+typedef struct BdrvRunCo {
++                                       bool exact, PreallocMode prealloc,
-+    BdrvRequestEntry *entry;
++                                       BdrvRequestFlags flags, Error **errp)
-+    void *opaque;
++{
-+    int ret;
++    int64_t current_length;
 +    bool done;
 +    Coroutine *co; /* Coroutine, running bdrv_run_co_entry, for debugging */
 +} BdrvRunCo;
 +
-+static void coroutine_fn bdrv_run_co_entry(void *opaque)
++    if (prealloc != PREALLOC_MODE_OFF) {
-+{
++        error_setg(errp, "Unsupported preallocation mode '%s'",
-+    BdrvRunCo *arg = opaque;
++                   PreallocMode_str(prealloc));
 +        return -ENOTSUP;
 +    }
 +
-+    arg->ret = arg->entry(arg->opaque);
++    current_length = blkio_getlength(bs);
-+    arg->done = true;
++
-+    aio_wait_kick();
++    if (offset > current_length) {
 +        error_setg(errp, "Cannot grow device");
 +        return -EINVAL;
 +    } else if (exact && offset != current_length) {
 +        error_setg(errp, "Cannot resize device");
 +        return -ENOTSUP;
 +    }
 +
 +    return 0;
 +}
 +
-+static int bdrv_run_co(BlockDriverState *bs, BdrvRequestEntry *entry,
+ static int blkio_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
 +                       void *opaque)
 +{
 +    if (qemu_in_coroutine()) {
 +        /* Fast-path if already in coroutine context */
 +        return entry(opaque);
 +    } else {
 +        BdrvRunCo s = { .entry = entry, .opaque = opaque };
 +
 +        s.co = qemu_coroutine_create(bdrv_run_co_entry, &s);
 +        bdrv_coroutine_enter(bs, s.co);
 +
 +        BDRV_POLL_WHILE(bs, !s.done);
 +
 +        return s.ret;
 +    }
 +}
 +
  typedef struct RwCo {
      BdrvChild *child;
      int64_t offset;
      QEMUIOVector *qiov;
      bool is_write;
 -    int ret;
      BdrvRequestFlags flags;
  } RwCo;
 -static void coroutine_fn bdrv_rw_co_entry(void *opaque)
 +static int coroutine_fn bdrv_rw_co_entry(void *opaque)
  {
-     RwCo *rwco = opaque;
+     return 0;
+@@ -XXX,XX +XXX,XX @@ static void blkio_refresh_limits(BlockDriverState *bs, Error **errp)
-     if (!rwco->is_write) {
+     { \
--        rwco->ret = bdrv_co_preadv(rwco->child, rwco->offset,
+         .format_name             = name, \
--                                   rwco->qiov->size, rwco->qiov,
+         .protocol_name           = name, \
--                                   rwco->flags);
++        .has_variable_length     = true, \
-+        return bdrv_co_preadv(rwco->child, rwco->offset,
+         .instance_size           = sizeof(BDRVBlkioState), \
-+                              rwco->qiov->size, rwco->qiov,
+         .bdrv_file_open          = blkio_file_open, \
-+                              rwco->flags);
+         .bdrv_close              = blkio_close, \
-     } else {
+         .bdrv_getlength          = blkio_getlength, \
--        rwco->ret = bdrv_co_pwritev(rwco->child, rwco->offset,
++        .bdrv_co_truncate        = blkio_truncate, \
--                                    rwco->qiov->size, rwco->qiov,
+         .bdrv_get_info           = blkio_get_info, \
--                                    rwco->flags);
+         .bdrv_attach_aio_context = blkio_attach_aio_context, \
-+        return bdrv_co_pwritev(rwco->child, rwco->offset,
+         .bdrv_detach_aio_context = blkio_detach_aio_context, \
 +                               rwco->qiov->size, rwco->qiov,
 +                               rwco->flags);
      }
 -    aio_wait_kick();
  }
  /*
@@ -XXX,XX +XXX,XX @@ static int bdrv_prwv_co(BdrvChild *child, int64_t offset,
                          QEMUIOVector *qiov, bool is_write,
                          BdrvRequestFlags flags)
  {
 -    Coroutine *co;
      RwCo rwco = {
          .child = child,
          .offset = offset,
          .qiov = qiov,
          .is_write = is_write,
 -        .ret = NOT_DONE,
          .flags = flags,
      };
 -    if (qemu_in_coroutine()) {
 -        /* Fast-path if already in coroutine context */
 -        bdrv_rw_co_entry(&rwco);
 -    } else {
 -        co = qemu_coroutine_create(bdrv_rw_co_entry, &rwco);
 -        bdrv_coroutine_enter(child->bs, co);
 -        BDRV_POLL_WHILE(child->bs, rwco.ret == NOT_DONE);
 -    }
 -    return rwco.ret;
 +    return bdrv_run_co(child->bs, bdrv_rw_co_entry, &rwco);
  }
  int bdrv_pwrite_zeroes(BdrvChild *child, int64_t offset,
@@ -XXX,XX +XXX,XX @@ typedef struct BdrvCoBlockStatusData {
      int64_t *pnum;
      int64_t *map;
      BlockDriverState **file;
 -    int ret;
 -    bool done;
  } BdrvCoBlockStatusData;
  int coroutine_fn bdrv_co_block_status_from_file(BlockDriverState *bs,
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_co_block_status_above(BlockDriverState *bs,
  }
  /* Coroutine wrapper for bdrv_block_status_above() */
 -static void coroutine_fn bdrv_block_status_above_co_entry(void *opaque)
 +static int coroutine_fn bdrv_block_status_above_co_entry(void *opaque)
  {
      BdrvCoBlockStatusData *data = opaque;
 -    data->ret = bdrv_co_block_status_above(data->bs, data->base,
 -                                           data->want_zero,
 -                                           data->offset, data->bytes,
 -                                           data->pnum, data->map, data->file);
 -    data->done = true;
 -    aio_wait_kick();
 +    return bdrv_co_block_status_above(data->bs, data->base,
 +                                      data->want_zero,
 +                                      data->offset, data->bytes,
 +                                      data->pnum, data->map, data->file);
  }
  /*
@@ -XXX,XX +XXX,XX @@ static int bdrv_common_block_status_above(BlockDriverState *bs,
                                            int64_t *map,
                                            BlockDriverState **file)
  {
 -    Coroutine *co;
      BdrvCoBlockStatusData data = {
          .bs = bs,
          .base = base,
@@ -XXX,XX +XXX,XX @@ static int bdrv_common_block_status_above(BlockDriverState *bs,
          .pnum = pnum,
          .map = map,
          .file = file,
 -        .done = false,
      };
 -    if (qemu_in_coroutine()) {
 -        /* Fast-path if already in coroutine context */
 -        bdrv_block_status_above_co_entry(&data);
 -    } else {
 -        co = qemu_coroutine_create(bdrv_block_status_above_co_entry, &data);
 -        bdrv_coroutine_enter(bs, co);
 -        BDRV_POLL_WHILE(bs, !data.done);
 -    }
 -    return data.ret;
 +    return bdrv_run_co(bs, bdrv_block_status_above_co_entry, &data);
  }
  int bdrv_block_status_above(BlockDriverState *bs, BlockDriverState *base,
@@ -XXX,XX +XXX,XX @@ typedef struct BdrvVmstateCo {
      QEMUIOVector        *qiov;
      int64_t             pos;
      bool                is_read;
 -    int                 ret;
  } BdrvVmstateCo;
  static int coroutine_fn
@@ -XXX,XX +XXX,XX @@ bdrv_co_rw_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos,
      return ret;
  }
 -static void coroutine_fn bdrv_co_rw_vmstate_entry(void *opaque)
 +static int coroutine_fn bdrv_co_rw_vmstate_entry(void *opaque)
  {
      BdrvVmstateCo *co = opaque;
 -    co->ret = bdrv_co_rw_vmstate(co->bs, co->qiov, co->pos, co->is_read);
 -    aio_wait_kick();
 +
 +    return bdrv_co_rw_vmstate(co->bs, co->qiov, co->pos, co->is_read);
  }
  static inline int
  bdrv_rw_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos,
                  bool is_read)
  {
 -    if (qemu_in_coroutine()) {
 -        return bdrv_co_rw_vmstate(bs, qiov, pos, is_read);
 -    } else {
 -        BdrvVmstateCo data = {
 -            .bs         = bs,
 -            .qiov       = qiov,
 -            .pos        = pos,
 -            .is_read    = is_read,
 -            .ret        = -EINPROGRESS,
 -        };
 -        Coroutine *co = qemu_coroutine_create(bdrv_co_rw_vmstate_entry, &data);
 +    BdrvVmstateCo data = {
 +        .bs         = bs,
 +        .qiov       = qiov,
 +        .pos        = pos,
 +        .is_read    = is_read,
 +    };
 -        bdrv_coroutine_enter(bs, co);
 -        BDRV_POLL_WHILE(bs, data.ret == -EINPROGRESS);
 -        return data.ret;
 -    }
 +    return bdrv_run_co(bs, bdrv_co_rw_vmstate_entry, &data);
  }
  int bdrv_save_vmstate(BlockDriverState *bs, const uint8_t *buf,
@@ -XXX,XX +XXX,XX @@ void bdrv_aio_cancel_async(BlockAIOCB *acb)
  /**************************************************************/
  /* Coroutine block device emulation */
 -typedef struct FlushCo {
 -    BlockDriverState *bs;
 -    int ret;
 -} FlushCo;
 -
 -
 -static void coroutine_fn bdrv_flush_co_entry(void *opaque)
 +static int coroutine_fn bdrv_flush_co_entry(void *opaque)
  {
 -    FlushCo *rwco = opaque;
 -
 -    rwco->ret = bdrv_co_flush(rwco->bs);
 -    aio_wait_kick();
 +    return bdrv_co_flush(opaque);
  }
  int coroutine_fn bdrv_co_flush(BlockDriverState *bs)
@@ -XXX,XX +XXX,XX @@ early_exit:
  int bdrv_flush(BlockDriverState *bs)
  {
 -    Coroutine *co;
 -    FlushCo flush_co = {
 -        .bs = bs,
 -        .ret = NOT_DONE,
 -    };
 -
 -    if (qemu_in_coroutine()) {
 -        /* Fast-path if already in coroutine context */
 -        bdrv_flush_co_entry(&flush_co);
 -    } else {
 -        co = qemu_coroutine_create(bdrv_flush_co_entry, &flush_co);
 -        bdrv_coroutine_enter(bs, co);
 -        BDRV_POLL_WHILE(bs, flush_co.ret == NOT_DONE);
 -    }
 -
 -    return flush_co.ret;
 +    return bdrv_run_co(bs, bdrv_flush_co_entry, bs);
  }
  typedef struct DiscardCo {
      BdrvChild *child;
      int64_t offset;
      int64_t bytes;
 -    int ret;
  } DiscardCo;
 -static void coroutine_fn bdrv_pdiscard_co_entry(void *opaque)
 +
 +static int coroutine_fn bdrv_pdiscard_co_entry(void *opaque)
  {
      DiscardCo *rwco = opaque;
 -    rwco->ret = bdrv_co_pdiscard(rwco->child, rwco->offset, rwco->bytes);
 -    aio_wait_kick();
 +    return bdrv_co_pdiscard(rwco->child, rwco->offset, rwco->bytes);
  }
  int coroutine_fn bdrv_co_pdiscard(BdrvChild *child, int64_t offset,
@@ -XXX,XX +XXX,XX @@ out:
  int bdrv_pdiscard(BdrvChild *child, int64_t offset, int64_t bytes)
  {
 -    Coroutine *co;
      DiscardCo rwco = {
          .child = child,
          .offset = offset,
          .bytes = bytes,
 -        .ret = NOT_DONE,
      };
 -    if (qemu_in_coroutine()) {
 -        /* Fast-path if already in coroutine context */
 -        bdrv_pdiscard_co_entry(&rwco);
 -    } else {
 -        co = qemu_coroutine_create(bdrv_pdiscard_co_entry, &rwco);
 -        bdrv_coroutine_enter(child->bs, co);
 -        BDRV_POLL_WHILE(child->bs, rwco.ret == NOT_DONE);
 -    }
 -
 -    return rwco.ret;
 +    return bdrv_run_co(child->bs, bdrv_pdiscard_co_entry, &rwco);
  }
  int bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf)
@@ -XXX,XX +XXX,XX @@ typedef struct TruncateCo {
      PreallocMode prealloc;
      BdrvRequestFlags flags;
      Error **errp;
 -    int ret;
  } TruncateCo;
 -static void coroutine_fn bdrv_truncate_co_entry(void *opaque)
 +static int coroutine_fn bdrv_truncate_co_entry(void *opaque)
  {
      TruncateCo *tco = opaque;
 -    tco->ret = bdrv_co_truncate(tco->child, tco->offset, tco->exact,
 -                                tco->prealloc, tco->flags, tco->errp);
 -    aio_wait_kick();
 +
 +    return bdrv_co_truncate(tco->child, tco->offset, tco->exact,
 +                            tco->prealloc, tco->flags, tco->errp);
  }
  int bdrv_truncate(BdrvChild *child, int64_t offset, bool exact,
                    PreallocMode prealloc, BdrvRequestFlags flags, Error **errp)
  {
 -    Coroutine *co;
      TruncateCo tco = {
          .child      = child,
          .offset     = offset,
@@ -XXX,XX +XXX,XX @@ int bdrv_truncate(BdrvChild *child, int64_t offset, bool exact,
          .prealloc   = prealloc,
          .flags      = flags,
          .errp       = errp,
 -        .ret        = NOT_DONE,
      };
 -    if (qemu_in_coroutine()) {
 -        /* Fast-path if already in coroutine context */
 -        bdrv_truncate_co_entry(&tco);
 -    } else {
 -        co = qemu_coroutine_create(bdrv_truncate_co_entry, &tco);
 -        bdrv_coroutine_enter(child->bs, co);
 -        BDRV_POLL_WHILE(child->bs, tco.ret == NOT_DONE);
 -    }
 -
 -    return tco.ret;
 +    return bdrv_run_co(child->bs, bdrv_truncate_co_entry, &tco);
  }
 --
-.25.4
+.38.1

-[PULL 10/11] exec: Rename qemu_ram_writeback() as qemu_ram_msync()
+[PULL 3/3] block/blkio: Make driver nvme-io_uring take a "path" instead of a "filename"
-From: Philippe Mathieu-Daudé <philmd@redhat.com>
+From: Alberto Faria <afaria@redhat.com>
-Rename qemu_ram_writeback() as qemu_ram_msync() to better
+The nvme-io_uring driver expects a character special file such as
-match what it does.
+/dev/ng0n1. Follow the convention of having a "filename" option when a
 regular file is expected, and a "path" option otherwise.
-Suggested-by: Stefan Hajnoczi <stefanha@redhat.com>
+This makes io_uring the only libblkio-based driver with a "filename"
-Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+option, as it accepts a regular file (even though it can also take a
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+block special file).
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Alberto Faria <afaria@redhat.com>
-Message-id: 20200508062456.23344-5-philmd@redhat.com
+Message-id: 20221028233854.839933-1-afaria@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- include/exec/ram_addr.h | 4 ++--
+ qapi/block-core.json |  4 ++--
- exec.c                  | 2 +-
+ block/blkio.c        | 12 ++++++++----
- memory.c                | 2 +-
+files changed, 10 insertions(+), 6 deletions(-)
 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
+diff --git a/qapi/block-core.json b/qapi/block-core.json
 index XXXXXXX..XXXXXXX 100644
---- a/include/exec/ram_addr.h
+--- a/qapi/block-core.json
-+++ b/include/exec/ram_addr.h
++++ b/qapi/block-core.json
-@@ -XXX,XX +XXX,XX @@ void qemu_ram_free(RAMBlock *block);
+@@ -XXX,XX +XXX,XX @@
+ #
- int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp);
+ # Driver specific block device options for the nvme-io_uring backend.
+ #
--void qemu_ram_writeback(RAMBlock *block, ram_addr_t start, ram_addr_t length);
+-# @filename: path to the image file
-+void qemu_ram_msync(RAMBlock *block, ram_addr_t start, ram_addr_t length);
++# @path: path to the image file
+ #
- /* Clear whole block of mem */
+ # Since: 7.2
- static inline void qemu_ram_block_writeback(RAMBlock *block)
+ ##
  { 'struct': 'BlockdevOptionsNvmeIoUring',
 -  'data': { 'filename': 'str' },
 +  'data': { 'path': 'str' },
    'if': 'CONFIG_BLKIO' }
  ##
 diff --git a/block/blkio.c b/block/blkio.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/blkio.c
 +++ b/block/blkio.c
@@ -XXX,XX +XXX,XX @@ static int blkio_io_uring_open(BlockDriverState *bs, QDict *options, int flags,
  static int blkio_nvme_io_uring(BlockDriverState *bs, QDict *options, int flags,
                                 Error **errp)
  {
--    qemu_ram_writeback(block, 0, block->used_length);
+-    const char *filename = qdict_get_str(options, "filename");
-+    qemu_ram_msync(block, 0, block->used_length);
++    const char *path = qdict_get_try_str(options, "path");
- }
+     BDRVBlkioState *s = bs->opaque;
+     int ret;
- #define DIRTY_CLIENTS_ALL     ((1 << DIRTY_MEMORY_NUM) - 1)
-diff --git a/exec.c b/exec.c
+-    ret = blkio_set_str(s->blkio, "path", filename);
-index XXXXXXX..XXXXXXX 100644
+-    qdict_del(options, "filename");
---- a/exec.c
++    if (!path) {
-+++ b/exec.c
++        error_setg(errp, "missing 'path' option");
-@@ -XXX,XX +XXX,XX @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp)
++        return -EINVAL;
-  * Otherwise no-op.
++    }
-  * @Note: this is supposed to be a synchronous op.
++
-  */
++    ret = blkio_set_str(s->blkio, "path", path);
--void qemu_ram_writeback(RAMBlock *block, ram_addr_t start, ram_addr_t length)
++    qdict_del(options, "path");
-+void qemu_ram_msync(RAMBlock *block, ram_addr_t start, ram_addr_t length)
+     if (ret < 0) {
- {
+         error_setg_errno(errp, -ret, "failed to set path: %s",
-     /* The requested range should fit in within the block range */
+                          blkio_get_error_msg());
-     g_assert((start + length) <= block->used_length);
+@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_io_uring = BLKIO_DRIVER(
-diff --git a/memory.c b/memory.c
-index XXXXXXX..XXXXXXX 100644
+ static BlockDriver bdrv_nvme_io_uring = BLKIO_DRIVER(
---- a/memory.c
+     DRIVER_NVME_IO_URING,
-+++ b/memory.c
+-    .bdrv_needs_filename = true,
-@@ -XXX,XX +XXX,XX @@ void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize, Error **errp
+ );
- void memory_region_msync(MemoryRegion *mr, hwaddr addr, hwaddr size)
- {
+ static BlockDriver bdrv_virtio_blk_vfio_pci = BLKIO_DRIVER(
      if (mr->ram_block) {
 -        qemu_ram_writeback(mr->ram_block, addr, size);
 +        qemu_ram_msync(mr->ram_block, addr, size);
      }
  }
 --
-.25.4
+.38.1

The following changes since commit 66234fee9c2d37bfbc523aa8d0ae5300a14cc10e:

Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-202=
00603' into staging (2020-06-04 11:38:48 +0100)

are available in the Git repository at:

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

for you to fetch changes up to 7d2410cea154bf915fb30179ebda3b17ac36e70e:

block: Factor out bdrv_run_co() (2020-06-05 09:54:48 +0100)

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

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

Alexander Bulekov (4):
  fuzz: add datadir for oss-fuzz compatability
  fuzz: fix typo in i440fx-qtest-reboot arguments
  fuzz: add mangled object name to linker script
  fuzz: run the main-loop in fork-server process

Philippe Mathieu-Daud=C3=A9 (4):
  memory: Rename memory_region_do_writeback -> memory_region_writeback
  memory: Extract memory_region_msync() from memory_region_writeback()
  hw/block: Let the NVMe emulated device be target-agnostic
  exec: Rename qemu_ram_writeback() as qemu_ram_msync()

Stefano Garzarella (2):
  io_uring: retry io_uring_submit() if it fails with errno=3DEINTR
  io_uring: use io_uring_cq_ready() to check for ready cqes

Vladimir Sementsov-Ogievskiy (1):
  block: Factor out bdrv_run_co()

--=20
2.25.4

From: Stefano Garzarella <sgarzare@redhat.com>

As recently documented [1], io_uring_enter(2) syscall can return an
error (errno=EINTR) if the operation was interrupted by a delivery
of a signal before it could complete.

This should happen when IORING_ENTER_GETEVENTS flag is used, for
example during io_uring_submit_and_wait() or during io_uring_submit()
when IORING_SETUP_IOPOLL is enabled.

We shouldn't have this problem for now, but it's better to prevent it.

[1] https://github.com/axboe/liburing/commit/344355ec6619de8f4e64584c9736530b5346e4f4

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-id: 20200519133041.112138-1-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/io_uring.c | 2 +-
 1 file changed, 1 insertion(+), 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 int ioq_submit(LuringState *s)
         trace_luring_io_uring_submit(s, ret);
         /* Prevent infinite loop if submission is refused */
         if (ret <= 0) {
-            if (ret == -EAGAIN) {
+            if (ret == -EAGAIN || ret == -EINTR) {
                 continue;
             }
             break;
-- 
2.25.4

From: Stefano Garzarella <sgarzare@redhat.com>

In qemu_luring_poll_cb() we are not using the cqe peeked from the
CQ ring. We are using io_uring_peek_cqe() only to see if there
are cqes ready, so we can replace it with io_uring_cq_ready().

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-id: 20200519134942.118178-1-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/io_uring.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

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 qemu_luring_completion_cb(void *opaque)
 static bool qemu_luring_poll_cb(void *opaque)
 {
     LuringState *s = opaque;
-    struct io_uring_cqe *cqes;
 
-    if (io_uring_peek_cqe(&s->ring, &cqes) == 0) {
-        if (cqes) {
-            luring_process_completions_and_submit(s);
-            return true;
-        }
+    if (io_uring_cq_ready(&s->ring)) {
+        luring_process_completions_and_submit(s);
+        return true;
     }
 
     return false;
-- 
2.25.4

From: Alexander Bulekov <alxndr@bu.edu>

This allows us to keep pc-bios in executable_dir/pc-bios, rather than
executable_dir/../pc-bios, which is incompatible with oss-fuzz' file
structure.

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Message-id: 20200512030133.29896-2-alxndr@bu.edu
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/sysemu/sysemu.h |  2 ++
 softmmu/vl.c            |  2 +-
 tests/qtest/fuzz/fuzz.c | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index XXXXXXX..XXXXXXX 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -XXX,XX +XXX,XX @@ extern const char *qemu_name;
 extern QemuUUID qemu_uuid;
 extern bool qemu_uuid_set;
 
+void qemu_add_data_dir(const char *path);
+
 void qemu_add_exit_notifier(Notifier *notify);
 void qemu_remove_exit_notifier(Notifier *notify);
 
diff --git a/softmmu/vl.c b/softmmu/vl.c
index XXXXXXX..XXXXXXX 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -XXX,XX +XXX,XX @@ char *qemu_find_file(int type, const char *name)
     return NULL;
 }
 
-static void qemu_add_data_dir(const char *path)
+void qemu_add_data_dir(const char *path)
 {
     int i;
 
diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/qtest/fuzz/fuzz.c
+++ b/tests/qtest/fuzz/fuzz.c
@@ -XXX,XX +XXX,XX @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
 {
 
     char *target_name;
+    char *dir;
 
     /* Initialize qgraph and modules */
     qos_graph_init();
@@ -XXX,XX +XXX,XX @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
     target_name = strstr(**argv, "-target-");
     if (target_name) {        /* The binary name specifies the target */
         target_name += strlen("-target-");
+        /*
+         * With oss-fuzz, the executable is kept in the root of a directory (we
+         * cannot assume the path). All data (including bios binaries) must be
+         * in the same dir, or a subdir. Thus, we cannot place the pc-bios so
+         * that it would be in exec_dir/../pc-bios.
+         * As a workaround, oss-fuzz allows us to use argv[0] to get the
+         * location of the executable. Using this we add exec_dir/pc-bios to
+         * the datadirs.
+         */
+        dir = g_build_filename(g_path_get_dirname(**argv), "pc-bios", NULL);
+        if (g_file_test(dir, G_FILE_TEST_IS_DIR)) {
+            qemu_add_data_dir(dir);
+        }
+        g_free(dir);
     } else if (*argc > 1) {  /* The target is specified as an argument */
         target_name = (*argv)[1];
         if (!strstr(target_name, "--fuzz-target=")) {
-- 
2.25.4

From: Alexander Bulekov <alxndr@bu.edu>

Previously, we relied on "FuzzerTracePC*(.bss*)" to place libfuzzer's
fuzzer::TPC object into our contiguous shared-memory region. This does
not work for some libfuzzer builds, so this addition identifies the
region by its mangled name: *(.bss._ZN6fuzzer3TPCE);

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Message-id: 20200512030133.29896-4-alxndr@bu.edu
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 tests/qtest/fuzz/fork_fuzz.ld | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/qtest/fuzz/fork_fuzz.ld b/tests/qtest/fuzz/fork_fuzz.ld
index XXXXXXX..XXXXXXX 100644
--- a/tests/qtest/fuzz/fork_fuzz.ld
+++ b/tests/qtest/fuzz/fork_fuzz.ld
@@ -XXX,XX +XXX,XX @@ SECTIONS
 
       /* Internal Libfuzzer TracePC object which contains the ValueProfileMap */
       FuzzerTracePC*(.bss*);
+      /*
+       * In case the above line fails, explicitly specify the (mangled) name of
+       * the object we care about
+       */
+       *(.bss._ZN6fuzzer3TPCE);
   }
   .data.fuzz_end : ALIGN(4K)
   {
-- 
2.25.4

From: Alexander Bulekov <alxndr@bu.edu>

Without this, the time since the last main-loop keeps increasing, as the
fuzzer runs. The forked children need to handle all the "past-due"
timers, slowing them down, over time. With this change, the
parent/fork-server process runs the main-loop, while waiting on the
child, ensuring that the timer events do not pile up, over time.

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Message-id: 20200512030133.29896-5-alxndr@bu.edu
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 tests/qtest/fuzz/i440fx_fuzz.c      | 1 +
 tests/qtest/fuzz/virtio_net_fuzz.c  | 2 ++
 tests/qtest/fuzz/virtio_scsi_fuzz.c | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/tests/qtest/fuzz/i440fx_fuzz.c b/tests/qtest/fuzz/i440fx_fuzz.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/qtest/fuzz/i440fx_fuzz.c
+++ b/tests/qtest/fuzz/i440fx_fuzz.c
@@ -XXX,XX +XXX,XX @@ static void i440fx_fuzz_qos_fork(QTestState *s,
         i440fx_fuzz_qos(s, Data, Size);
         _Exit(0);
     } else {
+        flush_events(s);
         wait(NULL);
     }
 }
diff --git a/tests/qtest/fuzz/virtio_net_fuzz.c b/tests/qtest/fuzz/virtio_net_fuzz.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/qtest/fuzz/virtio_net_fuzz.c
+++ b/tests/qtest/fuzz/virtio_net_fuzz.c
@@ -XXX,XX +XXX,XX @@ static void virtio_net_fork_fuzz(QTestState *s,
         flush_events(s);
         _Exit(0);
     } else {
+        flush_events(s);
         wait(NULL);
     }
 }
@@ -XXX,XX +XXX,XX @@ static void virtio_net_fork_fuzz_check_used(QTestState *s,
         flush_events(s);
         _Exit(0);
     } else {
+        flush_events(s);
         wait(NULL);
     }
 }
diff --git a/tests/qtest/fuzz/virtio_scsi_fuzz.c b/tests/qtest/fuzz/virtio_scsi_fuzz.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/qtest/fuzz/virtio_scsi_fuzz.c
+++ b/tests/qtest/fuzz/virtio_scsi_fuzz.c
@@ -XXX,XX +XXX,XX @@ static void virtio_scsi_fork_fuzz(QTestState *s,
         flush_events(s);
         _Exit(0);
     } else {
+        flush_events(s);
         wait(NULL);
     }
 }
@@ -XXX,XX +XXX,XX @@ static void virtio_scsi_with_flag_fuzz(QTestState *s,
         }
         _Exit(0);
     } else {
+        flush_events(s);
         wait(NULL);
     }
 }
-- 
2.25.4

From: Philippe Mathieu-Daudé <philmd@redhat.com>

We usually use '_do_' for internal functions. Rename
memory_region_do_writeback() as memory_region_writeback().

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20200508062456.23344-2-philmd@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/exec/memory.h | 4 ++--
 memory.c              | 2 +-
 target/arm/helper.c   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/exec/memory.h b/include/exec/memory.h
index XXXXXXX..XXXXXXX 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -XXX,XX +XXX,XX @@ void *memory_region_get_ram_ptr(MemoryRegion *mr);
 void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize,
                               Error **errp);
 /**
- * memory_region_do_writeback: Trigger cache writeback or msync for
+ * memory_region_writeback: Trigger cache writeback or msync for
  * selected address range
  *
  * @mr: the memory region to be updated
  * @addr: the initial address of the range to be written back
  * @size: the size of the range to be written back
  */
-void memory_region_do_writeback(MemoryRegion *mr, hwaddr addr, hwaddr size);
+void memory_region_writeback(MemoryRegion *mr, hwaddr addr, hwaddr size);
 
 /**
  * memory_region_set_log: Turn dirty logging on or off for a region.
diff --git a/memory.c b/memory.c
index XXXXXXX..XXXXXXX 100644
--- a/memory.c
+++ b/memory.c
@@ -XXX,XX +XXX,XX @@ void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize, Error **errp
 }
 
 
-void memory_region_do_writeback(MemoryRegion *mr, hwaddr addr, hwaddr size)
+void memory_region_writeback(MemoryRegion *mr, hwaddr addr, hwaddr size)
 {
     /*
      * Might be extended case needed to cover
diff --git a/target/arm/helper.c b/target/arm/helper.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -XXX,XX +XXX,XX @@ static void dccvap_writefn(CPUARMState *env, const ARMCPRegInfo *opaque,
         mr = memory_region_from_host(haddr, &offset);
 
         if (mr) {
-            memory_region_do_writeback(mr, offset, dline_size);
+            memory_region_writeback(mr, offset, dline_size);
         }
     }
 }
-- 
2.25.4

From: Philippe Mathieu-Daudé <philmd@redhat.com>

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20200508062456.23344-3-philmd@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/exec/memory.h | 13 ++++++++++++-
 memory.c              | 10 ++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/include/exec/memory.h b/include/exec/memory.h
index XXXXXXX..XXXXXXX 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -XXX,XX +XXX,XX @@ void *memory_region_get_ram_ptr(MemoryRegion *mr);
  */
 void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize,
                               Error **errp);
+
 /**
- * memory_region_writeback: Trigger cache writeback or msync for
+ * memory_region_msync: Synchronize selected address range of
+ * a memory mapped region
+ *
+ * @mr: the memory region to be msync
+ * @addr: the initial address of the range to be sync
+ * @size: the size of the range to be sync
+ */
+void memory_region_msync(MemoryRegion *mr, hwaddr addr, hwaddr size);
+
+/**
+ * memory_region_writeback: Trigger cache writeback for
  * selected address range
  *
  * @mr: the memory region to be updated
diff --git a/memory.c b/memory.c
index XXXXXXX..XXXXXXX 100644
--- a/memory.c
+++ b/memory.c
@@ -XXX,XX +XXX,XX @@ void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize, Error **errp
     qemu_ram_resize(mr->ram_block, newsize, errp);
 }
 
+void memory_region_msync(MemoryRegion *mr, hwaddr addr, hwaddr size)
+{
+    if (mr->ram_block) {
+        qemu_ram_writeback(mr->ram_block, addr, size);
+    }
+}
 
 void memory_region_writeback(MemoryRegion *mr, hwaddr addr, hwaddr size)
 {
@@ -XXX,XX +XXX,XX @@ void memory_region_writeback(MemoryRegion *mr, hwaddr addr, hwaddr size)
      * Might be extended case needed to cover
      * different types of memory regions
      */
-    if (mr->ram_block && mr->dirty_log_mask) {
-        qemu_ram_writeback(mr->ram_block, addr, size);
+    if (mr->dirty_log_mask) {
+        memory_region_msync(mr, addr, size);
     }
 }
 
-- 
2.25.4

From: Philippe Mathieu-Daudé <philmd@redhat.com>

Now than the non-target specific memory_region_msync() function
is available, use it to make this device target-agnostic.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20200508062456.23344-4-philmd@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/block/Makefile.objs | 2 +-
 hw/block/nvme.c        | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/Makefile.objs
+++ b/hw/block/Makefile.objs
@@ -XXX,XX +XXX,XX @@ common-obj-$(CONFIG_SH4) += tc58128.o
 
 obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o
 obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk.o
-obj-$(CONFIG_NVME_PCI) += nvme.o
+common-obj-$(CONFIG_NVME_PCI) += nvme.o
 
 obj-y += dataplane/
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -XXX,XX +XXX,XX @@
 #include "qapi/visitor.h"
 #include "sysemu/hostmem.h"
 #include "sysemu/block-backend.h"
-#include "exec/ram_addr.h"
-
+#include "exec/memory.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qemu/cutils.h"
@@ -XXX,XX +XXX,XX @@ static uint64_t nvme_mmio_read(void *opaque, hwaddr addr, unsigned size)
          */
         if (addr == 0xE08 &&
             (NVME_PMRCAP_PMRWBM(n->bar.pmrcap) & 0x02)) {
-            qemu_ram_writeback(n->pmrdev->mr.ram_block,
-                               0, n->pmrdev->size);
+            memory_region_msync(&n->pmrdev->mr, 0, n->pmrdev->size);
         }
         memcpy(&val, ptr + addr, size);
     } else {
-- 
2.25.4

From: Philippe Mathieu-Daudé <philmd@redhat.com>

Rename qemu_ram_writeback() as qemu_ram_msync() to better
match what it does.

Suggested-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20200508062456.23344-5-philmd@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/exec/ram_addr.h | 4 ++--
 exec.c                  | 2 +-
 memory.c                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
index XXXXXXX..XXXXXXX 100644
--- a/include/exec/ram_addr.h
+++ b/include/exec/ram_addr.h
@@ -XXX,XX +XXX,XX @@ void qemu_ram_free(RAMBlock *block);
 
 int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp);
 
-void qemu_ram_writeback(RAMBlock *block, ram_addr_t start, ram_addr_t length);
+void qemu_ram_msync(RAMBlock *block, ram_addr_t start, ram_addr_t length);
 
 /* Clear whole block of mem */
 static inline void qemu_ram_block_writeback(RAMBlock *block)
 {
-    qemu_ram_writeback(block, 0, block->used_length);
+    qemu_ram_msync(block, 0, block->used_length);
 }
 
 #define DIRTY_CLIENTS_ALL     ((1 << DIRTY_MEMORY_NUM) - 1)
diff --git a/exec.c b/exec.c
index XXXXXXX..XXXXXXX 100644
--- a/exec.c
+++ b/exec.c
@@ -XXX,XX +XXX,XX @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp)
  * Otherwise no-op.
  * @Note: this is supposed to be a synchronous op.
  */
-void qemu_ram_writeback(RAMBlock *block, ram_addr_t start, ram_addr_t length)
+void qemu_ram_msync(RAMBlock *block, ram_addr_t start, ram_addr_t length)
 {
     /* The requested range should fit in within the block range */
     g_assert((start + length) <= block->used_length);
diff --git a/memory.c b/memory.c
index XXXXXXX..XXXXXXX 100644
--- a/memory.c
+++ b/memory.c
@@ -XXX,XX +XXX,XX @@ void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize, Error **errp
 void memory_region_msync(MemoryRegion *mr, hwaddr addr, hwaddr size)
 {
     if (mr->ram_block) {
-        qemu_ram_writeback(mr->ram_block, addr, size);
+        qemu_ram_msync(mr->ram_block, addr, size);
     }
 }
 
-- 
2.25.4

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

We have a few bdrv_*() functions that can either spawn a new coroutine
and wait for it with BDRV_POLL_WHILE() or use a fastpath if they are
alreeady running in a coroutine. All of them duplicate basically the
same code.

Factor the common code into a new function bdrv_run_co().

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20200520144901.16589-1-vsementsov@virtuozzo.com
   [Factor out bdrv_run_co_entry too]
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/io.c | 193 ++++++++++++++++++++---------------------------------
 1 file changed, 72 insertions(+), 121 deletions(-)

diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@
 #include "qemu/main-loop.h"
 #include "sysemu/replay.h"
 
-#define NOT_DONE 0x7fffffff /* used while emulated sync operation in progress */
-
 /* Maximum bounce buffer for copy-on-read and write zeroes, in bytes */
 #define MAX_BOUNCE_BUFFER (32768 << BDRV_SECTOR_BITS)
 
@@ -XXX,XX +XXX,XX @@ static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset,
     return 0;
 }
 
+typedef int coroutine_fn BdrvRequestEntry(void *opaque);
+typedef struct BdrvRunCo {
+    BdrvRequestEntry *entry;
+    void *opaque;
+    int ret;
+    bool done;
+    Coroutine *co; /* Coroutine, running bdrv_run_co_entry, for debugging */
+} BdrvRunCo;
+
+static void coroutine_fn bdrv_run_co_entry(void *opaque)
+{
+    BdrvRunCo *arg = opaque;
+
+    arg->ret = arg->entry(arg->opaque);
+    arg->done = true;
+    aio_wait_kick();
+}
+
+static int bdrv_run_co(BlockDriverState *bs, BdrvRequestEntry *entry,
+                       void *opaque)
+{
+    if (qemu_in_coroutine()) {
+        /* Fast-path if already in coroutine context */
+        return entry(opaque);
+    } else {
+        BdrvRunCo s = { .entry = entry, .opaque = opaque };
+
+        s.co = qemu_coroutine_create(bdrv_run_co_entry, &s);
+        bdrv_coroutine_enter(bs, s.co);
+
+        BDRV_POLL_WHILE(bs, !s.done);
+
+        return s.ret;
+    }
+}
+
 typedef struct RwCo {
     BdrvChild *child;
     int64_t offset;
     QEMUIOVector *qiov;
     bool is_write;
-    int ret;
     BdrvRequestFlags flags;
 } RwCo;
 
-static void coroutine_fn bdrv_rw_co_entry(void *opaque)
+static int coroutine_fn bdrv_rw_co_entry(void *opaque)
 {
     RwCo *rwco = opaque;
 
     if (!rwco->is_write) {
-        rwco->ret = bdrv_co_preadv(rwco->child, rwco->offset,
-                                   rwco->qiov->size, rwco->qiov,
-                                   rwco->flags);
+        return bdrv_co_preadv(rwco->child, rwco->offset,
+                              rwco->qiov->size, rwco->qiov,
+                              rwco->flags);
     } else {
-        rwco->ret = bdrv_co_pwritev(rwco->child, rwco->offset,
-                                    rwco->qiov->size, rwco->qiov,
-                                    rwco->flags);
+        return bdrv_co_pwritev(rwco->child, rwco->offset,
+                               rwco->qiov->size, rwco->qiov,
+                               rwco->flags);
     }
-    aio_wait_kick();
 }
 
 /*
@@ -XXX,XX +XXX,XX @@ static int bdrv_prwv_co(BdrvChild *child, int64_t offset,
                         QEMUIOVector *qiov, bool is_write,
                         BdrvRequestFlags flags)
 {
-    Coroutine *co;
     RwCo rwco = {
         .child = child,
         .offset = offset,
         .qiov = qiov,
         .is_write = is_write,
-        .ret = NOT_DONE,
         .flags = flags,
     };
 
-    if (qemu_in_coroutine()) {
-        /* Fast-path if already in coroutine context */
-        bdrv_rw_co_entry(&rwco);
-    } else {
-        co = qemu_coroutine_create(bdrv_rw_co_entry, &rwco);
-        bdrv_coroutine_enter(child->bs, co);
-        BDRV_POLL_WHILE(child->bs, rwco.ret == NOT_DONE);
-    }
-    return rwco.ret;
+    return bdrv_run_co(child->bs, bdrv_rw_co_entry, &rwco);
 }
 
 int bdrv_pwrite_zeroes(BdrvChild *child, int64_t offset,
@@ -XXX,XX +XXX,XX @@ typedef struct BdrvCoBlockStatusData {
     int64_t *pnum;
     int64_t *map;
     BlockDriverState **file;
-    int ret;
-    bool done;
 } BdrvCoBlockStatusData;
 
 int coroutine_fn bdrv_co_block_status_from_file(BlockDriverState *bs,
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_co_block_status_above(BlockDriverState *bs,
 }
 
 /* Coroutine wrapper for bdrv_block_status_above() */
-static void coroutine_fn bdrv_block_status_above_co_entry(void *opaque)
+static int coroutine_fn bdrv_block_status_above_co_entry(void *opaque)
 {
     BdrvCoBlockStatusData *data = opaque;
 
-    data->ret = bdrv_co_block_status_above(data->bs, data->base,
-                                           data->want_zero,
-                                           data->offset, data->bytes,
-                                           data->pnum, data->map, data->file);
-    data->done = true;
-    aio_wait_kick();
+    return bdrv_co_block_status_above(data->bs, data->base,
+                                      data->want_zero,
+                                      data->offset, data->bytes,
+                                      data->pnum, data->map, data->file);
 }
 
 /*
@@ -XXX,XX +XXX,XX @@ static int bdrv_common_block_status_above(BlockDriverState *bs,
                                           int64_t *map,
                                           BlockDriverState **file)
 {
-    Coroutine *co;
     BdrvCoBlockStatusData data = {
         .bs = bs,
         .base = base,
@@ -XXX,XX +XXX,XX @@ static int bdrv_common_block_status_above(BlockDriverState *bs,
         .pnum = pnum,
         .map = map,
         .file = file,
-        .done = false,
     };
 
-    if (qemu_in_coroutine()) {
-        /* Fast-path if already in coroutine context */
-        bdrv_block_status_above_co_entry(&data);
-    } else {
-        co = qemu_coroutine_create(bdrv_block_status_above_co_entry, &data);
-        bdrv_coroutine_enter(bs, co);
-        BDRV_POLL_WHILE(bs, !data.done);
-    }
-    return data.ret;
+    return bdrv_run_co(bs, bdrv_block_status_above_co_entry, &data);
 }
 
 int bdrv_block_status_above(BlockDriverState *bs, BlockDriverState *base,
@@ -XXX,XX +XXX,XX @@ typedef struct BdrvVmstateCo {
     QEMUIOVector        *qiov;
     int64_t             pos;
     bool                is_read;
-    int                 ret;
 } BdrvVmstateCo;
 
 static int coroutine_fn
@@ -XXX,XX +XXX,XX @@ bdrv_co_rw_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos,
     return ret;
 }
 
-static void coroutine_fn bdrv_co_rw_vmstate_entry(void *opaque)
+static int coroutine_fn bdrv_co_rw_vmstate_entry(void *opaque)
 {
     BdrvVmstateCo *co = opaque;
-    co->ret = bdrv_co_rw_vmstate(co->bs, co->qiov, co->pos, co->is_read);
-    aio_wait_kick();
+
+    return bdrv_co_rw_vmstate(co->bs, co->qiov, co->pos, co->is_read);
 }
 
 static inline int
 bdrv_rw_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos,
                 bool is_read)
 {
-    if (qemu_in_coroutine()) {
-        return bdrv_co_rw_vmstate(bs, qiov, pos, is_read);
-    } else {
-        BdrvVmstateCo data = {
-            .bs         = bs,
-            .qiov       = qiov,
-            .pos        = pos,
-            .is_read    = is_read,
-            .ret        = -EINPROGRESS,
-        };
-        Coroutine *co = qemu_coroutine_create(bdrv_co_rw_vmstate_entry, &data);
+    BdrvVmstateCo data = {
+        .bs         = bs,
+        .qiov       = qiov,
+        .pos        = pos,
+        .is_read    = is_read,
+    };
 
-        bdrv_coroutine_enter(bs, co);
-        BDRV_POLL_WHILE(bs, data.ret == -EINPROGRESS);
-        return data.ret;
-    }
+    return bdrv_run_co(bs, bdrv_co_rw_vmstate_entry, &data);
 }
 
 int bdrv_save_vmstate(BlockDriverState *bs, const uint8_t *buf,
@@ -XXX,XX +XXX,XX @@ void bdrv_aio_cancel_async(BlockAIOCB *acb)
 /**************************************************************/
 /* Coroutine block device emulation */
 
-typedef struct FlushCo {
-    BlockDriverState *bs;
-    int ret;
-} FlushCo;
-
-
-static void coroutine_fn bdrv_flush_co_entry(void *opaque)
+static int coroutine_fn bdrv_flush_co_entry(void *opaque)
 {
-    FlushCo *rwco = opaque;
-
-    rwco->ret = bdrv_co_flush(rwco->bs);
-    aio_wait_kick();
+    return bdrv_co_flush(opaque);
 }
 
 int coroutine_fn bdrv_co_flush(BlockDriverState *bs)
@@ -XXX,XX +XXX,XX @@ early_exit:
 
 int bdrv_flush(BlockDriverState *bs)
 {
-    Coroutine *co;
-    FlushCo flush_co = {
-        .bs = bs,
-        .ret = NOT_DONE,
-    };
-
-    if (qemu_in_coroutine()) {
-        /* Fast-path if already in coroutine context */
-        bdrv_flush_co_entry(&flush_co);
-    } else {
-        co = qemu_coroutine_create(bdrv_flush_co_entry, &flush_co);
-        bdrv_coroutine_enter(bs, co);
-        BDRV_POLL_WHILE(bs, flush_co.ret == NOT_DONE);
-    }
-
-    return flush_co.ret;
+    return bdrv_run_co(bs, bdrv_flush_co_entry, bs);
 }
 
 typedef struct DiscardCo {
     BdrvChild *child;
     int64_t offset;
     int64_t bytes;
-    int ret;
 } DiscardCo;
-static void coroutine_fn bdrv_pdiscard_co_entry(void *opaque)
+
+static int coroutine_fn bdrv_pdiscard_co_entry(void *opaque)
 {
     DiscardCo *rwco = opaque;
 
-    rwco->ret = bdrv_co_pdiscard(rwco->child, rwco->offset, rwco->bytes);
-    aio_wait_kick();
+    return bdrv_co_pdiscard(rwco->child, rwco->offset, rwco->bytes);
 }
 
 int coroutine_fn bdrv_co_pdiscard(BdrvChild *child, int64_t offset,
@@ -XXX,XX +XXX,XX @@ out:
 
 int bdrv_pdiscard(BdrvChild *child, int64_t offset, int64_t bytes)
 {
-    Coroutine *co;
     DiscardCo rwco = {
         .child = child,
         .offset = offset,
         .bytes = bytes,
-        .ret = NOT_DONE,
     };
 
-    if (qemu_in_coroutine()) {
-        /* Fast-path if already in coroutine context */
-        bdrv_pdiscard_co_entry(&rwco);
-    } else {
-        co = qemu_coroutine_create(bdrv_pdiscard_co_entry, &rwco);
-        bdrv_coroutine_enter(child->bs, co);
-        BDRV_POLL_WHILE(child->bs, rwco.ret == NOT_DONE);
-    }
-
-    return rwco.ret;
+    return bdrv_run_co(child->bs, bdrv_pdiscard_co_entry, &rwco);
 }
 
 int bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf)
@@ -XXX,XX +XXX,XX @@ typedef struct TruncateCo {
     PreallocMode prealloc;
     BdrvRequestFlags flags;
     Error **errp;
-    int ret;
 } TruncateCo;
 
-static void coroutine_fn bdrv_truncate_co_entry(void *opaque)
+static int coroutine_fn bdrv_truncate_co_entry(void *opaque)
 {
     TruncateCo *tco = opaque;
-    tco->ret = bdrv_co_truncate(tco->child, tco->offset, tco->exact,
-                                tco->prealloc, tco->flags, tco->errp);
-    aio_wait_kick();
+
+    return bdrv_co_truncate(tco->child, tco->offset, tco->exact,
+                            tco->prealloc, tco->flags, tco->errp);
 }
 
 int bdrv_truncate(BdrvChild *child, int64_t offset, bool exact,
                   PreallocMode prealloc, BdrvRequestFlags flags, Error **errp)
 {
-    Coroutine *co;
     TruncateCo tco = {
         .child      = child,
         .offset     = offset,
@@ -XXX,XX +XXX,XX @@ int bdrv_truncate(BdrvChild *child, int64_t offset, bool exact,
         .prealloc   = prealloc,
         .flags      = flags,
         .errp       = errp,
-        .ret        = NOT_DONE,
     };
 
-    if (qemu_in_coroutine()) {
-        /* Fast-path if already in coroutine context */
-        bdrv_truncate_co_entry(&tco);
-    } else {
-        co = qemu_coroutine_create(bdrv_truncate_co_entry, &tco);
-        bdrv_coroutine_enter(child->bs, co);
-        BDRV_POLL_WHILE(child->bs, tco.ret == NOT_DONE);
-    }
-
-    return tco.ret;
+    return bdrv_run_co(child->bs, bdrv_truncate_co_entry, &tco);
 }
-- 
2.25.4

The following changes since commit 7208429223963c405c62fa2611398f1aa8033593:

Merge tag 'mem-2022-10-28' of https://github.com/davidhildenbrand/qemu into staging (2022-10-30 18:31:59 -0400)

are available in the Git repository at:

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

for you to fetch changes up to 6c32fc0df9cd901add75618c831fb26a9eb742cb:

block/blkio: Make driver nvme-io_uring take a "path" instead of a "filename" (2022-10-31 14:35:14 -0400)

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

Note that we're still discussing "block/blkio: Make driver nvme-io_uring take a
"path" instead of a "filename"". I have sent the pull request now so everything
is ready for the soft freeze tomorrow if we decide to go ahead with the patch.

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

Alberto Faria (3):
  block/blkio: Add virtio-blk-vfio-pci BlockDriver
  block/blkio: Tolerate device size changes
  block/blkio: Make driver nvme-io_uring take a "path" instead of a
    "filename"

qapi/block-core.json | 22 +++++++++++++++++++--
 block/blkio.c        | 47 ++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 63 insertions(+), 6 deletions(-)

-- 
2.38.1

From: Alberto Faria <afaria@redhat.com>

libblkio 1.1.0 [1] introduces a virtio-blk-vfio-pci driver, which
accesses a virtio-blk PCI device using VFIO. Add a corresponding
BlockDriver.

[1] https://gitlab.com/libblkio/libblkio/-/tree/v1.1.0

Signed-off-by: Alberto Faria <afaria@redhat.com>
Message-id: 20221028131635.710267-1-afaria@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 qapi/block-core.json | 18 ++++++++++++++++++
 block/blkio.c        |  8 ++++++++
 2 files changed, 26 insertions(+)

diff --git a/qapi/block-core.json b/qapi/block-core.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
             'raw', 'rbd',
             { 'name': 'replication', 'if': 'CONFIG_REPLICATION' },
             'ssh', 'throttle', 'vdi', 'vhdx',
+            { 'name': 'virtio-blk-vfio-pci', 'if': 'CONFIG_BLKIO' },
             { 'name': 'virtio-blk-vhost-user', 'if': 'CONFIG_BLKIO' },
             { 'name': 'virtio-blk-vhost-vdpa', 'if': 'CONFIG_BLKIO' },
             'vmdk', 'vpc', 'vvfat' ] }
@@ -XXX,XX +XXX,XX @@
   'data': { 'filename': 'str' },
   'if': 'CONFIG_BLKIO' }
 
+##
+# @BlockdevOptionsVirtioBlkVfioPci:
+#
+# Driver specific block device options for the virtio-blk-vfio-pci backend.
+#
+# @path: path to the PCI device's sysfs directory (e.g.
+#        /sys/bus/pci/devices/0000:00:01.0).
+#
+# Since: 7.2
+##
+{ 'struct': 'BlockdevOptionsVirtioBlkVfioPci',
+  'data': { 'path': 'str' },
+  'if': 'CONFIG_BLKIO' }
+
 ##
 # @BlockdevOptionsVirtioBlkVhostUser:
 #
@@ -XXX,XX +XXX,XX @@
       'throttle':   'BlockdevOptionsThrottle',
       'vdi':        'BlockdevOptionsGenericFormat',
       'vhdx':       'BlockdevOptionsGenericFormat',
+      'virtio-blk-vfio-pci':
+                    { 'type': 'BlockdevOptionsVirtioBlkVfioPci',
+                      'if': 'CONFIG_BLKIO' },
       'virtio-blk-vhost-user':
                     { 'type': 'BlockdevOptionsVirtioBlkVhostUser',
                       'if': 'CONFIG_BLKIO' },
diff --git a/block/blkio.c b/block/blkio.c
index XXXXXXX..XXXXXXX 100644
--- a/block/blkio.c
+++ b/block/blkio.c
@@ -XXX,XX +XXX,XX @@
  */
 #define DRIVER_IO_URING "io_uring"
 #define DRIVER_NVME_IO_URING "nvme-io_uring"
+#define DRIVER_VIRTIO_BLK_VFIO_PCI "virtio-blk-vfio-pci"
 #define DRIVER_VIRTIO_BLK_VHOST_USER "virtio-blk-vhost-user"
 #define DRIVER_VIRTIO_BLK_VHOST_VDPA "virtio-blk-vhost-vdpa"
 
@@ -XXX,XX +XXX,XX @@ static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags,
         ret = blkio_io_uring_open(bs, options, flags, errp);
     } else if (strcmp(blkio_driver, DRIVER_NVME_IO_URING) == 0) {
         ret = blkio_nvme_io_uring(bs, options, flags, errp);
+    } else if (strcmp(blkio_driver, DRIVER_VIRTIO_BLK_VFIO_PCI) == 0) {
+        ret = blkio_virtio_blk_common_open(bs, options, flags, errp);
     } else if (strcmp(blkio_driver, DRIVER_VIRTIO_BLK_VHOST_USER) == 0) {
         ret = blkio_virtio_blk_common_open(bs, options, flags, errp);
     } else if (strcmp(blkio_driver, DRIVER_VIRTIO_BLK_VHOST_VDPA) == 0) {
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_nvme_io_uring = BLKIO_DRIVER(
     .bdrv_needs_filename = true,
 );
 
+static BlockDriver bdrv_virtio_blk_vfio_pci = BLKIO_DRIVER(
+    DRIVER_VIRTIO_BLK_VFIO_PCI
+);
+
 static BlockDriver bdrv_virtio_blk_vhost_user = BLKIO_DRIVER(
     DRIVER_VIRTIO_BLK_VHOST_USER
 );
@@ -XXX,XX +XXX,XX @@ static void bdrv_blkio_init(void)
 {
     bdrv_register(&bdrv_io_uring);
     bdrv_register(&bdrv_nvme_io_uring);
+    bdrv_register(&bdrv_virtio_blk_vfio_pci);
     bdrv_register(&bdrv_virtio_blk_vhost_user);
     bdrv_register(&bdrv_virtio_blk_vhost_vdpa);
 }
-- 
2.38.1

From: Alberto Faria <afaria@redhat.com>

Some libblkio drivers may be able to work with regular files (e.g.,
io_uring) or otherwise resizable devices. Conservatively set
BlockDriver::has_variable_length to true to ensure bdrv_nb_sectors()
always gives up-to-date results.

Also implement BlockDriver::bdrv_co_truncate for the case where no
preallocation is needed and the device already has a size compatible
with what was requested.

Signed-off-by: Alberto Faria <afaria@redhat.com>
Message-id: 20221029122031.975273-1-afaria@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/blkio.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/block/blkio.c b/block/blkio.c
index XXXXXXX..XXXXXXX 100644
--- a/block/blkio.c
+++ b/block/blkio.c
@@ -XXX,XX +XXX,XX @@ static int64_t blkio_getlength(BlockDriverState *bs)
     return capacity;
 }
 
+static int coroutine_fn blkio_truncate(BlockDriverState *bs, int64_t offset,
+                                       bool exact, PreallocMode prealloc,
+                                       BdrvRequestFlags flags, Error **errp)
+{
+    int64_t current_length;
+
+    if (prealloc != PREALLOC_MODE_OFF) {
+        error_setg(errp, "Unsupported preallocation mode '%s'",
+                   PreallocMode_str(prealloc));
+        return -ENOTSUP;
+    }
+
+    current_length = blkio_getlength(bs);
+
+    if (offset > current_length) {
+        error_setg(errp, "Cannot grow device");
+        return -EINVAL;
+    } else if (exact && offset != current_length) {
+        error_setg(errp, "Cannot resize device");
+        return -ENOTSUP;
+    }
+
+    return 0;
+}
+
 static int blkio_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
 {
     return 0;
@@ -XXX,XX +XXX,XX @@ static void blkio_refresh_limits(BlockDriverState *bs, Error **errp)
     { \
         .format_name             = name, \
         .protocol_name           = name, \
+        .has_variable_length     = true, \
         .instance_size           = sizeof(BDRVBlkioState), \
         .bdrv_file_open          = blkio_file_open, \
         .bdrv_close              = blkio_close, \
         .bdrv_getlength          = blkio_getlength, \
+        .bdrv_co_truncate        = blkio_truncate, \
         .bdrv_get_info           = blkio_get_info, \
         .bdrv_attach_aio_context = blkio_attach_aio_context, \
         .bdrv_detach_aio_context = blkio_detach_aio_context, \
-- 
2.38.1

From: Alberto Faria <afaria@redhat.com>

The nvme-io_uring driver expects a character special file such as
/dev/ng0n1. Follow the convention of having a "filename" option when a
regular file is expected, and a "path" option otherwise.

This makes io_uring the only libblkio-based driver with a "filename"
option, as it accepts a regular file (even though it can also take a
block special file).

Signed-off-by: Alberto Faria <afaria@redhat.com>
Message-id: 20221028233854.839933-1-afaria@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 qapi/block-core.json |  4 ++--
 block/blkio.c        | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
 #
 # Driver specific block device options for the nvme-io_uring backend.
 #
-# @filename: path to the image file
+# @path: path to the image file
 #
 # Since: 7.2
 ##
 { 'struct': 'BlockdevOptionsNvmeIoUring',
-  'data': { 'filename': 'str' },
+  'data': { 'path': 'str' },
   'if': 'CONFIG_BLKIO' }
 
 ##
diff --git a/block/blkio.c b/block/blkio.c
index XXXXXXX..XXXXXXX 100644
--- a/block/blkio.c
+++ b/block/blkio.c
@@ -XXX,XX +XXX,XX @@ static int blkio_io_uring_open(BlockDriverState *bs, QDict *options, int flags,
 static int blkio_nvme_io_uring(BlockDriverState *bs, QDict *options, int flags,
                                Error **errp)
 {
-    const char *filename = qdict_get_str(options, "filename");
+    const char *path = qdict_get_try_str(options, "path");
     BDRVBlkioState *s = bs->opaque;
     int ret;
 
-    ret = blkio_set_str(s->blkio, "path", filename);
-    qdict_del(options, "filename");
+    if (!path) {
+        error_setg(errp, "missing 'path' option");
+        return -EINVAL;
+    }
+
+    ret = blkio_set_str(s->blkio, "path", path);
+    qdict_del(options, "path");
     if (ret < 0) {
         error_setg_errno(errp, -ret, "failed to set path: %s",
                          blkio_get_error_msg());
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_io_uring = BLKIO_DRIVER(
 
 static BlockDriver bdrv_nvme_io_uring = BLKIO_DRIVER(
     DRIVER_NVME_IO_URING,
-    .bdrv_needs_filename = true,
 );
 
 static BlockDriver bdrv_virtio_blk_vfio_pci = BLKIO_DRIVER(
-- 
2.38.1