[PATCH 00/12] aio: remove AioContext lock

Stefan Hajnoczi posted 12 patches 12 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
docs/devel/multiple-iothreads.txt    |  45 ++--
include/block/aio-wait.h             |  16 +-
include/block/aio.h                  |  17 --
include/block/block-common.h         |   3 -
include/block/block-global-state.h   |   9 +-
include/block/block-io.h             |  12 +-
include/block/block_int-common.h     |   2 -
include/block/graph-lock.h           |  21 +-
include/block/snapshot.h             |   2 -
include/hw/virtio/virtio-scsi.h      |  17 +-
include/qemu/job.h                   |  20 --
block.c                              | 357 ++++-----------------------
block/backup.c                       |   4 +-
block/blklogwrites.c                 |   8 +-
block/blkverify.c                    |   4 +-
block/block-backend.c                |  33 +--
block/commit.c                       |  16 +-
block/copy-before-write.c            |  22 +-
block/export/export.c                |  22 +-
block/export/vhost-user-blk-server.c |   4 -
block/graph-lock.c                   |  44 +---
block/io.c                           |  45 +---
block/mirror.c                       |  41 +--
block/monitor/bitmap-qmp-cmds.c      |  20 +-
block/monitor/block-hmp-cmds.c       |  29 ---
block/qapi-sysemu.c                  |  27 +-
block/qapi.c                         |  18 +-
block/qcow2.c                        |   4 +-
block/quorum.c                       |   8 +-
block/raw-format.c                   |   5 -
block/replication.c                  |  72 +-----
block/snapshot.c                     |  26 +-
block/stream.c                       |  12 +-
block/vmdk.c                         |  20 +-
block/write-threshold.c              |   6 -
blockdev.c                           | 315 +++++------------------
blockjob.c                           |  30 +--
hw/block/dataplane/virtio-blk.c      |  10 -
hw/block/dataplane/xen-block.c       |  17 +-
hw/block/virtio-blk.c                |  45 +---
hw/core/qdev-properties-system.c     |   9 -
hw/scsi/scsi-bus.c                   |   2 -
hw/scsi/scsi-disk.c                  |  29 +--
hw/scsi/virtio-scsi.c                |  80 +++---
job.c                                |  16 --
migration/block.c                    |  33 +--
migration/migration-hmp-cmds.c       |   3 -
migration/savevm.c                   |  22 --
net/colo-compare.c                   |   2 -
qemu-img.c                           |   4 -
qemu-io.c                            |  10 +-
qemu-nbd.c                           |   2 -
replay/replay-debugging.c            |   4 -
tests/unit/test-aio.c                |  67 +----
tests/unit/test-bdrv-drain.c         |  91 ++-----
tests/unit/test-bdrv-graph-mod.c     |  26 +-
tests/unit/test-block-iothread.c     |  31 ---
tests/unit/test-blockjob.c           | 137 ----------
tests/unit/test-replication.c        |  11 -
util/async.c                         |  14 --
util/vhost-user-server.c             |   3 -
scripts/block-coroutine-wrapper.py   |   7 +-
tests/qemu-iotests/202               |   2 +-
tests/qemu-iotests/203               |   3 +-
tests/tsan/suppressions.tsan         |   1 -
65 files changed, 324 insertions(+), 1713 deletions(-)
[PATCH 00/12] aio: remove AioContext lock
Posted by Stefan Hajnoczi 12 months ago
This series removes the AioContext locking APIs from QEMU.
aio_context_acquire() and aio_context_release() are currently only needed to
support the locking discipline required by AIO_POLL_WHILE() (except for a stray
user that I converted in Patch 1). AIO_POLL_WHILE() doesn't really need the
AioContext lock anymore, so it's possible to remove the API. This is a nice
simplification because the AioContext locking rules were sometimes tricky or
underspecified, leading to many bugs of the years.

This patch series removes these APIs across the codebase and cleans up the
documentation/comments that refers to them.

Patch 1 is a AioContext lock user I forgot to convert in my earlier SCSI
conversion series.

Patch 2 removes tests for the AioContext lock because they will no longer be
needed when the lock is gone.

Patches 3-9 remove the AioContext lock. These can be reviewed by categorizing
the call sites into 1. places that take the lock because they call an API that
requires the lock (ultimately AIO_POLL_WHILE()) and 2. places that take the
lock to protect state. There should be no instances of case 2 left. If you see
one, you've found a bug in this patch series!

Patches 10-12 remove comments.

Based-on: 20231123194931.171598-1-stefanha@redhat.com ("[PATCH 0/4] scsi: eliminate AioContext lock")
Since SCSI needs to stop relying on the AioContext lock before we can remove
the lock.

Stefan Hajnoczi (12):
  virtio-scsi: replace AioContext lock with tmf_bh_lock
  tests: remove aio_context_acquire() tests
  aio: make aio_context_acquire()/aio_context_release() a no-op
  graph-lock: remove AioContext locking
  block: remove AioContext locking
  scsi: remove AioContext locking
  aio-wait: draw equivalence between AIO_WAIT_WHILE() and
    AIO_WAIT_WHILE_UNLOCKED()
  aio: remove aio_context_acquire()/aio_context_release() API
  docs: remove AioContext lock from IOThread docs
  scsi: remove outdated AioContext lock comment
  job: remove outdated AioContext locking comments
  block: remove outdated AioContext locking comments

 docs/devel/multiple-iothreads.txt    |  45 ++--
 include/block/aio-wait.h             |  16 +-
 include/block/aio.h                  |  17 --
 include/block/block-common.h         |   3 -
 include/block/block-global-state.h   |   9 +-
 include/block/block-io.h             |  12 +-
 include/block/block_int-common.h     |   2 -
 include/block/graph-lock.h           |  21 +-
 include/block/snapshot.h             |   2 -
 include/hw/virtio/virtio-scsi.h      |  17 +-
 include/qemu/job.h                   |  20 --
 block.c                              | 357 ++++-----------------------
 block/backup.c                       |   4 +-
 block/blklogwrites.c                 |   8 +-
 block/blkverify.c                    |   4 +-
 block/block-backend.c                |  33 +--
 block/commit.c                       |  16 +-
 block/copy-before-write.c            |  22 +-
 block/export/export.c                |  22 +-
 block/export/vhost-user-blk-server.c |   4 -
 block/graph-lock.c                   |  44 +---
 block/io.c                           |  45 +---
 block/mirror.c                       |  41 +--
 block/monitor/bitmap-qmp-cmds.c      |  20 +-
 block/monitor/block-hmp-cmds.c       |  29 ---
 block/qapi-sysemu.c                  |  27 +-
 block/qapi.c                         |  18 +-
 block/qcow2.c                        |   4 +-
 block/quorum.c                       |   8 +-
 block/raw-format.c                   |   5 -
 block/replication.c                  |  72 +-----
 block/snapshot.c                     |  26 +-
 block/stream.c                       |  12 +-
 block/vmdk.c                         |  20 +-
 block/write-threshold.c              |   6 -
 blockdev.c                           | 315 +++++------------------
 blockjob.c                           |  30 +--
 hw/block/dataplane/virtio-blk.c      |  10 -
 hw/block/dataplane/xen-block.c       |  17 +-
 hw/block/virtio-blk.c                |  45 +---
 hw/core/qdev-properties-system.c     |   9 -
 hw/scsi/scsi-bus.c                   |   2 -
 hw/scsi/scsi-disk.c                  |  29 +--
 hw/scsi/virtio-scsi.c                |  80 +++---
 job.c                                |  16 --
 migration/block.c                    |  33 +--
 migration/migration-hmp-cmds.c       |   3 -
 migration/savevm.c                   |  22 --
 net/colo-compare.c                   |   2 -
 qemu-img.c                           |   4 -
 qemu-io.c                            |  10 +-
 qemu-nbd.c                           |   2 -
 replay/replay-debugging.c            |   4 -
 tests/unit/test-aio.c                |  67 +----
 tests/unit/test-bdrv-drain.c         |  91 ++-----
 tests/unit/test-bdrv-graph-mod.c     |  26 +-
 tests/unit/test-block-iothread.c     |  31 ---
 tests/unit/test-blockjob.c           | 137 ----------
 tests/unit/test-replication.c        |  11 -
 util/async.c                         |  14 --
 util/vhost-user-server.c             |   3 -
 scripts/block-coroutine-wrapper.py   |   7 +-
 tests/qemu-iotests/202               |   2 +-
 tests/qemu-iotests/203               |   3 +-
 tests/tsan/suppressions.tsan         |   1 -
 65 files changed, 324 insertions(+), 1713 deletions(-)

-- 
2.42.0