[PULL 00/32] Block layer patches

Kevin Wolf posted 32 patches 11 months, 2 weeks ago
Failed in applying to current master (apply log)
Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, John Snow <jsnow@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>, Xie Yongji <xieyongji@bytedance.com>, Coiby Xu <Coiby.Xu@gmail.com>, Fam Zheng <fam@euphon.net>, Aarushi Mehta <mehta.aaru20@gmail.com>, Julia Suvorova <jusual@redhat.com>, Stefano Garzarella <sgarzare@redhat.com>, Ronnie Sahlberg <ronniesahlberg@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, Peter Lieven <pl@kamp.de>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, "Richard W.M. Jones" <rjones@redhat.com>, Stefan Weil <sw@weilnetz.de>, Stefano Stabellini <sstabellini@kernel.org>, Anthony Perard <anthony.perard@citrix.com>, Paul Durrant <paul@xen.org>, "Michael S. Tsirkin" <mst@redhat.com>, David Woodhouse <dwmw2@infradead.org>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>, Leonardo Bras <leobras@redhat.com>, Eric Blake <eblake@redhat.com>, Cleber Rosa <crosa@redhat.com>
There is a newer version of this series
hw/block/dataplane/xen-block.h                |   2 +
include/block/aio.h                           |  57 ------------
include/block/block-common.h                  |   3 +
include/block/block_int-common.h              |  72 +++++++--------
include/block/export.h                        |   2 +
include/hw/qdev-core.h                        |  17 +++-
include/hw/scsi/scsi.h                        |  14 +++
include/qemu/vhost-user-server.h              |   8 +-
include/sysemu/block-backend-common.h         |  25 ++---
include/sysemu/block-backend-global-state.h   |   1 +
util/aio-posix.h                              |   1 -
block.c                                       |  46 ++++++---
block/blkio.c                                 |  15 +--
block/block-backend.c                         | 104 ++++++++++++---------
block/copy-before-write.c                     |  21 ++++-
block/curl.c                                  |  10 +-
block/export/export.c                         |  13 ++-
block/export/fuse.c                           |  56 ++++++++++-
block/export/vduse-blk.c                      | 128 ++++++++++++++++++--------
block/export/vhost-user-blk-server.c          |  52 +++++++++--
block/io.c                                    |  16 ++--
block/io_uring.c                              |   4 +-
block/iscsi.c                                 |   3 +-
block/linux-aio.c                             |   4 +-
block/mirror.c                                |   6 ++
block/nfs.c                                   |   5 +-
block/nvme.c                                  |   8 +-
block/qapi-sysemu.c                           |   3 +
block/qcow2.c                                 |   8 +-
block/raw-format.c                            |   5 +
block/ssh.c                                   |   4 +-
block/win32-aio.c                             |   6 +-
blockdev.c                                    |  29 ++++--
hw/block/dataplane/virtio-blk.c               |  23 +++--
hw/block/dataplane/xen-block.c                |  42 ++++++---
hw/block/virtio-blk.c                         |  38 +++++++-
hw/block/xen-block.c                          |  24 ++++-
hw/i386/kvm/xen_xenstore.c                    |   2 +-
hw/scsi/scsi-bus.c                            |  46 ++++++++-
hw/scsi/scsi-disk.c                           |  27 +++++-
hw/scsi/virtio-scsi-dataplane.c               |  32 +++++--
hw/scsi/virtio-scsi.c                         | 127 +++++++++++++++++++------
hw/virtio/virtio.c                            |   9 +-
hw/xen/xen-bus.c                              |  11 ++-
io/channel-command.c                          |   6 +-
io/channel-file.c                             |   3 +-
io/channel-socket.c                           |   3 +-
migration/rdma.c                              |  16 ++--
qemu-nbd.c                                    |   4 +
tests/unit/test-aio.c                         |  27 +-----
tests/unit/test-bdrv-drain.c                  |  15 +--
tests/unit/test-block-iothread.c              |   4 +-
tests/unit/test-fdmon-epoll.c                 |  73 ---------------
tests/unit/test-nested-aio-poll.c             |   9 +-
util/aio-posix.c                              |  20 +---
util/aio-win32.c                              |   8 +-
util/async.c                                  |   3 +-
util/fdmon-epoll.c                            |  10 --
util/fdmon-io_uring.c                         |   8 +-
util/fdmon-poll.c                             |   3 +-
util/main-loop.c                              |   7 +-
util/qemu-coroutine-io.c                      |   7 +-
util/vhost-user-server.c                      |  33 ++++---
scripts/block-coroutine-wrapper.py            |  25 +++--
tests/qemu-iotests/iotests.py                 |   2 +-
hw/scsi/trace-events                          |   2 +
tests/qemu-iotests/256                        |   2 +-
tests/qemu-iotests/tests/iothreads-create     |  67 ++++++++++++++
tests/qemu-iotests/tests/iothreads-create.out |   4 +
tests/unit/meson.build                        |   3 -
70 files changed, 931 insertions(+), 562 deletions(-)
delete mode 100644 tests/unit/test-fdmon-epoll.c
create mode 100755 tests/qemu-iotests/tests/iothreads-create
create mode 100644 tests/qemu-iotests/tests/iothreads-create.out
[PULL 00/32] Block layer patches
Posted by Kevin Wolf 11 months, 2 weeks ago
The following changes since commit aa9bbd865502ed517624ab6fe7d4b5d89ca95e43:

  Merge tag 'pull-ppc-20230528' of https://gitlab.com/danielhb/qemu into staging (2023-05-29 14:31:52 -0700)

are available in the Git repository at:

  https://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to 60f782b6b78211c125970768be726c9f380dbd61:

  aio: remove aio_disable_external() API (2023-05-30 17:37:26 +0200)

----------------------------------------------------------------
Block layer patches

- Fix blockdev-create with iothreads
- Remove aio_disable_external() API

----------------------------------------------------------------
Kevin Wolf (12):
      block-coroutine-wrapper: Take AioContext lock in no_co_wrappers
      block: Clarify locking rules for bdrv_open(_inherit)()
      block: Take main AioContext lock when calling bdrv_open()
      block-backend: Fix blk_new_open() for iothreads
      mirror: Hold main AioContext lock for calling bdrv_open_backing_file()
      qcow2: Fix open with 'file' in iothread
      raw-format: Fix open with 'file' in iothread
      copy-before-write: Fix open with child in iothread
      block: Take AioContext lock in bdrv_open_driver()
      block: Fix AioContext locking in bdrv_insert_node()
      iotests: Make verify_virtio_scsi_pci_or_ccw() public
      iotests: Test blockdev-create in iothread

Stefan Hajnoczi (20):
      block-backend: split blk_do_set_aio_context()
      hw/qdev: introduce qdev_is_realized() helper
      virtio-scsi: avoid race between unplug and transport event
      virtio-scsi: stop using aio_disable_external() during unplug
      util/vhost-user-server: rename refcount to in_flight counter
      block/export: wait for vhost-user-blk requests when draining
      block/export: stop using is_external in vhost-user-blk server
      hw/xen: do not use aio_set_fd_handler(is_external=true) in xen_xenstore
      block: add blk_in_drain() API
      block: drain from main loop thread in bdrv_co_yield_to_drain()
      xen-block: implement BlockDevOps->drained_begin()
      hw/xen: do not set is_external=true on evtchn fds
      block/export: rewrite vduse-blk drain code
      block/export: don't require AioContext lock around blk_exp_ref/unref()
      block/fuse: do not set is_external=true on FUSE fd
      virtio: make it possible to detach host notifier from any thread
      virtio-blk: implement BlockDevOps->drained_begin()
      virtio-scsi: implement BlockDevOps->drained_begin()
      virtio: do not set is_external=true on host notifiers
      aio: remove aio_disable_external() API

 hw/block/dataplane/xen-block.h                |   2 +
 include/block/aio.h                           |  57 ------------
 include/block/block-common.h                  |   3 +
 include/block/block_int-common.h              |  72 +++++++--------
 include/block/export.h                        |   2 +
 include/hw/qdev-core.h                        |  17 +++-
 include/hw/scsi/scsi.h                        |  14 +++
 include/qemu/vhost-user-server.h              |   8 +-
 include/sysemu/block-backend-common.h         |  25 ++---
 include/sysemu/block-backend-global-state.h   |   1 +
 util/aio-posix.h                              |   1 -
 block.c                                       |  46 ++++++---
 block/blkio.c                                 |  15 +--
 block/block-backend.c                         | 104 ++++++++++++---------
 block/copy-before-write.c                     |  21 ++++-
 block/curl.c                                  |  10 +-
 block/export/export.c                         |  13 ++-
 block/export/fuse.c                           |  56 ++++++++++-
 block/export/vduse-blk.c                      | 128 ++++++++++++++++++--------
 block/export/vhost-user-blk-server.c          |  52 +++++++++--
 block/io.c                                    |  16 ++--
 block/io_uring.c                              |   4 +-
 block/iscsi.c                                 |   3 +-
 block/linux-aio.c                             |   4 +-
 block/mirror.c                                |   6 ++
 block/nfs.c                                   |   5 +-
 block/nvme.c                                  |   8 +-
 block/qapi-sysemu.c                           |   3 +
 block/qcow2.c                                 |   8 +-
 block/raw-format.c                            |   5 +
 block/ssh.c                                   |   4 +-
 block/win32-aio.c                             |   6 +-
 blockdev.c                                    |  29 ++++--
 hw/block/dataplane/virtio-blk.c               |  23 +++--
 hw/block/dataplane/xen-block.c                |  42 ++++++---
 hw/block/virtio-blk.c                         |  38 +++++++-
 hw/block/xen-block.c                          |  24 ++++-
 hw/i386/kvm/xen_xenstore.c                    |   2 +-
 hw/scsi/scsi-bus.c                            |  46 ++++++++-
 hw/scsi/scsi-disk.c                           |  27 +++++-
 hw/scsi/virtio-scsi-dataplane.c               |  32 +++++--
 hw/scsi/virtio-scsi.c                         | 127 +++++++++++++++++++------
 hw/virtio/virtio.c                            |   9 +-
 hw/xen/xen-bus.c                              |  11 ++-
 io/channel-command.c                          |   6 +-
 io/channel-file.c                             |   3 +-
 io/channel-socket.c                           |   3 +-
 migration/rdma.c                              |  16 ++--
 qemu-nbd.c                                    |   4 +
 tests/unit/test-aio.c                         |  27 +-----
 tests/unit/test-bdrv-drain.c                  |  15 +--
 tests/unit/test-block-iothread.c              |   4 +-
 tests/unit/test-fdmon-epoll.c                 |  73 ---------------
 tests/unit/test-nested-aio-poll.c             |   9 +-
 util/aio-posix.c                              |  20 +---
 util/aio-win32.c                              |   8 +-
 util/async.c                                  |   3 +-
 util/fdmon-epoll.c                            |  10 --
 util/fdmon-io_uring.c                         |   8 +-
 util/fdmon-poll.c                             |   3 +-
 util/main-loop.c                              |   7 +-
 util/qemu-coroutine-io.c                      |   7 +-
 util/vhost-user-server.c                      |  33 ++++---
 scripts/block-coroutine-wrapper.py            |  25 +++--
 tests/qemu-iotests/iotests.py                 |   2 +-
 hw/scsi/trace-events                          |   2 +
 tests/qemu-iotests/256                        |   2 +-
 tests/qemu-iotests/tests/iothreads-create     |  67 ++++++++++++++
 tests/qemu-iotests/tests/iothreads-create.out |   4 +
 tests/unit/meson.build                        |   3 -
 70 files changed, 931 insertions(+), 562 deletions(-)
 delete mode 100644 tests/unit/test-fdmon-epoll.c
 create mode 100755 tests/qemu-iotests/tests/iothreads-create
 create mode 100644 tests/qemu-iotests/tests/iothreads-create.out
Re: [PULL 00/32] Block layer patches
Posted by Richard Henderson 11 months, 2 weeks ago
On 5/30/23 09:32, Kevin Wolf wrote:
> The following changes since commit aa9bbd865502ed517624ab6fe7d4b5d89ca95e43:
> 
>    Merge tag 'pull-ppc-20230528' ofhttps://gitlab.com/danielhb/qemu  into staging (2023-05-29 14:31:52 -0700)
> 
> are available in the Git repository at:
> 
>    https://repo.or.cz/qemu/kevin.git  tags/for-upstream
> 
> for you to fetch changes up to 60f782b6b78211c125970768be726c9f380dbd61:
> 
>    aio: remove aio_disable_external() API (2023-05-30 17:37:26 +0200)
> 
> ----------------------------------------------------------------
> Block layer patches
> 
> - Fix blockdev-create with iothreads
> - Remove aio_disable_external() API

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/8.1 as appropriate.


r~