Skip to content

New op blocker system, part 1

Kevin Wolf qemu-devel 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest44 patches 18 repliesIn review
  2. v243 patches 1 replySuperseded
  3. v154 patches 75 repliesSuperseded

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/44block: Add op blocker permission constantsinclude/block/block.h+36 -00 replies
2/44block: Add Error argument to bdrv_attach_child()block.c block/quorum.c include/block/block.h+23 -50 replies
3/44block: Let callers request permissions when attaching a child nodeblock.c block/block-backend.c include/block/block_int.h+78 -110 replies
4/44block: Involve block drivers in permission grantingblock.c include/block/block_int.h+263 -41 reply
5/44block: Default .bdrv_child_perm() for filter driversblock.c include/block/block_int.h+31 -01 reply
6/44block: Request child permissions in filter driversblock/blkdebug.c block/blkreplay.c block/blkverify.c +3 more+8 -00 replies
7/44block: Default .bdrv_child_perm() for format driversblock.c include/block/block_int.h+52 -01 reply
8/44block: Request child permissions in format driversblock/bochs.c block/cloop.c block/crypto.c +9 more+12 -00 replies
9/44vvfat: Implement .bdrv_child_perm()block.c block/vvfat.c include/block/block_int.h+24 -10 replies
10/44block: Require .bdrv_child_perm() with child nodesblock.c+4 -20 replies
11/44block: Request real permissions in bdrv_attach_child()block.c+8 -21 reply
12/44block: Add permissions to BlockBackendblock/block-backend.c include/sysemu/block-backend.h+29 -00 replies
13/44block: Add permissions to blk_new()block.c block/backup.c block/block-backend.c +15 more+53 -300 replies
14/44block: Add error parameter to blk_insert_bs()block.c block/backup.c block/block-backend.c +11 more+100 -290 replies
15/44block: Add BDRV_O_RESIZE for blk_new_open()block/parallels.c block/qcow.c block/qcow2.c +8 more+23 -121 reply
16/44block: Request real permissions in blk_new_open()block/block-backend.c+19 -30 replies
17/44block: Allow error return in BlockDevOps.change_media_cb()block/block-backend.c blockdev.c hw/block/fdc.c +5 more+36 -150 replies
18/44hw/block: Request permissionshw/block/block.c hw/block/fdc.c hw/block/m25p80.c +14 more+142 -271 reply
19/44hw/block: Introduce share-rw qdev propertyhw/block/block.c include/hw/block/block.h tests/qemu-iotests/172.out+61 -30 replies
20/44blockjob: Add permissions to block_job_create()block/backup.c block/commit.c block/mirror.c +5 more+24 -170 replies
21/44block: Add BdrvChildRole.get_parent_desc()block.c block/block-backend.c include/block/block_int.h+36 -00 replies
22/44block: Include details on permission errors in messageblock.c+56 -111 reply
23/44block: Add BdrvChildRole.stay_at_nodeblock.c include/block/block_int.h+7 -00 replies
24/44blockjob: Add permissions to block_job_add_bdrv()block/backup.c block/commit.c block/mirror.c +3 more+53 -130 replies
25/44commit: Use real permissions in commit block jobblock/commit.c+95 -181 reply
26/44commit: Use real permissions for HMP 'commit'block/commit.c+27 -60 replies
27/44backup: Use real permissions in backup block jobblock/backup.c tests/qemu-iotests/055+17 -90 replies
28/44block: Fix pending requests check in bdrv_append()block.c+2 -21 reply
29/44block: BdrvChildRole.attach/detach() callbacksblock.c include/block/block_int.h+63 -350 replies
30/44block: Allow backing file links in change_parent_backing_link()block.c+3 -40 replies
31/44blockjob: Factor out block_job_remove_all_bdrv()blockjob.c include/block/blockjob.h+22 -71 reply
32/44mirror: Use real permissions in mirror/active commit block jobblock/mirror.c qemu-img.c tests/qemu-iotests/141 +1 more+190 -381 reply
33/44stream: Use real permissions in streaming block jobblock/stream.c+27 -120 replies
34/44mirror: Add filter-node-name to blockdev-mirrorblock/mirror.c blockdev.c include/block/block_int.h +1 more+30 -90 replies
35/44commit: Add filter-node-name to block-commitblock/commit.c block/mirror.c block/replication.c +4 more+32 -131 reply
36/44hmp: Request permissions in qemu-ioblock/block-backend.c hmp.c include/qemu-io.h +2 more+61 -10 replies
37/44migration/block: Use real permissionsmigration/block.c+17 -51 reply
38/44nbd/server: Use real permissions for NBD exportsnbd/server.c+9 -20 replies
39/44tests: Remove FIXME commentstests/test-blockjob.c tests/test-throttle.c+2 -20 replies
40/44block: Pass BdrvChild to bdrv_aligned_preadv/pwritev and copy-on-readblock/io.c+21 -161 reply
41/44block: Assertions for write permissionsblock/io.c+3 -01 reply
42/44block: Assertions for resize permissionblock.c block/io.c+4 -00 replies
43/44block: Add Error parameter to bdrv_set_backing_hd()block.c block/commit.c block/mirror.c +3 more+47 -181 reply
44/44block: Add Error parameter to bdrv_append()block.c block/mirror.c blockdev.c +2 more+43 -121 reply

Reviews trailers per patch

All 44 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchMax ReitzFam Zheng
SeriesA-b
1/44R-b
2/44R-b
3/44R-b
4/44R-b
5/44R-b
6/44R-b
7/44R-b
8/44R-b
9/44R-b
10/44R-b
11/44R-b
12/44R-b
13/44R-b
14/44R-b
15/44R-b
16/44R-b
17/44R-b
18/44R-b
19/44R-b
20/44R-b
21/44R-b
22/44R-b
23/44R-b
24/44R-b
25/44R-b
26/44R-b
27/44R-b
28/44R-b
29/44R-b
30/44R-b
31/44R-b
32/44A-b
33/44R-b
34/44R-b
35/44R-b
36/44R-b
37/44R-b
38/44R-b
39/44R-b
40/44R-b
41/44R-b
42/44R-b
43/44R-b
44/44R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [Qemu-devel] [PATCH v3 00/44] New op blocker system, part 1

This series is the first part of implementing the new op blocker system whose design was agreed on quite a while ago, but proved a bit tricky to implement in places. There is more work to do to fully replace the old op blocker system, but realistically we don't have that much time until the 2.9 freeze. So let's merge this series to complement the traditional op blockers and plan with a second part for the 2.10 timeframe.

The basic idea is that every user of a block node (including things outside the block layer that go through a BlockBackend, and also other block nodes that hold references to it) has to declare which low-level operations/permissions it needs and which operation it allows other users to perform on the same node. Depending on these declarations, conflicts are avoided by returning an error for attempts to attach a conflicting user to the same node.

After this series, all users request permissions, and hopefully all of the permissions they need. For writes and resize, getting the permission first is actually enforced with assertions. Asserting it for consistent reads is in theory doable, but would mean introducing a request flag that tell us that inconsistent reads are okay - and that in all block drivers to recursively propagate this flag through the backing chain. It might not be worth it.

As stated above, the series doesn't remove the old op blockers yet, though in theory the new op blockers should block everything that needs to be blocked. In practice, the read/write/resize blockers should be okay, but BLK_PERM_GRAPH_MOD isn't to be taken too seriously at the moment. It isn't really applied consistently and doesn't do much useful yet. Making proper use of it is left for the part 2 series.

Kevin Wolf (44):
block: Add op blocker permission constants
block: Add Error argument to bdrv_attach_child()
block: Let callers request permissions when attaching a child node
block: Involve block drivers in permission granting
block: Default .bdrv_child_perm() for filter drivers
block: Request child permissions in filter drivers
block: Default .bdrv_child_perm() for format drivers
block: Request child permissions in format drivers
vvfat: Implement .bdrv_child_perm()
block: Require .bdrv_child_perm() with child nodes
block: Request real permissions in bdrv_attach_child()
block: Add permissions to BlockBackend
block: Add permissions to blk_new()
block: Add error parameter to blk_insert_bs()
block: Add BDRV_O_RESIZE for blk_new_open()
block: Request real permissions in blk_new_open()
block: Allow error return in BlockDevOps.change_media_cb() hw/block: Request permissions
hw/block: Introduce share-rw qdev property
blockjob: Add permissions to block_job_create()
block: Add BdrvChildRole.get_parent_desc()
block: Include details on permission errors in message
block: Add BdrvChildRole.stay_at_node
blockjob: Add permissions to block_job_add_bdrv()
commit: Use real permissions in commit block job
commit: Use real permissions for HMP 'commit'
backup: Use real permissions in backup block job
block: Fix pending requests check in bdrv_append()
block: BdrvChildRole.attach/detach() callbacks
block: Allow backing file links in change_parent_backing_link()
blockjob: Factor out block_job_remove_all_bdrv()
mirror: Use real permissions in mirror/active commit block job
stream: Use real permissions in streaming block job
mirror: Add filter-node-name to blockdev-mirror
commit: Add filter-node-name to block-commit
hmp: Request permissions in qemu-io
migration/block: Use real permissions
nbd/server: Use real permissions for NBD exports
tests: Remove FIXME comments
block: Pass BdrvChild to bdrv_aligned_preadv/pwritev and copy-on-read
block: Assertions for write permissions
block: Assertions for resize permission
block: Add Error parameter to bdrv_set_backing_hd()
block: Add Error parameter to bdrv_append()

 block.c                          | 583 ++++++++++++++++++++++++++++++++++-----
 block/backup.c                   |  22 +-
 block/blkdebug.c                 |   2 +
 block/blkreplay.c                |   1 +
 block/blkverify.c                |   1 +
 block/block-backend.c            | 116 +++++++-
 block/bochs.c                    |   1 +
 block/cloop.c                    |   1 +
 block/commit.c                   | 176 ++++++++++--
 block/crypto.c                   |   1 +
 block/dmg.c                      |   1 +
 block/io.c                       |  41 +--
 block/mirror.c                   | 237 ++++++++++++++--
 block/parallels.c                |   4 +-
 block/qcow.c                     |   4 +-
 block/qcow2.c                    |  19 +-
 block/qed.c                      |   4 +-
 block/quorum.c                   |  11 +-
 block/raw-format.c               |   1 +
 block/replication.c              |   3 +-
 block/sheepdog.c                 |   2 +-
 block/stream.c                   |  47 +++-
 block/vdi.c                      |   4 +-
 block/vhdx.c                     |   4 +-
 block/vmdk.c                     |   7 +-
 block/vpc.c                      |   4 +-
 block/vvfat.c                    |  24 +-
 blockdev.c                       |  74 ++++-
 blockjob.c                       |  62 ++++-
 hmp.c                            |  33 ++-
 hw/block/block.c                 |  24 +-
 hw/block/fdc.c                   |  28 +-
 hw/block/m25p80.c                |   8 +
 hw/block/nand.c                  |   7 +
 hw/block/nvme.c                  |   8 +-
 hw/block/onenand.c               |   7 +
 hw/block/pflash_cfi01.c          |  18 +-
 hw/block/pflash_cfi02.c          |  19 +-
 hw/block/virtio-blk.c            |   8 +-
 hw/core/qdev-properties-system.c |   9 +-
 hw/ide/core.c                    |   2 +-
 hw/ide/qdev.c                    |   9 +-
 hw/nvram/spapr_nvram.c           |   8 +
 hw/scsi/scsi-disk.c              |  12 +-
 hw/sd/sd.c                       |   8 +-
 hw/usb/dev-storage.c             |   6 +-
 include/block/block.h            |  46 ++-
 include/block/block_int.h        | 126 ++++++++-
 include/block/blockjob.h         |  14 +-
 include/block/blockjob_int.h     |   4 +-
 include/hw/block/block.h         |   8 +-
 include/qemu-io.h                |   1 +
 include/sysemu/block-backend.h   |   9 +-
 migration/block.c                |  21 +-
 nbd/server.c                     |  16 +-
 qapi/block-core.json             |  16 +-
 qemu-img.c                       |  12 +-
 qemu-io-cmds.c                   |  28 ++
 tests/qemu-iotests/051.pc.out    |   6 +-
 tests/qemu-iotests/055           |  11 +-
 tests/qemu-iotests/085.out       |   2 +-
 tests/qemu-iotests/141           |   2 +-
 tests/qemu-iotests/141.out       |   4 +-
 tests/qemu-iotests/172.out       |  53 ++++
 tests/test-blockjob-txn.c        |   6 +-
 tests/test-blockjob.c            |  10 +-
 tests/test-throttle.c            |   7 +-
 67 files changed, 1786 insertions(+), 287 deletions(-)
Signature · 1 line
1.8.3.1