New op blocker system, part 1
v2 cover 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 (43):
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()
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 | 563 ++++++++++++++++++++++++++++++++++----- 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 | 233 ++++++++++++++-- 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 | 45 +++- 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 | 48 +++- 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 | 5 +- 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, 1745 insertions(+), 279 deletions(-)
Signature · 1 line
1.8.3.1
PATCH v2 1/43 block: Add op blocker permission constants
This patch defines the permission categories that will be used by the new op blocker system.
--- include/block/block.h | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)
include/block/block.h +36 -0
@@ -187,6 +187,42 @@ typedef enum BlockOpType {BLOCK_OP_TYPE_MAX , } BlockOpType; +/* Block node permission constants */ +enum { +/** +* A user that has the "permission" of consistent reads is guaranteed that +* their view of the contents of the block device is complete and +* self-consistent, representing the contents of a disk at a specific +* point. +* +* For most block devices (including their backing files) this is true, but +* the property cannot be maintained in a few situations like for +* intermediate nodes of a commit block job. +*/ +BLK_PERM_CONSISTENT_READ =0x01 , + +/** This permission is required to change the visible disk contents. */ +BLK_PERM_WRITE =0x02 , + +/** +* This permission (which is weaker than BLK_PERM_WRITE) is both enough and +* required for writes to the block node when the caller promises that +* the visible disk content doesn't change. +*/ +BLK_PERM_WRITE_UNCHANGED =0x04 , + +/** This permission is required to change the size of a block node. */ +BLK_PERM_RESIZE =0x08 , + +/** +* This permission is required to change the node that this BdrvChild +* points to. +*/ +BLK_PERM_GRAPH_MOD =0x10 , + +BLK_PERM_ALL =0x1f , +}; +/* disk I/O throttling */ void bdrv_init (void );void bdrv_init_with_whitelist (void );
Signature · 1 line
1.8.3.1
PATCH v2 2/43 block: Add Error argument to bdrv_attach_child()
In reply to Kevin WolfIt will have to return an error soon, so prepare the callers for it.
--- block.c | 16 +++++++++++++--- block/quorum.c | 9 ++++++++- include/block/block.h | 3 ++- 3 files changed, 23 insertions(+), 5 deletions(-)
block.c +13 -3
@@ -1368,7 +1368,8 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs,BdrvChild *bdrv_attach_child (BlockDriverState *parent_bs,BlockDriverState *child_bs,const char *child_name, -const BdrvChildRole *child_role) +const BdrvChildRole *child_role, +Error **errp) {BdrvChild *child =bdrv_root_attach_child (child_bs, child_name, child_role, parent_bs);
@@ -1469,7 +1470,9 @@ void bdrv_set_backing_hd(BlockDriverState *bs, BlockDriverState *backing_hd) bs->backing =NULL ; goto out; } - bs->backing =bdrv_attach_child (bs, backing_hd,"backing" , &child_backing); +/* FIXME Error handling */ + bs->backing =bdrv_attach_child (bs, backing_hd,"backing" , &child_backing, + &error_abort); bs->open_flags &= ~BDRV_O_NO_BACKING ;pstrcpy (bs->backing_file,sizeof (bs->backing_file), backing_hd->filename); pstrcpy(bs->backing_format, sizeof(bs->backing_format),
@@ -1648,6 +1651,7 @@ BdrvChild *bdrv_open_child(const char *filename,const BdrvChildRole *child_role, bool allow_none, Error **errp) { + BdrvChild *c;BlockDriverState *bs; bs = bdrv_open_child_bs(filename, options, bdref_key, parent, child_role,
@@ -1656,7 +1660,13 @@ BdrvChild *bdrv_open_child(const char *filename,return NULL ; } -return bdrv_attach_child (parent, bs, bdref_key, child_role); + c =bdrv_attach_child (parent, bs, bdref_key, child_role, errp); +if (!c) { +bdrv_unref (bs); +return NULL ; + } + +return c; } static BlockDriverState *bdrv_append_temp_snapshot(BlockDriverState *bs,
block/quorum.c +8 -1
@@ -1032,10 +1032,17 @@ static void quorum_add_child(BlockDriverState *bs, BlockDriverState *child_bs,/* We can safely add the child now */ bdrv_ref (child_bs); - child =bdrv_attach_child (bs, child_bs, indexstr, &child_format); + + child =bdrv_attach_child (bs, child_bs, indexstr, &child_format, errp); +if (child ==NULL ) { + s->next_child_index--; +bdrv_unref (child_bs); + goto out; + } s->children = g_renew(BdrvChild *, s->children, s->num_children + 1); s->children[s->num_children++] = child; +out:bdrv_drained_end (bs); }
include/block/block.h +2 -1
@@ -520,7 +520,8 @@ void bdrv_unref_child(BlockDriverState *parent, BdrvChild *child);BdrvChild *bdrv_attach_child (BlockDriverState *parent_bs,BlockDriverState *child_bs,const char *child_name, -const BdrvChildRole *child_role); +const BdrvChildRole *child_role, +Error **errp);bool bdrv_op_is_blocked (BlockDriverState *bs,BlockOpType op,Error **errp);void bdrv_op_block (BlockDriverState *bs,BlockOpType op,Error *reason);
Signature · 1 line
1.8.3.1
PATCH v2 3/43 block: Let callers request permissions when attaching a child node
In reply to Kevin WolfWhen attaching a node as a child to a new parent, the required and shared permissions for this parent are checked against all other parents of the node now, and an error is returned if there is a conflict.
This allows error returns to a function that previously always succeeded, and the same is true for quite a few callers and their callers. Converting all of them within the same patch would be too much, so for now everyone tells that they don't need any permissions and allow everyone else to do anything. This way we can use &error_abort initially and convert caller by caller to pass actual permission requirements and implement error handling.
All these places are marked with FIXME comments and it will be the job of the next patches to clean them up again.
--- block.c | 66 +++++++++++++++++++++++++++++++++++++++++------ block/block-backend.c | 8 ++++-- include/block/block_int.h | 15 ++++++++++- 3 files changed, 78 insertions(+), 11 deletions(-)
block.c +58 -8
@@ -1326,6 +1326,38 @@ static int bdrv_fill_options(QDict **options, const char *filename,return 0 ; } +static int bdrv_check_update_perm (BlockDriverState *bs,uint64_t new_used_perm, +uint64_t new_shared_perm, +BdrvChild *ignore_child,Error **errp) +{ +BdrvChild *c; + +/* There is no reason why anyone couldn't tolerate write_unchanged */ +assert (new_shared_perm &BLK_PERM_WRITE_UNCHANGED ); + + QLIST_FOREACH(c, &bs->parents, next_parent) { +if (c == ignore_child) { +continue ; + } + +if ((new_used_perm & c->shared_perm) != new_used_perm || + (c->perm & new_shared_perm) != c->perm) + { +const char *user =NULL ; +if (c->role->get_name) { + user = c->role->get_name (c); +if (user && !*user) { + user =NULL ; + } + } +error_setg (errp,"Conflicts with %s" , user ?:"another operation" ); +return -EPERM ; + } + } + +return 0 ; +} +static void bdrv_replace_child (BdrvChild *child,BlockDriverState *new_bs) {BlockDriverState *old_bs = child->bs;
@@ -1350,14 +1382,25 @@ static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs)BdrvChild *bdrv_root_attach_child (BlockDriverState *child_bs,const char *child_name,const BdrvChildRole *child_role, -void *opaque) +uint64_t perm,uint64_t shared_perm, +void *opaque,Error **errp) { -BdrvChild *child =g_new (BdrvChild,1 ); +BdrvChild *child; +int ret; + + ret =bdrv_check_update_perm (child_bs, perm, shared_perm,NULL , errp); +if (ret <0 ) { +return NULL ; + } + + child =g_new (BdrvChild,1 ); *child = (BdrvChild ) { - .bs =NULL , - .name =g_strdup (child_name), - .role = child_role, - .opaque = opaque, + .bs =NULL , + .name =g_strdup (child_name), + .role = child_role, + .perm = perm, + .shared_perm = shared_perm, + .opaque = opaque, };bdrv_replace_child (child, child_bs);
@@ -1371,8 +1414,15 @@ BdrvChild *bdrv_attach_child(BlockDriverState *parent_bs,const BdrvChildRole *child_role, Error **errp) { - BdrvChild *child = bdrv_root_attach_child(child_bs, child_name, child_role, - parent_bs); + BdrvChild *child; + +/* FIXME Use real permissions */ + child =bdrv_root_attach_child (child_bs, child_name, child_role, +0 ,BLK_PERM_ALL , parent_bs, errp); +if (child ==NULL ) { +return NULL ; + } +QLIST_INSERT_HEAD (&parent_bs->children, child, next);return child; }
block/block-backend.c +6 -2
@@ -163,7 +163,9 @@ BlockBackend *blk_new_open(const char *filename, const char *reference,return NULL ; } - blk->root =bdrv_root_attach_child (bs,"root" , &child_root, blk); +/* FIXME Use real permissions */ + blk->root =bdrv_root_attach_child (bs,"root" , &child_root, +0 ,BLK_PERM_ALL , blk, &error_abort);return blk; }
@@ -498,7 +500,9 @@ void blk_remove_bs(BlockBackend *blk)void blk_insert_bs (BlockBackend *blk,BlockDriverState *bs) {bdrv_ref (bs); - blk->root =bdrv_root_attach_child (bs,"root" , &child_root, blk); +/* FIXME Use real permissions */ + blk->root =bdrv_root_attach_child (bs,"root" , &child_root, +0 ,BLK_PERM_ALL , blk, &error_abort);notifier_list_notify (&blk->insert_bs_notifiers, blk);if (blk->public.throttle_state) {
include/block/block_int.h +14 -1
@@ -419,6 +419,18 @@ struct BdrvChild {char *name;const BdrvChildRole *role;void *opaque; + +/** +* Granted permissions for operating on this BdrvChild (BLK_PERM_* bitmask) +*/ +uint64_t perm; + +/** +* Permissions that can still be granted to other users of @bs while this +* BdrvChild is still attached to it. (BLK_PERM_* bitmask) +*/ +uint64_t shared_perm; +QLIST_ENTRY (BdrvChild) next;QLIST_ENTRY (BdrvChild) next_parent; };
@@ -796,7 +808,8 @@ void hmp_drive_add_node(Monitor *mon, const char *optstr);BdrvChild *bdrv_root_attach_child (BlockDriverState *child_bs,const char *child_name,const BdrvChildRole *child_role, -void *opaque); +uint64_t perm,uint64_t shared_perm, +void *opaque,Error **errp);void bdrv_root_unref_child (BdrvChild *child);const char *bdrv_get_parent_name (const BlockDriverState *bs);
Signature · 1 line
1.8.3.1
PATCH v2 4/43 block: Involve block drivers in permission granting
In reply to Kevin WolfIn many cases, the required permissions of one node on its children depend on what its parents require from it. For example, the raw format or most filter drivers only need to request consistent reads if that's something that one of their parents wants.
In order to achieve this, this patch introduces two new BlockDriver callbacks. The first one lets drivers first check (recursively) whether the requested permissions can be set; the second one actually sets the new permission bitmask.
Also add helper functions that drivers can use in their implementation of the callbacks to update their permissions on a specific child.
--- block.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++ include/block/block_int.h | 61 ++++++++++++++++ 2 files changed, 238 insertions(+)
block.c +177 -0
@@ -1326,11 +1326,145 @@ static int bdrv_fill_options(QDict **options, const char *filename,return 0 ; } +/* +* Check whether permissions on this node can be changed in a way that +* @cumulative_perms and @cumulative_shared_perms are the new cumulative +* permissions of all its parents. This involves checking whether all necessary +* permission changes to child nodes can be performed. +* +* A call to this function must always be followed by a call to bdrv_set_perm() +* or bdrv_abort_perm_update(). +*/ +static int bdrv_check_perm (BlockDriverState *bs,uint64_t cumulative_perms, +uint64_t cumulative_shared_perms,Error **errp) +{ +BlockDriver *drv = bs->drv; +BdrvChild *c; +int ret; + +if (!drv) { +error_setg (errp,"Block node is not opened" ); +return -EINVAL ; + } + +/* Write permissions never work with read-only images */ +if ((cumulative_perms & (BLK_PERM_WRITE |BLK_PERM_WRITE_UNCHANGED )) && +bdrv_is_read_only (bs)) + { +error_setg (errp,"Block node is read-only" ); +return -EPERM ; + } + +/* Check this node */ +if (drv->bdrv_check_perm) { +return drv->bdrv_check_perm (bs, cumulative_perms, + cumulative_shared_perms, errp); + } + +/* Drivers may not have .bdrv_child_perm() */ +if (!drv->bdrv_child_perm) { +return 0 ; + } + +/* Check all children */ + QLIST_FOREACH(c, &bs->children, next) { +uint64_t cur_perm, cur_shared; + drv->bdrv_child_perm (bs, c, c->role, + cumulative_perms, cumulative_shared_perms, + &cur_perm, &cur_shared); + ret =bdrv_child_check_perm (c, cur_perm, cur_shared, errp); +if (ret <0 ) { +return ret; + } + } + +return 0 ; +} + +/* +* Notifies drivers that after a previous bdrv_check_perm() call, the +* permission update is not performed and any preparations made for it (e.g. +* taken file locks) need to be undone. +* +* This function recursively notifies all child nodes. +*/ +static void bdrv_abort_perm_update (BlockDriverState *bs) +{ +BlockDriver *drv = bs->drv; +BdrvChild *c; + +if (!drv) { +return ; + } + +if (drv->bdrv_abort_perm_update) { + drv->bdrv_abort_perm_update (bs); + } + + QLIST_FOREACH(c, &bs->children, next) { +bdrv_child_abort_perm_update (c); + } +} + +static void bdrv_set_perm (BlockDriverState *bs,uint64_t cumulative_perms, +uint64_t cumulative_shared_perms) +{ +BlockDriver *drv = bs->drv; +BdrvChild *c; + +if (!drv) { +return ; + } + +/* Update this node */ +if (drv->bdrv_set_perm) { + drv->bdrv_set_perm (bs, cumulative_perms, cumulative_shared_perms); + } + +/* Drivers may not have .bdrv_child_perm() */ +if (!drv->bdrv_child_perm) { +return ; + } + +/* Update all children */ + QLIST_FOREACH(c, &bs->children, next) { +uint64_t cur_perm, cur_shared; + drv->bdrv_child_perm (bs, c, c->role, + cumulative_perms, cumulative_shared_perms, + &cur_perm, &cur_shared); +bdrv_child_set_perm (c, cur_perm, cur_shared); + } +} + +static void bdrv_update_perm (BlockDriverState *bs) +{ +BdrvChild *c; +uint64_t cumulative_perms =0 ; +uint64_t cumulative_shared_perms =BLK_PERM_ALL ; + + QLIST_FOREACH(c, &bs->parents, next_parent) { + cumulative_perms |= c->perm; + cumulative_shared_perms &= c->shared_perm; + } + +bdrv_set_perm (bs, cumulative_perms, cumulative_shared_perms); +} + +/* +* Checks whether a new reference to @bs can be added if the new user requires +* @new_used_perm/@new_shared_perm as its permissions. If @ignore_child is set, +* this old reference is ignored in the calculations; this allows checking +* permission updates for an existing reference. +* +* Needs to be followed by a call to either bdrv_set_perm() or +* bdrv_abort_perm_update(). */ static int bdrv_check_update_perm (BlockDriverState *bs,uint64_t new_used_perm,uint64_t new_shared_perm,BdrvChild *ignore_child,Error **errp) {BdrvChild *c; +uint64_t cumulative_perms = new_used_perm; +uint64_t cumulative_shared_perms = new_shared_perm;/* There is no reason why anyone couldn't tolerate write_unchanged */ assert (new_shared_perm &BLK_PERM_WRITE_UNCHANGED );
@@ -1353,8 +1487,47 @@ static int bdrv_check_update_perm(BlockDriverState *bs, uint64_t new_used_perm,error_setg (errp,"Conflicts with %s" , user ?:"another operation" );return -EPERM ; } + + cumulative_perms |= c->perm; + cumulative_shared_perms &= c->shared_perm; + } + +return bdrv_check_perm (bs, cumulative_perms, cumulative_shared_perms, errp); +} + +/* Needs to be followed by a call to either bdrv_child_set_perm() or +* bdrv_child_abort_perm_update(). */ +int bdrv_child_check_perm (BdrvChild *c,uint64_t perm,uint64_t shared, +Error **errp) +{ +return bdrv_check_update_perm (c->bs, perm, shared, c, errp); +} + +void bdrv_child_set_perm (BdrvChild *c,uint64_t perm,uint64_t shared) +{ + c->perm = perm; + c->shared_perm = shared; +bdrv_update_perm (c->bs); +} + +void bdrv_child_abort_perm_update (BdrvChild *c) +{ +bdrv_abort_perm_update (c->bs); +} + +int bdrv_child_try_set_perm (BdrvChild *c,uint64_t perm,uint64_t shared, +Error **errp) +{ +int ret; + + ret =bdrv_child_check_perm (c, perm, shared, errp); +if (ret <0 ) { +bdrv_child_abort_perm_update (c); +return ret; } +bdrv_child_set_perm (c, perm, shared); +return 0 ; }
@@ -1367,6 +1540,7 @@ static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs) child->role->drained_end (child); }QLIST_REMOVE (child, next_parent); +bdrv_update_perm (old_bs); } child->bs = new_bs;
@@ -1376,6 +1550,7 @@ static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs)if (new_bs->quiesce_counter && child->role->drained_begin) { child->role->drained_begin (child); } +bdrv_update_perm (new_bs); } }
@@ -1390,6 +1565,7 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs, ret =bdrv_check_update_perm (child_bs, perm, shared_perm,NULL , errp);if (ret <0 ) { +bdrv_abort_perm_update (child_bs);return NULL ; }
@@ -1403,6 +1579,7 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs, .opaque = opaque, }; +/* This performs the matching bdrv_set_perm() for the above check. */ bdrv_replace_child (child, child_bs);return child;
include/block/block_int.h +61 -0
73 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH v2 04/43] block: Involve block drivers in permission granting
include/block/block_int.h struct BlockDriver {
Quoted 8 lines · Kevin Wolf
include/block/block_int.h +8
-0+/** +* Called to inform the driver that the set of cumulative set of used +* permissions for @bs has changed to @perm, and the set of sharable +* permission to @shared. The driver can use this to propagate changes to +* its children (i.e. request permissions only if a parent actually needs +* them). +* +* This function is only invoked after bdrv_check_perm(),
Trying to rebase the image locking series and found this contract doesn't seem to hold as in:
(gdb) bt
#0 0x00007ffff1ad291f in raise () at /lib64/libc.so.6 #1 0x00007ffff1ad451a in abort () at /lib64/libc.so.6 #2 0x00007ffff1acada7 in __assert_fail_base () at /lib64/libc.so.6 #3 0x00007ffff1acae52 in () at /lib64/libc.so.6 #4 0x0000555555b9e73e in raw_set_perm (bs=0x5555567ee7a0, perm=0, shared=31) at /stor/work/qemu/block/file-posix.c:2541 #5 0x0000555555b43437 in bdrv_set_perm (bs=0x5555567ee7a0, cumulative_perms=0, cumulative_shared_perms=31) at /stor/work/qemu/block.c:1484 #6 0x0000555555b4357a in bdrv_update_perm (bs=0x5555567ee7a0) at /stor/work/qemu/block.c:1514 #7 0x0000555555b43cb9 in bdrv_replace_child (child=0x5555567f2cb0, new_bs=0x0) at /stor/work/qemu/block.c:1721 #8 0x0000555555b4402e in bdrv_detach_child (child=0x5555567f2cb0) at /stor/work/qemu/block.c:1798 #9 0x0000555555b44070 in bdrv_root_unref_child (child=0x5555567f2cb0) at /stor/work/qemu/block.c:1809
#10 0x0000555555b941f1 in blk_remove_bs (blk=0x5555567f3e60) at /stor/work/qemu/block/block-backend.c:541
#11 0x0000555555b9397a in blk_delete (blk=0x5555567f3e60) at /stor/work/qemu/block/block-backend.c:227
#12 0x0000555555b93b3e in blk_unref (blk=0x5555567f3e60) at /stor/work/qemu/block/block-backend.c:271
#13 0x0000555555b45215 in bdrv_open_inherit (filename=0x5555567de020 "/stor/vm/arch.img", reference=0x0, options=0x5555567ec5e0, flags=8194, parent=0x0, child_role=0x0, errp=0x7fffffffdcc8)
at /stor/work/qemu/block.c:2312
#14 0x0000555555b45613 in bdrv_open (filename=0x5555567de020 "/stor/vm/arch.img", reference=0x0, options=0x5555567e60b0, flags=0, errp=0x7fffffffdcc8) at /stor/work/qemu/block.c:2400 #15 0x0000555555b93864 in blk_new_open (filename=0x5555567de020 "/stor/vm/arch.img", reference=0x0, options=0x5555567e60b0, flags=0, errp=0x7fffffffdcc8)
at /stor/work/qemu/block/block-backend.c:209
#16 0x00005555558d7db0 in blockdev_init (file=0x5555567de020 "/stor/vm/arch.img", bs_opts=0x5555567e60b0, errp=0x7fffffffdcc8) at /stor/work/qemu/blockdev.c:585 #17 0x00005555558d8e92 in drive_new (all_opts=0x55555674ff50, block_default_type=IF_IDE) at /stor/work/qemu/blockdev.c:1083
#18 0x00005555558e883a in drive_init_func (opaque=0x5555567a5760, opts=0x55555674ff50, errp=0x0) at /stor/work/qemu/vl.c:1129
#19 0x0000555555c4c5d8 in qemu_opts_foreach (list=0x555556143c60 <qemu_drive_opts>, func=0x5555558e880a <drive_init_func>, opaque=0x5555567a5760, errp=0x0)
at /stor/work/qemu/util/qemu-option.c:1135
#20 0x00005555558f1020 in main (argc=2, argv=0x7fffffffe1a8, envp=0x7fffffffe1c0) at /stor/work/qemu/vl.c:4410
Maybe bdrv_update_perm should call bdrv_check_perm too?
Fam
PATCH v2 5/43 block: Default .bdrv_child_perm() for filter drivers
In reply to Kevin WolfMost filters need permissions related to read and write for their children, but only if the node has a parent that wants to use the same operation on the filter. The same is true for resize.
This adds a default implementation that simply forwards all necessary permissions to all children of the node and leaves the other permissions unchanged.
--- block.c | 24 ++++++++++++++++++++++++ include/block/block_int.h | 8 ++++++++ 2 files changed, 32 insertions(+)
block.c +24 -0
@@ -1531,6 +1531,30 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared,return 0 ; } +#define DEFAULT_PERM_PASSTHROUGH (BLK_PERM_CONSISTENT_READ \ + | BLK_PERM_WRITE \ + | BLK_PERM_WRITE_UNCHANGED \ + | BLK_PERM_RESIZE) +#define DEFAULT_PERM_UNCHANGED (BLK_PERM_ALL & ~DEFAULT_PERM_PASSTHROUGH) + +void bdrv_filter_default_perms (BlockDriverState *bs,BdrvChild *c, +const BdrvChildRole *role, +uint64_t perm,uint64_t shared, +uint64_t *nperm,uint64_t *nshared) +{ +if (c ==NULL ) { + *nperm = perm &DEFAULT_PERM_PASSTHROUGH ; + *nshared = (shared &DEFAULT_PERM_PASSTHROUGH ) |DEFAULT_PERM_UNCHANGED ; +return ; + } + + *nperm = (perm &DEFAULT_PERM_PASSTHROUGH ) | + (c->perm &DEFAULT_PERM_UNCHANGED ); + *nshared = (shared &DEFAULT_PERM_PASSTHROUGH ) | + (c->shared_perm &DEFAULT_PERM_UNCHANGED ); +} + +static void bdrv_replace_child (BdrvChild *child,BlockDriverState *new_bs) {BlockDriverState *old_bs = child->bs;
include/block/block_int.h +8 -0
@@ -872,6 +872,14 @@ void bdrv_child_abort_perm_update(BdrvChild *c);int bdrv_child_try_set_perm (BdrvChild *c,uint64_t perm,uint64_t shared,Error **errp); +/* Default implementation for BlockDriver.bdrv_child_perm() that can be used by +* block filters: Forward CONSISTENT_READ, WRITE, WRITE_UNCHANGED and RESIZE to +* all children */ +void bdrv_filter_default_perms (BlockDriverState *bs,BdrvChild *c, +const BdrvChildRole *role, +uint64_t perm,uint64_t shared, +uint64_t *nperm,uint64_t *nshared); +const char *bdrv_get_parent_name (const BlockDriverState *bs);void blk_dev_change_media_cb (BlockBackend *blk,bool load);
Signature · 1 line
1.8.3.1
PATCH v2 6/43 block: Request child permissions in filter drivers
In reply to Kevin WolfAll callers will have to request permissions for all of their child nodes. Block drivers that act as simply filters can use the default implementation of .bdrv_child_perm().
--- block/blkdebug.c | 2 ++ block/blkreplay.c | 1 + block/blkverify.c | 1 + block/quorum.c | 2 ++ block/raw-format.c | 1 + block/replication.c | 1 + 6 files changed, 8 insertions(+)
block/blkdebug.c +2 -0
@@ -734,6 +734,8 @@ static BlockDriver bdrv_blkdebug = { .bdrv_file_open = blkdebug_open, .bdrv_close = blkdebug_close, .bdrv_reopen_prepare = blkdebug_reopen_prepare, + .bdrv_child_perm = bdrv_filter_default_perms, + .bdrv_getlength = blkdebug_getlength, .bdrv_truncate = blkdebug_truncate, .bdrv_refresh_filename = blkdebug_refresh_filename,
block/blkreplay.c +1 -0
@@ -137,6 +137,7 @@ static BlockDriver bdrv_blkreplay = { .bdrv_file_open = blkreplay_open, .bdrv_close = blkreplay_close, + .bdrv_child_perm = bdrv_filter_default_perms, .bdrv_getlength = blkreplay_getlength, .bdrv_co_preadv = blkreplay_co_preadv,
block/blkverify.c +1 -0
@@ -320,6 +320,7 @@ static BlockDriver bdrv_blkverify = { .bdrv_parse_filename = blkverify_parse_filename, .bdrv_file_open = blkverify_open, .bdrv_close = blkverify_close, + .bdrv_child_perm = bdrv_filter_default_perms, .bdrv_getlength = blkverify_getlength, .bdrv_refresh_filename = blkverify_refresh_filename,
block/quorum.c +2 -0
@@ -1133,6 +1133,8 @@ static BlockDriver bdrv_quorum = { .bdrv_add_child = quorum_add_child, .bdrv_del_child = quorum_del_child, + .bdrv_child_perm = bdrv_filter_default_perms, + .is_filter = true, .bdrv_recurse_is_first_non_filter = quorum_recurse_is_first_non_filter, };
block/raw-format.c +1 -0
@@ -467,6 +467,7 @@ BlockDriver bdrv_raw = { .bdrv_reopen_abort = &raw_reopen_abort, .bdrv_open = &raw_open, .bdrv_close = &raw_close, + .bdrv_child_perm = bdrv_filter_default_perms, .bdrv_create = &raw_create, .bdrv_co_preadv = &raw_co_preadv, .bdrv_co_pwritev = &raw_co_pwritev,
block/replication.c +1 -0
@@ -660,6 +660,7 @@ BlockDriver bdrv_replication = { .bdrv_open = replication_open, .bdrv_close = replication_close, + .bdrv_child_perm = bdrv_filter_default_perms, .bdrv_getlength = replication_getlength, .bdrv_co_readv = replication_co_readv,
Signature · 1 line
1.8.3.1
PATCH v2 7/43 block: Default .bdrv_child_perm() for format drivers
In reply to Kevin WolfAlmost all format drivers have the same characteristics as far as permissions are concerned: They have one or more children for storing their own data and, more importantly, metadata (can be written to and grow even without external write requests, must be protected against other writers and present consistent data) and optionally a backing file (this is just data, so like for a filter, it only depends on what the parent nodes need).
This provides a default implementation that can be shared by most of our format drivers.
--- block.c | 43 +++++++++++++++++++++++++++++++++++++++++++ include/block/block_int.h | 8 ++++++++ 2 files changed, 51 insertions(+)
block.c +43 -0
@@ -1554,6 +1554,49 @@ void bdrv_filter_default_perms(BlockDriverState *bs, BdrvChild *c, (c->shared_perm &DEFAULT_PERM_UNCHANGED ); } +void bdrv_format_default_perms (BlockDriverState *bs,BdrvChild *c, +const BdrvChildRole *role, +uint64_t perm,uint64_t shared, +uint64_t *nperm,uint64_t *nshared) +{ +bool backing = (role == &child_backing); +assert (role == &child_backing || role == &child_file); + +if (!backing) { +/* Apart from the modifications below, the same permissions are +* forwarded and left alone as for filters */ +bdrv_filter_default_perms (bs, c, role, perm, shared, &perm, &shared); + +/* Format drivers may touch metadata even if the guest doesn't write */ +if (!bdrv_is_read_only (bs)) { + perm |=BLK_PERM_WRITE |BLK_PERM_RESIZE ; + } + +/* bs->file always needs to be consistent because of the metadata. We +* can never allow other users to resize or write to it. */ + perm |=BLK_PERM_CONSISTENT_READ ; + shared &= ~(BLK_PERM_WRITE |BLK_PERM_RESIZE ); + }else { +/* We want consistent read from backing files if the parent needs it. +* No other operations are performed on backing files. */ + perm &=BLK_PERM_CONSISTENT_READ ; + +/* If the parent can deal with changing data, we're okay with a +* writable and resizable backing file. */ +/* TODO Require !(perm & BLK_PERM_CONSISTENT_READ), too? */ +if (shared &BLK_PERM_WRITE ) { + shared =BLK_PERM_WRITE |BLK_PERM_RESIZE ; + }else { + shared =0 ; + } + + shared |=BLK_PERM_CONSISTENT_READ |BLK_PERM_GRAPH_MOD | +BLK_PERM_WRITE_UNCHANGED ; + } + + *nperm = perm; + *nshared = shared; +}static void bdrv_replace_child (BdrvChild *child,BlockDriverState *new_bs) {
include/block/block_int.h +8 -0
@@ -880,6 +880,14 @@ void bdrv_filter_default_perms(BlockDriverState *bs, BdrvChild *c, uint64_t perm, uint64_t shared, uint64_t *nperm, uint64_t *nshared); +/* Default implementation for BlockDriver.bdrv_child_perm() that can be used by +* (non-raw) image formats: Like above for bs->backing, but for bs->file it +* requires WRITE | RESIZE for read-write images, always requires +* CONSISTENT_READ and doesn't share WRITE. */ +void bdrv_format_default_perms (BlockDriverState *bs,BdrvChild *c, +const BdrvChildRole *role, +uint64_t perm,uint64_t shared, +uint64_t *nperm,uint64_t *nshared);const char *bdrv_get_parent_name (const BlockDriverState *bs);void blk_dev_change_media_cb (BlockBackend *blk,bool load);
Signature · 1 line
1.8.3.1
PATCH v2 8/43 block: Request child permissions in format drivers
In reply to Kevin WolfThis makes use of the .bdrv_child_perm() implementation for formats that we just added. All format drivers expose the permissions they actually need nows, so that they can be set accordingly and updated when parents are attached or detached.
The only format not included here is raw, which was already converted with the other filter drivers.
--- block/bochs.c | 1 + block/cloop.c | 1 + block/crypto.c | 1 + block/dmg.c | 1 + block/parallels.c | 1 + block/qcow.c | 1 + block/qcow2.c | 1 + block/qed.c | 1 + block/vdi.c | 1 + block/vhdx.c | 1 + block/vmdk.c | 1 + block/vpc.c | 1 + 12 files changed, 12 insertions(+)
block/bochs.c +1 -0
@@ -293,6 +293,7 @@ static BlockDriver bdrv_bochs = { .instance_size = sizeof(BDRVBochsState), .bdrv_probe = bochs_probe, .bdrv_open = bochs_open, + .bdrv_child_perm = bdrv_format_default_perms, .bdrv_refresh_limits = bochs_refresh_limits, .bdrv_co_preadv = bochs_co_preadv, .bdrv_close = bochs_close,
block/cloop.c +1 -0
@@ -290,6 +290,7 @@ static BlockDriver bdrv_cloop = { .instance_size = sizeof(BDRVCloopState), .bdrv_probe = cloop_probe, .bdrv_open = cloop_open, + .bdrv_child_perm = bdrv_format_default_perms, .bdrv_refresh_limits = cloop_refresh_limits, .bdrv_co_preadv = cloop_co_preadv, .bdrv_close = cloop_close,
block/crypto.c +1 -0
@@ -628,6 +628,7 @@ BlockDriver bdrv_crypto_luks = { .bdrv_probe = block_crypto_probe_luks, .bdrv_open = block_crypto_open_luks, .bdrv_close = block_crypto_close, + .bdrv_child_perm = bdrv_format_default_perms, .bdrv_create = block_crypto_create_luks, .bdrv_truncate = block_crypto_truncate, .create_opts = &block_crypto_create_opts_luks,
block/dmg.c +1 -0
@@ -697,6 +697,7 @@ static BlockDriver bdrv_dmg = { .bdrv_probe = dmg_probe, .bdrv_open = dmg_open, .bdrv_refresh_limits = dmg_refresh_limits, + .bdrv_child_perm = bdrv_format_default_perms, .bdrv_co_preadv = dmg_co_preadv, .bdrv_close = dmg_close, };
block/parallels.c +1 -0
@@ -762,6 +762,7 @@ static BlockDriver bdrv_parallels = { .bdrv_probe = parallels_probe, .bdrv_open = parallels_open, .bdrv_close = parallels_close, + .bdrv_child_perm = bdrv_format_default_perms, .bdrv_co_get_block_status = parallels_co_get_block_status, .bdrv_has_zero_init = bdrv_has_zero_init_1, .bdrv_co_flush_to_os = parallels_co_flush_to_os,
block/qcow.c +1 -0
@@ -1052,6 +1052,7 @@ static BlockDriver bdrv_qcow = { .bdrv_probe = qcow_probe, .bdrv_open = qcow_open, .bdrv_close = qcow_close, + .bdrv_child_perm = bdrv_format_default_perms, .bdrv_reopen_prepare = qcow_reopen_prepare, .bdrv_create = qcow_create, .bdrv_has_zero_init = bdrv_has_zero_init_1,
block/qcow2.c +1 -0
@@ -3403,6 +3403,7 @@ BlockDriver bdrv_qcow2 = { .bdrv_reopen_commit = qcow2_reopen_commit, .bdrv_reopen_abort = qcow2_reopen_abort, .bdrv_join_options = qcow2_join_options, + .bdrv_child_perm = bdrv_format_default_perms, .bdrv_create = qcow2_create, .bdrv_has_zero_init = bdrv_has_zero_init_1, .bdrv_co_get_block_status = qcow2_co_get_block_status,
block/qed.c +1 -0
@@ -1704,6 +1704,7 @@ static BlockDriver bdrv_qed = { .bdrv_open = bdrv_qed_open, .bdrv_close = bdrv_qed_close, .bdrv_reopen_prepare = bdrv_qed_reopen_prepare, + .bdrv_child_perm = bdrv_format_default_perms, .bdrv_create = bdrv_qed_create, .bdrv_has_zero_init = bdrv_has_zero_init_1, .bdrv_co_get_block_status = bdrv_qed_co_get_block_status,
block/vdi.c +1 -0
@@ -891,6 +891,7 @@ static BlockDriver bdrv_vdi = { .bdrv_open = vdi_open, .bdrv_close = vdi_close, .bdrv_reopen_prepare = vdi_reopen_prepare, + .bdrv_child_perm = bdrv_format_default_perms, .bdrv_create = vdi_create, .bdrv_has_zero_init = bdrv_has_zero_init_1, .bdrv_co_get_block_status = vdi_co_get_block_status,
block/vhdx.c +1 -0
@@ -1983,6 +1983,7 @@ static BlockDriver bdrv_vhdx = { .bdrv_open = vhdx_open, .bdrv_close = vhdx_close, .bdrv_reopen_prepare = vhdx_reopen_prepare, + .bdrv_child_perm = bdrv_format_default_perms, .bdrv_co_readv = vhdx_co_readv, .bdrv_co_writev = vhdx_co_writev, .bdrv_create = vhdx_create,
block/vmdk.c +1 -0
@@ -2359,6 +2359,7 @@ static BlockDriver bdrv_vmdk = { .bdrv_open = vmdk_open, .bdrv_check = vmdk_check, .bdrv_reopen_prepare = vmdk_reopen_prepare, + .bdrv_child_perm = bdrv_format_default_perms, .bdrv_co_preadv = vmdk_co_preadv, .bdrv_co_pwritev = vmdk_co_pwritev, .bdrv_co_pwritev_compressed = vmdk_co_pwritev_compressed,
block/vpc.c +1 -0
@@ -1067,6 +1067,7 @@ static BlockDriver bdrv_vpc = { .bdrv_open = vpc_open, .bdrv_close = vpc_close, .bdrv_reopen_prepare = vpc_reopen_prepare, + .bdrv_child_perm = bdrv_format_default_perms, .bdrv_create = vpc_create, .bdrv_co_preadv = vpc_co_preadv,
Signature · 1 line
1.8.3.1
PATCH v2 9/43 vvfat: Implement .bdrv_child_perm()
In reply to Kevin Wolfvvfat is the last remaining driver that can have children, but doesn't implement .bdrv_child_perm() yet. The default handlers aren't suitable here, so let's implement a very simple driver-specific one that protects the internal child from being used by other users as good as our permissions permit.
--- block.c | 2 +- block/vvfat.c | 22 ++++++++++++++++++++++ include/block/block_int.h | 1 + 3 files changed, 24 insertions(+), 1 deletion(-)
block.c +1 -1
@@ -823,7 +823,7 @@ static void bdrv_backing_options(int *child_flags, QDict *child_options, *child_flags = flags; } -static const BdrvChildRole child_backing = { +const BdrvChildRole child_backing = { .inherit_options = bdrv_backing_options, .drained_begin = bdrv_child_cb_drained_begin, .drained_end = bdrv_child_cb_drained_end,
block/vvfat.c +22 -0
@@ -3052,6 +3052,27 @@ err:return ret; } +static void vvfat_child_perm (BlockDriverState *bs,BdrvChild *c, +const BdrvChildRole *role, +uint64_t perm,uint64_t shared, +uint64_t *nperm,uint64_t *nshared) +{ +BDRVVVFATState *s = bs->opaque; + +assert (c == s->qcow || role == &child_backing); + +if (c == s->qcow) { +/* This is a private node, nobody should try to attach to it */ + *nperm =BLK_PERM_CONSISTENT_READ |BLK_PERM_WRITE ; + *nshared =BLK_PERM_WRITE_UNCHANGED ; + }else { +/* The backing file is there so 'commit' can use it. vvfat doesn't +* access it in any way. */ + *nperm =0 ; + *nshared =BLK_PERM_ALL ; + } +} +static void vvfat_close (BlockDriverState *bs) {BDRVVVFATState *s = bs->opaque;
@@ -3077,6 +3098,7 @@ static BlockDriver bdrv_vvfat = { .bdrv_file_open = vvfat_open, .bdrv_refresh_limits = vvfat_refresh_limits, .bdrv_close = vvfat_close, + .bdrv_child_perm = vvfat_child_perm, .bdrv_co_preadv = vvfat_co_preadv, .bdrv_co_pwritev = vvfat_co_pwritev,
include/block/block_int.h +1 -0
@@ -466,6 +466,7 @@ struct BdrvChildRole {extern const BdrvChildRole child_file;extern const BdrvChildRole child_format; +extern const BdrvChildRole child_backing;struct BdrvChild {BlockDriverState *bs;
Signature · 1 line
1.8.3.1
PATCH v2 10/43 block: Require .bdrv_child_perm() with child nodes
In reply to Kevin WolfAll block drivers that can have child nodes implement .bdrv_child_perm() now. Make this officially a requirement by asserting that only drivers without children can omit .bdrv_child_perm().
--- block.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
block.c +4 -2
@@ -1361,8 +1361,9 @@ static int bdrv_check_perm(BlockDriverState *bs, uint64_t cumulative_perms, cumulative_shared_perms, errp); } -/* Drivers may not have .bdrv_child_perm() */ +/* Drivers that never have children can omit .bdrv_child_perm() */ if (!drv->bdrv_child_perm) { +assert (QLIST_EMPTY (&bs->children));return 0 ; }
@@ -1421,8 +1422,9 @@ static void bdrv_set_perm(BlockDriverState *bs, uint64_t cumulative_perms, drv->bdrv_set_perm (bs, cumulative_perms, cumulative_shared_perms); } -/* Drivers may not have .bdrv_child_perm() */ +/* Drivers that never have children can omit .bdrv_child_perm() */ if (!drv->bdrv_child_perm) { +assert (QLIST_EMPTY (&bs->children));return ; }
Signature · 1 line
1.8.3.1
PATCH v2 11/43 block: Request real permissions in bdrv_attach_child()
In reply to Kevin WolfNow that all block drivers with children tell us what permissions they need from each of their children, bdrv_attach_child() can use this information and make the right requirements while trying to attach new children.
--- block.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
block.c +19 -3
@@ -1438,7 +1438,8 @@ static void bdrv_set_perm(BlockDriverState *bs, uint64_t cumulative_perms, } } -static void bdrv_update_perm (BlockDriverState *bs) +static void bdrv_get_cumulative_perm (BlockDriverState *bs,uint64_t *perm, +uint64_t *shared_perm) {BdrvChild *c;uint64_t cumulative_perms =0 ;
@@ -1449,6 +1450,15 @@ static void bdrv_update_perm(BlockDriverState *bs) cumulative_shared_perms &= c->shared_perm; } + *perm = cumulative_perms; + *shared_perm = cumulative_shared_perms; +} + +static void bdrv_update_perm (BlockDriverState *bs) +{ +uint64_t cumulative_perms, cumulative_shared_perms; + +bdrv_get_cumulative_perm (bs, &cumulative_perms, &cumulative_shared_perms);bdrv_set_perm (bs, cumulative_perms, cumulative_shared_perms); }
@@ -1661,10 +1671,16 @@ BdrvChild *bdrv_attach_child(BlockDriverState *parent_bs, Error **errp) {BdrvChild *child; +uint64_t perm, shared_perm; + +bdrv_get_cumulative_perm (parent_bs, &perm, &shared_perm); + +assert (parent_bs->drv); + parent_bs->drv->bdrv_child_perm (parent_bs,NULL , child_role, + perm, shared_perm, &perm, &shared_perm); -/* FIXME Use real permissions */ child =bdrv_root_attach_child (child_bs, child_name, child_role, -0 ,BLK_PERM_ALL , parent_bs, errp); + perm, shared_perm, parent_bs, errp);if (child ==NULL ) {return NULL ; }
Signature · 1 line
1.8.3.1
PATCH v2 12/43 block: Add permissions to BlockBackend
In reply to Kevin WolfThe BlockBackend can now store the permissions that its user requires. This is necessary because nodes can be ejected from or inserted into a BlockBackend and all of these operations must make sure that the user still gets what it requested initially.
--- block/block-backend.c | 27 +++++++++++++++++++++++++++ include/sysemu/block-backend.h | 2 ++ 2 files changed, 29 insertions(+)
block/block-backend.c +27 -0
@@ -59,6 +59,9 @@ struct BlockBackend {bool iostatus_enabled;BlockDeviceIoStatus iostatus; +uint64_t perm; +uint64_t shared_perm; +bool allow_write_beyond_eof;NotifierList remove_bs_notifiers, insert_bs_notifiers;
@@ -126,6 +129,8 @@ BlockBackend *blk_new(void) blk =g_new0 (BlockBackend,1 ); blk->refcnt =1 ; + blk->perm =0 ; + blk->shared_perm =BLK_PERM_ALL ;blk_set_enable_write_cache (blk, true);qemu_co_queue_init (&blk->public.throttled_reqs[0 ]);
@@ -511,6 +516,27 @@ void blk_insert_bs(BlockBackend *blk, BlockDriverState *bs) } } +/* +* Sets the permission bitmasks that the user of the BlockBackend needs. +*/ +int blk_set_perm (BlockBackend *blk,uint64_t perm,uint64_t shared_perm, +Error **errp) +{ +int ret; + +if (blk->root) { + ret =bdrv_child_try_set_perm (blk->root, perm, shared_perm, errp); +if (ret <0 ) { +return ret; + } + } + + blk->perm = perm; + blk->shared_perm = shared_perm; + +return 0 ; +} +static int blk_do_attach_dev (BlockBackend *blk,void *dev) {if (blk->dev) {
@@ -557,6 +583,7 @@ void blk_detach_dev(BlockBackend *blk, void *dev) blk->dev_ops =NULL ; blk->dev_opaque =NULL ; blk->guest_block_size =512 ; +blk_set_perm (blk,0 ,BLK_PERM_ALL , &error_abort);blk_unref (blk); }
include/sysemu/block-backend.h +2 -0
@@ -105,6 +105,8 @@ void blk_remove_bs(BlockBackend *blk);void blk_insert_bs (BlockBackend *blk,BlockDriverState *bs);bool bdrv_has_blk (BlockDriverState *bs);bool bdrv_is_root_node (BlockDriverState *bs); +int blk_set_perm (BlockBackend *blk,uint64_t perm,uint64_t shared_perm, +Error **errp);void blk_set_allow_write_beyond_eof (BlockBackend *blk,bool allow);void blk_iostatus_enable (BlockBackend *blk);
Signature · 1 line
1.8.3.1
PATCH v2 13/43 block: Add permissions to blk_new()
In reply to Kevin WolfWe want every user to be specific about the permissions it needs, so we'll pass the initial permissions as parameters to blk_new(). A user only needs to call blk_set_perm() if it wants to change the permissions after the fact.
The permissions are stored in the BlockBackend and applied whenever a BlockDriverState should be attached in blk_insert_bs().
This does not include actually choosing the right set of permissions everywhere yet. Instead, the usual FIXME comment is added to each place and will be addressed in individual patches.
--- block.c | 2 +- block/backup.c | 3 ++- block/block-backend.c | 21 ++++++++++++++------- block/commit.c | 12 ++++++++---- block/mirror.c | 3 ++- block/qcow2.c | 2 +- blockdev.c | 4 ++-- blockjob.c | 3 ++- hmp.c | 3 ++- hw/block/fdc.c | 3 ++- hw/core/qdev-properties-system.c | 3 ++- hw/ide/qdev.c | 3 ++- hw/scsi/scsi-disk.c | 3 ++- include/sysemu/block-backend.h | 2 +- migration/block.c | 3 ++- nbd/server.c | 3 ++- tests/test-blockjob.c | 3 ++- tests/test-throttle.c | 7 ++++--- 18 files changed, 53 insertions(+), 30 deletions(-)
block.c +1 -1
@@ -2184,7 +2184,7 @@ static BlockDriverState *bdrv_open_inherit(const char *filename, goto fail; }if (file_bs !=NULL ) { - file =blk_new (); + file =blk_new (BLK_PERM_CONSISTENT_READ ,BLK_PERM_ALL );blk_insert_bs (file, file_bs);bdrv_unref (file_bs);
block/backup.c +2 -1
@@ -624,7 +624,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, goto error; } - job->target =blk_new (); +/* FIXME Use real permissions */ + job->target =blk_new (0 ,BLK_PERM_ALL );blk_insert_bs (job->target, target); job->on_source_error = on_source_error;
block/block-backend.c +14 -7
@@ -120,17 +120,23 @@ static const BdrvChildRole child_root = {/* * Create a new BlockBackend with a reference count of one. -* Store an error through @errp on failure, unless it's null. +* +* @perm is a bitmasks of BLK_PERM_* constants which describes the permissions +* to request for a block driver node that is attached to this BlockBackend. +* @shared_perm is a bitmask which describes which permissions may be granted +* to other users of the attached node. +* Both sets of permissions can be changed later using blk_set_perm(). +* * Return the new BlockBackend on success, null on failure. */ -BlockBackend *blk_new (void ) +BlockBackend *blk_new (uint64_t perm,uint64_t shared_perm) {BlockBackend *blk; blk =g_new0 (BlockBackend,1 ); blk->refcnt =1 ; - blk->perm =0 ; - blk->shared_perm =BLK_PERM_ALL ; + blk->perm = perm; + blk->shared_perm = shared_perm;blk_set_enable_write_cache (blk, true);qemu_co_queue_init (&blk->public.throttled_reqs[0 ]);
@@ -161,7 +167,7 @@ BlockBackend *blk_new_open(const char *filename, const char *reference,BlockBackend *blk;BlockDriverState *bs; - blk =blk_new (); + blk =blk_new (0 ,BLK_PERM_ALL ); bs =bdrv_open (filename, reference, options, flags, errp);if (!bs) {blk_unref (blk);
@@ -505,9 +511,10 @@ void blk_remove_bs(BlockBackend *blk)void blk_insert_bs (BlockBackend *blk,BlockDriverState *bs) {bdrv_ref (bs); -/* FIXME Use real permissions */ +/* FIXME Error handling */ blk->root =bdrv_root_attach_child (bs,"root" , &child_root, -0 ,BLK_PERM_ALL , blk, &error_abort); + blk->perm, blk->shared_perm, blk, + &error_abort);notifier_list_notify (&blk->insert_bs_notifiers, blk);if (blk->public.throttle_state) {
block/commit.c +8 -4
@@ -275,10 +275,12 @@ void commit_start(const char *job_id, BlockDriverState *bs,block_job_add_bdrv (&s->common, overlay_bs); } - s->base =blk_new (); +/* FIXME Use real permissions */ + s->base =blk_new (0 ,BLK_PERM_ALL );blk_insert_bs (s->base, base); - s->top =blk_new (); +/* FIXME Use real permissions */ + s->top =blk_new (0 ,BLK_PERM_ALL );blk_insert_bs (s->top, top); s->active = bs;
@@ -328,10 +330,12 @@ int bdrv_commit(BlockDriverState *bs) } } - src =blk_new (); +/* FIXME Use real permissions */ + src =blk_new (0 ,BLK_PERM_ALL );blk_insert_bs (src, bs); - backing =blk_new (); +/* FIXME Use real permissions */ + backing =blk_new (0 ,BLK_PERM_ALL );blk_insert_bs (backing, bs->backing->bs); length =blk_getlength (src);
block/mirror.c +2 -1
@@ -1017,7 +1017,8 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,return ; } - s->target =blk_new (); +/* FIXME Use real permissions */ + s->target =blk_new (0 ,BLK_PERM_ALL );blk_insert_bs (s->target, target); s->replaces =g_strdup (replaces);
block/qcow2.c +1 -1
@@ -3262,7 +3262,7 @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts, }if (new_size) { -BlockBackend *blk =blk_new (); +BlockBackend *blk =blk_new (BLK_PERM_RESIZE ,BLK_PERM_ALL );blk_insert_bs (blk, bs); ret =blk_truncate (blk, new_size);blk_unref (blk);
blockdev.c +2 -2
@@ -557,7 +557,7 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts,if ((!file || !*file) && !qdict_size (bs_opts)) {BlockBackendRootState *blk_rs; - blk =blk_new (); + blk =blk_new (0 ,BLK_PERM_ALL ); blk_rs =blk_get_root_state (blk); blk_rs->open_flags = bdrv_flags; blk_rs->read_only = read_only;
@@ -2889,7 +2889,7 @@ void qmp_block_resize(bool has_device, const char *device, goto out; } - blk =blk_new (); + blk =blk_new (BLK_PERM_RESIZE ,BLK_PERM_ALL );blk_insert_bs (blk, bs);/* complete all in-flight operations before resizing the device */
blockjob.c +2 -1
@@ -159,7 +159,8 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver, } } - blk =blk_new (); +/* FIXME Use real permissions */ + blk =blk_new (0 ,BLK_PERM_ALL );blk_insert_bs (blk, bs); job =g_malloc0 (driver->instance_size);
hmp.c +2 -1
@@ -2050,7 +2050,8 @@ void hmp_qemu_io(Monitor *mon, const QDict *qdict)if (!blk) {BlockDriverState *bs =bdrv_lookup_bs (NULL , device, &err);if (bs) { - blk = local_blk =blk_new (); +/* FIXME Use real permissions */ + blk = local_blk =blk_new (0 ,BLK_PERM_ALL );blk_insert_bs (blk, bs); }else { goto fail;
hw/block/fdc.c +2 -1
@@ -533,7 +533,8 @@ static int floppy_drive_init(DeviceState *qdev)if (!dev->conf.blk) {/* Anonymous BlockBackend for an empty drive */ - dev->conf.blk =blk_new (); +/* FIXME Use real permissions */ + dev->conf.blk =blk_new (0 ,BLK_PERM_ALL ); ret =blk_attach_dev (dev->conf.blk, qdev);assert (ret ==0 ); }
hw/core/qdev-properties-system.c +2 -1
@@ -78,7 +78,8 @@ static void parse_drive(DeviceState *dev, const char *str, void **ptr,if (!blk) {BlockDriverState *bs =bdrv_lookup_bs (NULL , str,NULL );if (bs) { - blk =blk_new (); +/* FIXME Use real permissions */ + blk =blk_new (0 ,BLK_PERM_ALL );blk_insert_bs (blk, bs); blk_created = true; }
hw/ide/qdev.c +2 -1
@@ -170,7 +170,8 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind)return -1 ; }else {/* Anonymous BlockBackend for an empty drive */ - dev->conf.blk =blk_new (); +/* FIXME Use real permissions */ + dev->conf.blk =blk_new (0 ,BLK_PERM_ALL ); } }
hw/scsi/scsi-disk.c +2 -1
@@ -2380,7 +2380,8 @@ static void scsi_cd_realize(SCSIDevice *dev, Error **errp)SCSIDiskState *s =DO_UPCAST (SCSIDiskState, qdev, dev);if (!dev->conf.blk) { - dev->conf.blk =blk_new (); +/* FIXME Use real permissions */ + dev->conf.blk =blk_new (0 ,BLK_PERM_ALL ); } s->qdev.blocksize =2048 ;
include/sysemu/block-backend.h +1 -1
@@ -84,7 +84,7 @@ typedef struct BlockBackendPublic {QLIST_ENTRY (BlockBackendPublic) round_robin; } BlockBackendPublic; -BlockBackend *blk_new (void ); +BlockBackend *blk_new (uint64_t perm,uint64_t shared_perm);BlockBackend *blk_new_open (const char *filename,const char *reference,QDict *options,int flags,Error **errp);int blk_get_refcnt (BlockBackend *blk);
migration/block.c +2 -1
@@ -415,7 +415,8 @@ static void init_blk_migration(QEMUFile *f) } bmds =g_new0 (BlkMigDevState,1 ); - bmds->blk =blk_new (); +/* FIXME Use real permissions */ + bmds->blk =blk_new (0 ,BLK_PERM_ALL ); bmds->blk_name =g_strdup (bdrv_get_device_name (bs)); bmds->bulk_completed =0 ; bmds->total_sectors = sectors;
nbd/server.c +2 -1
@@ -892,7 +892,8 @@ NBDExport *nbd_export_new(BlockDriverState *bs, off_t dev_offset, off_t size,BlockBackend *blk;NBDExport *exp =g_malloc0 (sizeof (NBDExport)); - blk =blk_new (); +/* FIXME Use real permissions */ + blk =blk_new (0 ,BLK_PERM_ALL );blk_insert_bs (blk, bs);blk_set_enable_write_cache (blk, !writethrough);
tests/test-blockjob.c +2 -1
@@ -53,7 +53,8 @@ static BlockJob *do_test_id(BlockBackend *blk, const char *id,* BlockDriverState inserted. */ static BlockBackend *create_blk (const char *name) { -BlockBackend *blk =blk_new (); +/* FIXME Use real permissions */ +BlockBackend *blk =blk_new (0 ,BLK_PERM_ALL );BlockDriverState *bs; bs =bdrv_open ("null-co://" ,NULL ,NULL ,0 , &error_abort);
tests/test-throttle.c +4 -3
@@ -593,9 +593,10 @@ static void test_groups(void)BlockBackend *blk1, *blk2, *blk3;BlockBackendPublic *blkp1, *blkp2, *blkp3; - blk1 =blk_new (); - blk2 =blk_new (); - blk3 =blk_new (); +/* FIXME Use real permissions */ + blk1 =blk_new (0 ,BLK_PERM_ALL ); + blk2 =blk_new (0 ,BLK_PERM_ALL ); + blk3 =blk_new (0 ,BLK_PERM_ALL ); blkp1 =blk_get_public (blk1); blkp2 =blk_get_public (blk2);
Signature · 1 line
1.8.3.1
PATCH v2 14/43 block: Add error parameter to blk_insert_bs()
In reply to Kevin WolfNow that blk_insert_bs() requests the BlockBackend permissions for the node it attaches to, it can fail. Instead of aborting, pass the errors to the callers.
--- block.c | 5 ++++- block/backup.c | 5 ++++- block/block-backend.c | 13 ++++++++----- block/commit.c | 38 ++++++++++++++++++++++++++++++-------- block/mirror.c | 15 ++++++++++++--- block/qcow2.c | 10 ++++++++-- blockdev.c | 11 +++++++++-- blockjob.c | 7 ++++++- hmp.c | 6 +++++- hw/core/qdev-properties-system.c | 7 ++++++- include/sysemu/block-backend.h | 2 +- migration/block.c | 2 +- nbd/server.c | 6 +++++- tests/test-blockjob.c | 2 +- 14 files changed, 100 insertions(+), 29 deletions(-)
block.c +4 -1
@@ -2185,8 +2185,11 @@ static BlockDriverState *bdrv_open_inherit(const char *filename, }if (file_bs !=NULL ) { file =blk_new (BLK_PERM_CONSISTENT_READ ,BLK_PERM_ALL ); -blk_insert_bs (file, file_bs); +blk_insert_bs (file, file_bs, &local_err);bdrv_unref (file_bs); +if (local_err) { + goto fail; + }qdict_put (options,"file" ,qstring_from_str (bdrv_get_node_name (file_bs)));
block/backup.c +4 -1
@@ -626,7 +626,10 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,/* FIXME Use real permissions */ job->target =blk_new (0 ,BLK_PERM_ALL ); -blk_insert_bs (job->target, target); + ret =blk_insert_bs (job->target, target, errp); +if (ret <0 ) { + goto error; + } job->on_source_error = on_source_error; job->on_target_error = on_target_error;
block/block-backend.c +8 -5
@@ -508,19 +508,22 @@ void blk_remove_bs(BlockBackend *blk)/* * Associates a new BlockDriverState with @blk. */ -void blk_insert_bs (BlockBackend *blk,BlockDriverState *bs) +int blk_insert_bs (BlockBackend *blk,BlockDriverState *bs,Error **errp) { -bdrv_ref (bs); -/* FIXME Error handling */ blk->root =bdrv_root_attach_child (bs,"root" , &child_root, - blk->perm, blk->shared_perm, blk, - &error_abort); + blk->perm, blk->shared_perm, blk, errp); +if (blk->root ==NULL ) { +return -EPERM ; + } +bdrv_ref (bs);notifier_list_notify (&blk->insert_bs_notifiers, blk);if (blk->public.throttle_state) {throttle_timers_attach_aio_context ( &blk->public.throttle_timers,bdrv_get_aio_context (bs)); } + +return 0 ; }/*
block/commit.c +30 -8
@@ -220,6 +220,7 @@ void commit_start(const char *job_id, BlockDriverState *bs,BlockDriverState *iter;BlockDriverState *overlay_bs;Error *local_err =NULL ; +int ret;assert (top != bs);if (top == base) {
@@ -256,8 +257,7 @@ void commit_start(const char *job_id, BlockDriverState *bs,bdrv_reopen_multiple (bdrv_get_aio_context (bs), reopen_queue, &local_err);if (local_err !=NULL ) {error_propagate (errp, local_err); -block_job_unref (&s->common); -return ; + goto fail; } }
@@ -277,11 +277,17 @@ void commit_start(const char *job_id, BlockDriverState *bs,/* FIXME Use real permissions */ s->base =blk_new (0 ,BLK_PERM_ALL ); -blk_insert_bs (s->base, base); + ret =blk_insert_bs (s->base, base, errp); +if (ret <0 ) { + goto fail; + }/* FIXME Use real permissions */ s->top =blk_new (0 ,BLK_PERM_ALL ); -blk_insert_bs (s->top, top); + ret =blk_insert_bs (s->top, top, errp); +if (ret <0 ) { + goto fail; + } s->active = bs;
@@ -294,6 +300,16 @@ void commit_start(const char *job_id, BlockDriverState *bs,trace_commit_start (bs, base, top, s);block_job_start (&s->common); +return ; + +fail: +if (s->base) { +blk_unref (s->base); + } +if (s->top) { +blk_unref (s->top); + } +block_job_unref (&s->common); }
@@ -332,11 +348,17 @@ int bdrv_commit(BlockDriverState *bs)/* FIXME Use real permissions */ src =blk_new (0 ,BLK_PERM_ALL ); -blk_insert_bs (src, bs); - -/* FIXME Use real permissions */ backing =blk_new (0 ,BLK_PERM_ALL ); -blk_insert_bs (backing, bs->backing->bs); + + ret =blk_insert_bs (src, bs,NULL ); +if (ret <0 ) { + goto ro_cleanup; + } + + ret =blk_insert_bs (backing, bs->backing->bs,NULL ); +if (ret <0 ) { + goto ro_cleanup; + } length =blk_getlength (src);if (length <0 ) {
block/mirror.c +12 -3
@@ -525,9 +525,12 @@ static void mirror_exit(BlockJob *job, void *opaque)bdrv_replace_in_backing_chain (to_replace, target_bs);bdrv_drained_end (target_bs); -/* We just changed the BDS the job BB refers to */ +/* We just changed the BDS the job BB refers to, so switch the BB back +* so the cleanup does the right thing. We don't need any permissions +* any more now. */ blk_remove_bs (job->blk); -blk_insert_bs (job->blk, src); +blk_set_perm (job->blk,0 ,BLK_PERM_ALL , &error_abort); +blk_insert_bs (job->blk, src, &error_abort); }if (s->to_replace) {bdrv_op_unblock_all (s->to_replace, s->replace_blocker);
@@ -995,6 +998,7 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, bool auto_complete) {MirrorBlockJob *s; +int ret;if (granularity ==0 ) { granularity =bdrv_get_default_bitmap_granularity (target);
@@ -1019,7 +1023,12 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,/* FIXME Use real permissions */ s->target =blk_new (0 ,BLK_PERM_ALL ); -blk_insert_bs (s->target, target); + ret =blk_insert_bs (s->target, target, errp); +if (ret <0 ) { +blk_unref (s->target); +block_job_unref (&s->common); +return ; + } s->replaces =g_strdup (replaces); s->on_source_error = on_source_error;
block/qcow2.c +8 -2
@@ -3113,6 +3113,7 @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,uint64_t cluster_size = s->cluster_size;bool encrypt;int refcount_bits = s->refcount_bits; +Error *local_err =NULL ;int ret;QemuOptDesc *desc = opts->list->desc;Qcow2AmendHelperCBInfo helper_cb_info;
@@ -3263,10 +3264,15 @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,if (new_size) {BlockBackend *blk =blk_new (BLK_PERM_RESIZE ,BLK_PERM_ALL ); -blk_insert_bs (blk, bs); + ret =blk_insert_bs (blk, bs, &local_err); +if (ret <0 ) { +error_report_err (local_err); +blk_unref (blk); +return ret; + } + ret =blk_truncate (blk, new_size);blk_unref (blk); -if (ret <0 ) {return ret; }
blockdev.c +9 -2
@@ -2435,6 +2435,7 @@ static void qmp_blockdev_insert_anon_medium(BlockBackend *blk, BlockDriverState *bs, Error **errp) {bool has_device; +int ret;/* For BBs without a device, we can exchange the BDS tree at will */ has_device =blk_get_attached_dev (blk);
@@ -2454,7 +2455,10 @@ static void qmp_blockdev_insert_anon_medium(BlockBackend *blk,return ; } -blk_insert_bs (blk, bs); + ret =blk_insert_bs (blk, bs, errp); +if (ret <0 ) { +return ; + }if (!blk_dev_has_tray (blk)) {/* For tray-less devices, blockdev-close-tray is a no-op (or may not be
@@ -2890,7 +2894,10 @@ void qmp_block_resize(bool has_device, const char *device, } blk =blk_new (BLK_PERM_RESIZE ,BLK_PERM_ALL ); -blk_insert_bs (blk, bs); + ret =blk_insert_bs (blk, bs, errp); +if (ret <0 ) { + goto out; + }/* complete all in-flight operations before resizing the device */ bdrv_drain_all ();
blockjob.c +6 -1
@@ -128,6 +128,7 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver, {BlockBackend *blk;BlockJob *job; +int ret;if (bs->job) {error_setg (errp,QERR_DEVICE_IN_USE ,bdrv_get_device_name (bs));
@@ -161,7 +162,11 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,/* FIXME Use real permissions */ blk =blk_new (0 ,BLK_PERM_ALL ); -blk_insert_bs (blk, bs); + ret =blk_insert_bs (blk, bs, errp); +if (ret <0 ) { +blk_unref (blk); +return NULL ; + } job =g_malloc0 (driver->instance_size); error_setg(&job->blocker, "block device is in use by block job: %s",
hmp.c +5 -1
@@ -2045,6 +2045,7 @@ void hmp_qemu_io(Monitor *mon, const QDict *qdict)const char * device =qdict_get_str (qdict,"device" );const char * command =qdict_get_str (qdict,"command" );Error *err =NULL ; +int ret; blk =blk_by_name (device);if (!blk) {
@@ -2052,7 +2053,10 @@ void hmp_qemu_io(Monitor *mon, const QDict *qdict)if (bs) {/* FIXME Use real permissions */ blk = local_blk =blk_new (0 ,BLK_PERM_ALL ); -blk_insert_bs (blk, bs); + ret =blk_insert_bs (blk, bs, &err); +if (ret <0 ) { + goto fail; + } }else { goto fail; }
hw/core/qdev-properties-system.c +6 -1
@@ -73,6 +73,7 @@ static void parse_drive(DeviceState *dev, const char *str, void **ptr, {BlockBackend *blk;bool blk_created = false; +int ret; blk =blk_by_name (str);if (!blk) {
@@ -80,8 +81,12 @@ static void parse_drive(DeviceState *dev, const char *str, void **ptr,if (bs) {/* FIXME Use real permissions */ blk =blk_new (0 ,BLK_PERM_ALL ); -blk_insert_bs (blk, bs); blk_created = true; + + ret =blk_insert_bs (blk, bs, errp); +if (ret <0 ) { + goto fail; + } } }if (!blk) {
include/sysemu/block-backend.h +1 -1
@@ -102,7 +102,7 @@ BlockBackend *blk_by_public(BlockBackendPublic *public);BlockDriverState *blk_bs (BlockBackend *blk);void blk_remove_bs (BlockBackend *blk); -void blk_insert_bs (BlockBackend *blk,BlockDriverState *bs); +int blk_insert_bs (BlockBackend *blk,BlockDriverState *bs,Error **errp);bool bdrv_has_blk (BlockDriverState *bs);bool bdrv_is_root_node (BlockDriverState *bs); int blk_set_perm(BlockBackend *blk, uint64_t perm, uint64_t shared_perm,
migration/block.c +1 -1
@@ -446,7 +446,7 @@ static void init_blk_migration(QEMUFile *f)BlockDriverState *bs = bmds_bs[i].bs;if (bmds) { -blk_insert_bs (bmds->blk, bs); +blk_insert_bs (bmds->blk, bs, &error_abort);alloc_aio_bitmap (bmds);error_setg (&bmds->blocker,"block device is in use by migration" );
nbd/server.c +5 -1
@@ -891,10 +891,14 @@ NBDExport *nbd_export_new(BlockDriverState *bs, off_t dev_offset, off_t size, {BlockBackend *blk;NBDExport *exp =g_malloc0 (sizeof (NBDExport)); +int ret;/* FIXME Use real permissions */ blk =blk_new (0 ,BLK_PERM_ALL ); -blk_insert_bs (blk, bs); + ret =blk_insert_bs (blk, bs, errp); +if (ret <0 ) { + goto fail; + }blk_set_enable_write_cache (blk, !writethrough); exp->refcount =1 ;
tests/test-blockjob.c +1 -1
@@ -60,7 +60,7 @@ static BlockBackend *create_blk(const char *name) bs =bdrv_open ("null-co://" ,NULL ,NULL ,0 , &error_abort);g_assert_nonnull (bs); -blk_insert_bs (blk, bs); +blk_insert_bs (blk, bs, &error_abort);bdrv_unref (bs);if (name) {
Signature · 1 line
1.8.3.1
PATCH v2 15/43 block: Add BDRV_O_RESIZE for blk_new_open()
In reply to Kevin Wolfblk_new_open() is a convenience function that processes flags rather than QDict options as a simple way to just open an image file.
In order to keep it convenient in the future, it must automatically request the necessary permissions. This can easily be inferred from the flags for read and write, but we need another flag that tells us whether to get the resize permission.
We can't just always request it because that means that no block jobs can run on the resulting BlockBackend (which is something that e.g. qemu-img commit wants to do), but we also can't request it never because most of the .bdrv_create() implementations call blk_truncate().
The solution is to introduce another flag that is passed by all users that want to resize the image.
--- block/parallels.c | 3 ++- block/qcow.c | 3 ++- block/qcow2.c | 6 ++++-- block/qed.c | 3 ++- block/sheepdog.c | 2 +- block/vdi.c | 3 ++- block/vhdx.c | 3 ++- block/vmdk.c | 6 ++++-- block/vpc.c | 3 ++- include/block/block.h | 1 + qemu-img.c | 2 +- 11 files changed, 23 insertions(+), 12 deletions(-)
block/parallels.c +2 -1
@@ -488,7 +488,8 @@ static int parallels_create(const char *filename, QemuOpts *opts, Error **errp) } file =blk_new_open (filename,NULL ,NULL , -BDRV_O_RDWR |BDRV_O_PROTOCOL , &local_err); +BDRV_O_RDWR |BDRV_O_RESIZE |BDRV_O_PROTOCOL , + &local_err);if (file ==NULL ) {error_propagate (errp, local_err);return -EIO ;
block/qcow.c +2 -1
@@ -823,7 +823,8 @@ static int qcow_create(const char *filename, QemuOpts *opts, Error **errp) } qcow_blk =blk_new_open (filename,NULL ,NULL , -BDRV_O_RDWR |BDRV_O_PROTOCOL , &local_err); +BDRV_O_RDWR |BDRV_O_RESIZE |BDRV_O_PROTOCOL , + &local_err);if (qcow_blk ==NULL ) {error_propagate (errp, local_err); ret = -EIO ;
block/qcow2.c +4 -2
@@ -2202,7 +2202,8 @@ static int qcow2_create2(const char *filename, int64_t total_size, } blk =blk_new_open (filename,NULL ,NULL , -BDRV_O_RDWR |BDRV_O_PROTOCOL , &local_err); +BDRV_O_RDWR |BDRV_O_RESIZE |BDRV_O_PROTOCOL , + &local_err);if (blk ==NULL ) {error_propagate (errp, local_err);return -EIO ;
@@ -2266,7 +2267,8 @@ static int qcow2_create2(const char *filename, int64_t total_size, options =qdict_new ();qdict_put (options,"driver" ,qstring_from_str ("qcow2" )); blk =blk_new_open (filename,NULL , options, -BDRV_O_RDWR |BDRV_O_NO_FLUSH , &local_err); +BDRV_O_RDWR |BDRV_O_RESIZE |BDRV_O_NO_FLUSH , + &local_err);if (blk ==NULL ) {error_propagate (errp, local_err); ret = -EIO ;
block/qed.c +2 -1
@@ -625,7 +625,8 @@ static int qed_create(const char *filename, uint32_t cluster_size, } blk =blk_new_open (filename,NULL ,NULL , -BDRV_O_RDWR |BDRV_O_PROTOCOL , &local_err); +BDRV_O_RDWR |BDRV_O_RESIZE |BDRV_O_PROTOCOL , + &local_err);if (blk ==NULL ) {error_propagate (errp, local_err);return -EIO ;
block/sheepdog.c +1 -1
@@ -1609,7 +1609,7 @@ static int sd_prealloc(const char *filename, Error **errp)int ret; blk =blk_new_open (filename,NULL ,NULL , -BDRV_O_RDWR |BDRV_O_PROTOCOL , errp); +BDRV_O_RDWR |BDRV_O_RESIZE |BDRV_O_PROTOCOL , errp);if (blk ==NULL ) { ret = -EIO ; goto out_with_err_set;
block/vdi.c +2 -1
@@ -763,7 +763,8 @@ static int vdi_create(const char *filename, QemuOpts *opts, Error **errp) } blk =blk_new_open (filename,NULL ,NULL , -BDRV_O_RDWR |BDRV_O_PROTOCOL , &local_err); +BDRV_O_RDWR |BDRV_O_RESIZE |BDRV_O_PROTOCOL , + &local_err);if (blk ==NULL ) {error_propagate (errp, local_err); ret = -EIO ;
block/vhdx.c +2 -1
@@ -1859,7 +1859,8 @@ static int vhdx_create(const char *filename, QemuOpts *opts, Error **errp) } blk =blk_new_open (filename,NULL ,NULL , -BDRV_O_RDWR |BDRV_O_PROTOCOL , &local_err); +BDRV_O_RDWR |BDRV_O_RESIZE |BDRV_O_PROTOCOL , + &local_err);if (blk ==NULL ) {error_propagate (errp, local_err); ret = -EIO ;
block/vmdk.c +4 -2
@@ -1703,7 +1703,8 @@ static int vmdk_create_extent(const char *filename, int64_t filesize, } blk =blk_new_open (filename,NULL ,NULL , -BDRV_O_RDWR |BDRV_O_PROTOCOL , &local_err); +BDRV_O_RDWR |BDRV_O_RESIZE |BDRV_O_PROTOCOL , + &local_err);if (blk ==NULL ) {error_propagate (errp, local_err); ret = -EIO ;
@@ -2071,7 +2072,8 @@ static int vmdk_create(const char *filename, QemuOpts *opts, Error **errp) } new_blk =blk_new_open (filename,NULL ,NULL , -BDRV_O_RDWR |BDRV_O_PROTOCOL , &local_err); +BDRV_O_RDWR |BDRV_O_RESIZE |BDRV_O_PROTOCOL , + &local_err);if (new_blk ==NULL ) {error_propagate (errp, local_err); ret = -EIO ;
block/vpc.c +2 -1
@@ -915,7 +915,8 @@ static int vpc_create(const char *filename, QemuOpts *opts, Error **errp) } blk =blk_new_open (filename,NULL ,NULL , -BDRV_O_RDWR |BDRV_O_PROTOCOL , &local_err); +BDRV_O_RDWR |BDRV_O_RESIZE |BDRV_O_PROTOCOL , + &local_err);if (blk ==NULL ) {error_propagate (errp, local_err); ret = -EIO ;
include/block/block.h +1 -0
@@ -82,6 +82,7 @@ typedef struct HDGeometry { } HDGeometry;#define BDRV_O_RDWR 0x0002 +#define BDRV_O_RESIZE 0x0004/* request permission for resizing the node */ #define BDRV_O_SNAPSHOT 0x0008/* open the file read only and save writes in a snapshot */ #define BDRV_O_TEMPORARY 0x0010/* delete the file after use */ #define BDRV_O_NOCACHE 0x0020/* do not use the host page cache */
qemu-img.c +1 -1
@@ -3289,7 +3289,7 @@ static int img_resize(int argc, char **argv)qemu_opts_del (param); blk =img_open (image_opts, filename, fmt, -BDRV_O_RDWR , false, quiet); +BDRV_O_RDWR |BDRV_O_RESIZE , false, quiet);if (!blk) { ret =-1 ; goto out;
Signature · 1 line
1.8.3.1
PATCH v2 16/43 block: Request real permissions in blk_new_open()
In reply to Kevin WolfWe can figure out the necessary permissions from the flags that the caller passed.
--- block/block-backend.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
block/block-backend.c +19 -3
@@ -166,17 +166,33 @@ BlockBackend *blk_new_open(const char *filename, const char *reference, {BlockBackend *blk;BlockDriverState *bs; +uint64_t perm; + +/* blk_new_open() is mainly used in .bdrv_create implementations and the +* tools where sharing isn't a concern because the BDS stays private, so we +* just request permission according to the flags. +* +* The exceptions are xen_disk and blockdev_init(); in these cases, the +* caller of blk_new_open() doesn't make use of the permissions, but they +* shouldn't hurt either. We can still share everything here because the +* guest devices will add their own blockers if they can't share. */ + perm =BLK_PERM_CONSISTENT_READ ; +if (flags &BDRV_O_RDWR ) { + perm |=BLK_PERM_WRITE ; + } +if (flags &BDRV_O_RESIZE ) { + perm |=BLK_PERM_RESIZE ; + } - blk =blk_new (0 ,BLK_PERM_ALL ); + blk =blk_new (perm,BLK_PERM_ALL ); bs =bdrv_open (filename, reference, options, flags, errp);if (!bs) {blk_unref (blk);return NULL ; } -/* FIXME Use real permissions */ blk->root =bdrv_root_attach_child (bs,"root" , &child_root, -0 ,BLK_PERM_ALL , blk, &error_abort); + perm,BLK_PERM_ALL , blk, &error_abort);return blk; }
Signature · 1 line
1.8.3.1
PATCH v2 17/43 block: Allow error return in BlockDevOps.change_media_cb()
In reply to Kevin WolfSome devices allow a media change between read-only and read-write media. They need to adapt the permissions in their .change_media_cb() implementation, which can fail. So add an Error parameter to the function.
--- block/block-backend.c | 20 +++++++++++++++----- blockdev.c | 19 +++++++++++++++---- hw/block/fdc.c | 2 +- hw/ide/core.c | 2 +- hw/scsi/scsi-disk.c | 2 +- hw/sd/sd.c | 2 +- include/block/block_int.h | 2 +- include/sysemu/block-backend.h | 2 +- 8 files changed, 36 insertions(+), 15 deletions(-)
block/block-backend.c +15 -5
@@ -677,19 +677,29 @@ void blk_set_dev_ops(BlockBackend *blk, const BlockDevOps *ops,/* * Notify @blk's attached device model of media change. -* If @load is true, notify of media load. -* Else, notify of media eject. +* +* If @load is true, notify of media load. This action can fail, meaning that +* the medium cannot be loaded. @errp is set then. +* +* If @load is false, notify of media eject. This can never fail. +* * Also send DEVICE_TRAY_MOVED events as appropriate. */ -void blk_dev_change_media_cb (BlockBackend *blk,bool load) +void blk_dev_change_media_cb (BlockBackend *blk,bool load,Error **errp) {if (blk->dev_ops && blk->dev_ops->change_media_cb) {bool tray_was_open, tray_is_open; +Error *local_err =NULL ;assert (!blk->legacy_dev); tray_was_open =blk_dev_is_tray_open (blk); - blk->dev_ops->change_media_cb (blk->dev_opaque, load); + blk->dev_ops->change_media_cb (blk->dev_opaque, load, &local_err); +if (local_err) { +assert (load == true); +error_propagate (errp, local_err); +return ; + } tray_is_open =blk_dev_is_tray_open (blk);if (tray_was_open != tray_is_open) {
@@ -703,7 +713,7 @@ void blk_dev_change_media_cb(BlockBackend *blk, bool load)static void blk_root_change_media (BdrvChild *child,bool load) { -blk_dev_change_media_cb (child->opaque, load); +blk_dev_change_media_cb (child->opaque, load,NULL ); }/*
blockdev.c +15 -4
@@ -2310,7 +2310,7 @@ static int do_open_tray(const char *blk_name, const char *qdev_id, }if (!locked || force) { -blk_dev_change_media_cb (blk, false); +blk_dev_change_media_cb (blk, false, &error_abort); }if (locked && !force) {
@@ -2348,6 +2348,7 @@ void qmp_blockdev_close_tray(bool has_device, const char *device, Error **errp) {BlockBackend *blk; +Error *local_err =NULL ; device = has_device ? device :NULL ; id = has_id ? id :NULL ;
@@ -2371,7 +2372,11 @@ void qmp_blockdev_close_tray(bool has_device, const char *device,return ; } -blk_dev_change_media_cb (blk, true); +blk_dev_change_media_cb (blk, true, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } } void qmp_x_blockdev_remove_medium(bool has_device, const char *device,
@@ -2424,7 +2429,7 @@ void qmp_x_blockdev_remove_medium(bool has_device, const char *device,* called at all); therefore, the medium needs to be ejected here. * Do it after blk_remove_bs() so blk_is_inserted(blk) returns the @load * value passed here (i.e. false). */ -blk_dev_change_media_cb (blk, false); +blk_dev_change_media_cb (blk, false, &error_abort); } out:
@@ -2434,6 +2439,7 @@ out:static void qmp_blockdev_insert_anon_medium (BlockBackend *blk,BlockDriverState *bs,Error **errp) { +Error *local_err =NULL ;bool has_device;int ret;
@@ -2466,7 +2472,12 @@ static void qmp_blockdev_insert_anon_medium(BlockBackend *blk,* slot here. * Do it after blk_insert_bs() so blk_is_inserted(blk) returns the @load * value passed here (i.e. true). */ -blk_dev_change_media_cb (blk, true); +blk_dev_change_media_cb (blk, true, &local_err); +if (local_err) { +error_propagate (errp, local_err); +blk_remove_bs (blk); +return ; + } } }
hw/block/fdc.c +1 -1
@@ -469,7 +469,7 @@ static void fd_revalidate(FDrive *drv) } } -static void fd_change_cb (void *opaque,bool load) +static void fd_change_cb (void *opaque,bool load,Error **errp) {FDrive *drive = opaque;
hw/ide/core.c +1 -1
@@ -1120,7 +1120,7 @@ static void ide_cfata_metadata_write(IDEState *s) }/* called when the inserted state of the media has changed */ -static void ide_cd_change_cb (void *opaque,bool load) +static void ide_cd_change_cb (void *opaque,bool load,Error **errp) {IDEState *s = opaque;uint64_t nb_sectors;
hw/scsi/scsi-disk.c +1 -1
@@ -2240,7 +2240,7 @@ static void scsi_disk_resize_cb(void *opaque) } } -static void scsi_cd_change_media_cb (void *opaque,bool load) +static void scsi_cd_change_media_cb (void *opaque,bool load,Error **errp) {SCSIDiskState *s = opaque;
hw/sd/sd.c +1 -1
@@ -458,7 +458,7 @@ static bool sd_get_readonly(SDState *sd)return sd->wp_switch; } -static void sd_cardchange (void *opaque,bool load) +static void sd_cardchange (void *opaque,bool load,Error **errp) {SDState *sd = opaque;DeviceState *dev =DEVICE (sd);
include/block/block_int.h +1 -1
@@ -891,7 +891,7 @@ void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c, uint64_t *nperm, uint64_t *nshared);const char *bdrv_get_parent_name (const BlockDriverState *bs); -void blk_dev_change_media_cb (BlockBackend *blk,bool load); +void blk_dev_change_media_cb (BlockBackend *blk,bool load,Error **errp);bool blk_dev_has_removable_media (BlockBackend *blk);bool blk_dev_has_tray (BlockBackend *blk);void blk_dev_eject_request (BlockBackend *blk,bool force);
include/sysemu/block-backend.h +1 -1
@@ -34,7 +34,7 @@ typedef struct BlockDevOps {* changes. Sure would be useful if it did. * Device models with removable media must implement this callback. */ -void (*change_media_cb)(void *opaque,bool load); +void (*change_media_cb)(void *opaque,bool load,Error **errp);/* * Runs when an eject request is issued from the monitor, the tray * is closed, and the medium is locked.
Signature · 1 line
1.8.3.1
PATCH v2 18/43 hw/block: Request permissions
In reply to Kevin WolfThis makes all device emulations with a qdev drive property request permissions on their BlockBackend. The only thing we block at this point is resizing images for some devices that can't support it.
--- hw/block/block.c | 22 +++++++++++++++++++++- hw/block/fdc.c | 25 +++++++++++++++++++++++-- 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 | 1 - hw/ide/qdev.c | 8 ++++++-- hw/nvram/spapr_nvram.c | 8 ++++++++ hw/scsi/scsi-disk.c | 9 +++++++-- hw/sd/sd.c | 6 ++++++ hw/usb/dev-storage.c | 6 +++++- include/hw/block/block.h | 3 ++- tests/qemu-iotests/051.pc.out | 6 +++--- 17 files changed, 142 insertions(+), 27 deletions(-)
hw/block/block.c +21 -1
@@ -51,11 +51,31 @@ void blkconf_blocksizes(BlockConf *conf) } } -void blkconf_apply_backend_options (BlockConf *conf) +void blkconf_apply_backend_options (BlockConf *conf,bool readonly, +bool resizable,Error **errp) {BlockBackend *blk = conf->blk;BlockdevOnError rerror, werror; +uint64_t perm, shared_perm;bool wce; +int ret; + + perm =BLK_PERM_CONSISTENT_READ ; +if (!readonly) { + perm |=BLK_PERM_WRITE ; + } + +/* TODO Remove BLK_PERM_WRITE unless explicitly configured so */ + shared_perm =BLK_PERM_CONSISTENT_READ |BLK_PERM_WRITE_UNCHANGED | +BLK_PERM_GRAPH_MOD |BLK_PERM_WRITE ; +if (resizable) { + shared_perm |=BLK_PERM_RESIZE ; + } + + ret =blk_set_perm (blk, perm, shared_perm, errp); +if (ret <0 ) { +return ; + }switch (conf->wce) {case ON_OFF_AUTO_ON : wce = true;break ;
hw/block/fdc.c +23 -2
@@ -186,6 +186,7 @@ typedef enum FDiskFlags {struct FDrive {FDCtrl *fdctrl;BlockBackend *blk; +BlockConf *conf;/* Drive status */ FloppyDriveType drive;/* CMOS drive type */ uint8_t perpendicular;/* 2.88 MB access mode */
@@ -472,6 +473,19 @@ static void fd_revalidate(FDrive *drv)static void fd_change_cb (void *opaque,bool load,Error **errp) {FDrive *drive = opaque; +Error *local_err =NULL ; + +if (!load) { +blk_set_perm (drive->blk,0 ,BLK_PERM_ALL , &error_abort); + }else { +blkconf_apply_backend_options (drive->conf, +blk_is_read_only (drive->blk), false, + &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } + } drive->media_changed =1 ; drive->media_validated = false;
@@ -508,6 +522,7 @@ static int floppy_drive_init(DeviceState *qdev)FloppyDrive *dev =FLOPPY_DRIVE (qdev);FloppyBus *bus =FLOPPY_BUS (qdev->parent_bus);FDrive *drive; +Error *local_err =NULL ;int ret;if (dev->unit ==-1 ) {
@@ -533,7 +548,6 @@ static int floppy_drive_init(DeviceState *qdev)if (!dev->conf.blk) {/* Anonymous BlockBackend for an empty drive */ -/* FIXME Use real permissions */ dev->conf.blk =blk_new (0 ,BLK_PERM_ALL ); ret =blk_attach_dev (dev->conf.blk, qdev);assert (ret ==0 );
@@ -552,7 +566,13 @@ static int floppy_drive_init(DeviceState *qdev)* blkconf_apply_backend_options(). */ dev->conf.rerror =BLOCKDEV_ON_ERROR_AUTO ; dev->conf.werror =BLOCKDEV_ON_ERROR_AUTO ; -blkconf_apply_backend_options (&dev->conf); + +blkconf_apply_backend_options (&dev->conf,blk_is_read_only (dev->conf.blk), + false, &local_err); +if (local_err) { +error_report_err (local_err); +return -1 ; + }/* 'enospc' is the default for -drive, 'report' is what blk_new() gives us * for empty drives. */
@@ -566,6 +586,7 @@ static int floppy_drive_init(DeviceState *qdev)return -1 ; } + drive->conf = &dev->conf; drive->blk = dev->conf.blk; drive->fdctrl = bus->fdc;
hw/block/m25p80.c +8 -0
@@ -1215,6 +1215,7 @@ static void m25p80_realize(SSISlave *ss, Error **errp) {Flash *s =M25P80 (ss);M25P80Class *mc =M25P80_GET_CLASS (s); +int ret; s->pi = mc->pi;
@@ -1222,6 +1223,13 @@ static void m25p80_realize(SSISlave *ss, Error **errp) s->dirty_page =-1 ;if (s->blk) { +uint64_t perm =BLK_PERM_CONSISTENT_READ | + (blk_is_read_only (s->blk) ?0 :BLK_PERM_WRITE ); + ret =blk_set_perm (s->blk, perm,BLK_PERM_ALL , errp); +if (ret <0 ) { +return ; + } +DB_PRINT_L (0 ,"Binding to IF_MTD drive\n" ); s->storage =blk_blockalign (s->blk, s->size);
hw/block/nand.c +7 -0
@@ -373,6 +373,8 @@ static void nand_realize(DeviceState *dev, Error **errp) {int pagesize;NANDFlashState *s =NAND (dev); +int ret; + s->buswidth = nand_flash_ids[s->chip_id].width >>3 ; s->size = nand_flash_ids[s->chip_id].size <<20 ;
@@ -407,6 +409,11 @@ static void nand_realize(DeviceState *dev, Error **errp)error_setg (errp,"Can't use a read-only drive" );return ; } + ret =blk_set_perm (s->blk,BLK_PERM_CONSISTENT_READ |BLK_PERM_WRITE , +BLK_PERM_ALL , errp); +if (ret <0 ) { +return ; + }if (blk_getlength (s->blk) >= (s->pages << s->page_shift) + (s->pages << s->oob_shift)) { pagesize =0 ;
hw/block/nvme.c +7 -1
@@ -835,6 +835,7 @@ static int nvme_init(PCIDevice *pci_dev)int i;int64_t bs_size;uint8_t *pci_conf; +Error *local_err =NULL ;if (!n->conf.blk) {return -1 ;
@@ -850,7 +851,12 @@ static int nvme_init(PCIDevice *pci_dev)return -1 ; }blkconf_blocksizes (&n->conf); -blkconf_apply_backend_options (&n->conf); +blkconf_apply_backend_options (&n->conf,blk_is_read_only (n->conf.blk), + false, &local_err); +if (local_err) { +error_report_err (local_err); +return -1 ; + } pci_conf = pci_dev->config; pci_conf[PCI_INTERRUPT_PIN ] =1 ;
hw/block/onenand.c +7 -0
@@ -778,6 +778,7 @@ static int onenand_initfn(SysBusDevice *sbd)OneNANDState *s =ONE_NAND (dev);uint32_t size =1 << (24 + ((s->id.dev >>4 ) &7 ));void *ram; +Error *local_err =NULL ; s->base = (hwaddr)-1 ; s->rdy =NULL ;
@@ -796,6 +797,12 @@ static int onenand_initfn(SysBusDevice *sbd)error_report ("Can't use a read-only drive" );return -1 ; } +blk_set_perm (s->blk,BLK_PERM_CONSISTENT_READ |BLK_PERM_WRITE , +BLK_PERM_ALL , &local_err); +if (local_err) { +error_report_err (local_err); +return -1 ; + } s->blk_cur = s->blk; } s->otp = memset(g_malloc((64 + 2) << PAGE_SHIFT),
hw/block/pflash_cfi01.c +12 -6
@@ -758,6 +758,18 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp)sysbus_init_mmio (SYS_BUS_DEVICE (dev), &pfl->mem);if (pfl->blk) { +uint64_t perm; + pfl->ro =blk_is_read_only (pfl->blk); + perm =BLK_PERM_CONSISTENT_READ | (pfl->ro ?0 :BLK_PERM_WRITE ); + ret =blk_set_perm (pfl->blk, perm,BLK_PERM_ALL , errp); +if (ret <0 ) { +return ; + } + }else { + pfl->ro =0 ; + } + +if (pfl->blk) {/* read the initial flash content */ ret =blk_pread (pfl->blk,0 , pfl->storage, total_len);
@@ -768,12 +780,6 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) } } -if (pfl->blk) { - pfl->ro =blk_is_read_only (pfl->blk); - }else { - pfl->ro =0 ; - } -/* Default to devices being used at their maximum device width. This was * assumed before the device_width support was added. */
hw/block/pflash_cfi02.c +13 -6
@@ -632,6 +632,19 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp)vmstate_register_ram (&pfl->orig_mem,DEVICE (pfl)); pfl->storage =memory_region_get_ram_ptr (&pfl->orig_mem); pfl->chip_len = chip_len; + +if (pfl->blk) { +uint64_t perm; + pfl->ro =blk_is_read_only (pfl->blk); + perm =BLK_PERM_CONSISTENT_READ | (pfl->ro ?0 :BLK_PERM_WRITE ); + ret =blk_set_perm (pfl->blk, perm,BLK_PERM_ALL , errp); +if (ret <0 ) { +return ; + } + }else { + pfl->ro =0 ; + } +if (pfl->blk) {/* read the initial flash content */ ret =blk_pread (pfl->blk,0 , pfl->storage, chip_len);
@@ -646,12 +659,6 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp) pfl->rom_mode =1 ;sysbus_init_mmio (SYS_BUS_DEVICE (dev), &pfl->mem); -if (pfl->blk) { - pfl->ro =blk_is_read_only (pfl->blk); - }else { - pfl->ro =0 ; - } - pfl->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , pflash_timer, pfl); pfl->wcycle =0 ; pfl->cmd =0 ;
hw/block/virtio-blk.c +7 -1
@@ -928,7 +928,13 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp) }blkconf_serial (&conf->conf, &conf->serial); -blkconf_apply_backend_options (&conf->conf); +blkconf_apply_backend_options (&conf->conf, +blk_is_read_only (conf->conf.blk), true, + &err); +if (err) { +error_propagate (errp, err); +return ; + } s->original_wce =blk_enable_write_cache (conf->conf.blk);blkconf_geometry (&conf->conf,NULL ,65535 ,255 ,255 , &err);if (err) {
hw/core/qdev-properties-system.c +0 -1
@@ -79,7 +79,6 @@ static void parse_drive(DeviceState *dev, const char *str, void **ptr,if (!blk) {BlockDriverState *bs =bdrv_lookup_bs (NULL , str,NULL );if (bs) { -/* FIXME Use real permissions */ blk =blk_new (0 ,BLK_PERM_ALL ); blk_created = true;
hw/ide/qdev.c +6 -2
@@ -170,7 +170,6 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind)return -1 ; }else {/* Anonymous BlockBackend for an empty drive */ -/* FIXME Use real permissions */ dev->conf.blk =blk_new (0 ,BLK_PERM_ALL ); } }
@@ -197,7 +196,12 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind)return -1 ; } } -blkconf_apply_backend_options (&dev->conf); +blkconf_apply_backend_options (&dev->conf, kind ==IDE_CD , kind !=IDE_CD , + &err); +if (err) { +error_report_err (err); +return -1 ; + } if (ide_init_drive(s, dev->conf.blk, kind, dev->version, dev->serial, dev->model, dev->wwn,
hw/nvram/spapr_nvram.c +8 -0
@@ -141,9 +141,17 @@ static void rtas_nvram_store(PowerPCCPU *cpu, sPAPRMachineState *spapr,static void spapr_nvram_realize (VIOsPAPRDevice *dev,Error **errp) {sPAPRNVRAM *nvram =VIO_SPAPR_NVRAM (dev); +int ret;if (nvram->blk) { nvram->size =blk_getlength (nvram->blk); + + ret =blk_set_perm (nvram->blk, +BLK_PERM_CONSISTENT_READ |BLK_PERM_WRITE , +BLK_PERM_ALL , errp); +if (ret <0 ) { +return ; + } }else { nvram->size =DEFAULT_NVRAM_SIZE ; }
hw/scsi/scsi-disk.c +7 -2
@@ -2328,7 +2328,13 @@ static void scsi_realize(SCSIDevice *dev, Error **errp)return ; } } -blkconf_apply_backend_options (&dev->conf); +blkconf_apply_backend_options (&dev->conf, +blk_is_read_only (s->qdev.conf.blk), + dev->type ==TYPE_DISK , &err); +if (err) { +error_propagate (errp, err); +return ; + }if (s->qdev.conf.discard_granularity ==-1 ) { s->qdev.conf.discard_granularity =
@@ -2380,7 +2386,6 @@ static void scsi_cd_realize(SCSIDevice *dev, Error **errp)SCSIDiskState *s =DO_UPCAST (SCSIDiskState, qdev, dev);if (!dev->conf.blk) { -/* FIXME Use real permissions */ dev->conf.blk =blk_new (0 ,BLK_PERM_ALL ); }
hw/sd/sd.c +6 -0
@@ -1887,6 +1887,7 @@ static void sd_instance_finalize(Object *obj)static void sd_realize (DeviceState *dev,Error **errp) {SDState *sd =SD_CARD (dev); +int ret;if (sd->blk &&blk_is_read_only (sd->blk)) {error_setg (errp,"Cannot use read-only drive as SD card" );
@@ -1894,6 +1895,11 @@ static void sd_realize(DeviceState *dev, Error **errp) }if (sd->blk) { + ret =blk_set_perm (sd->blk,BLK_PERM_CONSISTENT_READ |BLK_PERM_WRITE , +BLK_PERM_ALL , errp); +if (ret <0 ) { +return ; + }blk_set_dev_ops (sd->blk, &sd_block_ops, sd); } }
hw/usb/dev-storage.c +5 -1
@@ -603,7 +603,11 @@ static void usb_msd_realize_storage(USBDevice *dev, Error **errp)blkconf_serial (&s->conf, &dev->serial);blkconf_blocksizes (&s->conf); -blkconf_apply_backend_options (&s->conf); +blkconf_apply_backend_options (&s->conf,blk_is_read_only (blk), true, &err); +if (err) { +error_propagate (errp, err); +return ; + }/* * Hack alert: this pretends to be a block device, but it's really
include/hw/block/block.h +2 -1
@@ -73,7 +73,8 @@ void blkconf_geometry(BlockConf *conf, int *trans, unsigned cyls_max, unsigned heads_max, unsigned secs_max, Error **errp);void blkconf_blocksizes (BlockConf *conf); -void blkconf_apply_backend_options (BlockConf *conf); +void blkconf_apply_backend_options (BlockConf *conf,bool readonly, +bool resizable,Error **errp);/* Hard disk geometry */
tests/qemu-iotests/051.pc.out +3 -3
@@ -179,7 +179,7 @@ q[K[Dqu[K[D[Dqui[K[D[D[Dquit[K Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: Can't use a read-only drive +(qemu) QEMU_PROG: Block node is read-only QEMU_PROG: Initialization of device ide-hd failed: Device initialization failed. Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on
@@ -201,12 +201,12 @@ QEMU X.Y.Z monitor - type 'help' for more information Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device ide-drive,drive=disk QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -device ide-drive,drive=disk: Can't use a read-only drive +(qemu) QEMU_PROG: -device ide-drive,drive=disk: Block node is read-only QEMU_PROG: -device ide-drive,drive=disk: Device initialization failed. Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device ide-hd,drive=disk QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -device ide-hd,drive=disk: Can't use a read-only drive +(qemu) QEMU_PROG: -device ide-hd,drive=disk: Block node is read-only QEMU_PROG: -device ide-hd,drive=disk: Device initialization failed. Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk
Signature · 1 line
1.8.3.1
PATCH v2 19/43 hw/block: Introduce share-rw qdev property
In reply to Kevin WolfBy default, don't allow another writer for block devices that are attached to a guest device. For the cases where this setup is intended (e.g. using a cluster filesystem on the disk), the new option can be used to allow it.
This change affects only devices using DEFINE_BLOCK_PROPERTIES(). Devices directly using DEFINE_PROP_DRIVE() still accept writers unconditionally.
--- hw/block/block.c | 6 ++++-- include/hw/block/block.h | 5 ++++- tests/qemu-iotests/172.out | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 3 deletions(-)
hw/block/block.c +4 -2
@@ -65,12 +65,14 @@ void blkconf_apply_backend_options(BlockConf *conf, bool readonly, perm |=BLK_PERM_WRITE ; } -/* TODO Remove BLK_PERM_WRITE unless explicitly configured so */ shared_perm =BLK_PERM_CONSISTENT_READ |BLK_PERM_WRITE_UNCHANGED | -BLK_PERM_GRAPH_MOD |BLK_PERM_WRITE ; +BLK_PERM_GRAPH_MOD ;if (resizable) { shared_perm |=BLK_PERM_RESIZE ; } +if (conf->share_rw) { + shared_perm |=BLK_PERM_WRITE ; + } ret =blk_set_perm (blk, perm, shared_perm, errp);if (ret <0 ) {
include/hw/block/block.h +4 -1
@@ -26,6 +26,7 @@ typedef struct BlockConf {/* geometry, not all devices use this */ uint32_t cyls, heads, secs;OnOffAuto wce; +bool share_rw;BlockdevOnError rerror;BlockdevOnError werror; } BlockConf;
@@ -53,7 +54,9 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf)DEFINE_PROP_UINT32 ("opt_io_size" , _state, _conf.opt_io_size,0 ), \DEFINE_PROP_UINT32 ("discard_granularity" , _state, \ _conf.discard_granularity,-1 ), \ - DEFINE_PROP_ON_OFF_AUTO("write-cache", _state, _conf.wce, ON_OFF_AUTO_AUTO) +DEFINE_PROP_ON_OFF_AUTO ("write-cache" , _state, _conf.wce, \ +ON_OFF_AUTO_AUTO ), \ + DEFINE_PROP_BOOL("share-rw", _state, _conf.share_rw, false)#define DEFINE_BLOCK_CHS_PROPERTIES (_state, _conf) \ DEFINE_PROP_UINT32("cyls", _state, _conf.cyls, 0), \
tests/qemu-iotests/172.out +53 -0
371 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH v2 20/43 blockjob: Add permissions to block_job_create()
In reply to Kevin WolfThis functions creates a BlockBackend internally, so the block jobs need to tell it what they want to do with the BB.
--- block/backup.c | 5 +++-- block/commit.c | 5 +++-- block/mirror.c | 5 +++-- block/stream.c | 5 +++-- blockjob.c | 6 +++--- include/block/blockjob_int.h | 4 +++- tests/test-blockjob-txn.c | 6 +++--- tests/test-blockjob.c | 5 +++-- 8 files changed, 24 insertions(+), 17 deletions(-)
block/backup.c +3 -2
@@ -618,8 +618,9 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, goto error; } - job =block_job_create (job_id, &backup_job_driver, bs, speed, - creation_flags, cb, opaque, errp); +/* FIXME Use real permissions */ + job =block_job_create (job_id, &backup_job_driver, bs,0 ,BLK_PERM_ALL , + speed, creation_flags, cb, opaque, errp);if (!job) { goto error; }
block/commit.c +3 -2
@@ -235,8 +235,9 @@ void commit_start(const char *job_id, BlockDriverState *bs,return ; } - s =block_job_create (job_id, &commit_job_driver, bs, speed, -BLOCK_JOB_DEFAULT ,NULL ,NULL , errp); +/* FIXME Use real permissions */ + s =block_job_create (job_id, &commit_job_driver, bs,0 ,BLK_PERM_ALL , + speed,BLOCK_JOB_DEFAULT ,NULL ,NULL , errp);if (!s) {return ; }
block/mirror.c +3 -2
@@ -1015,8 +1015,9 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, buf_size =DEFAULT_MIRROR_BUF_SIZE ; } - s =block_job_create (job_id, driver, bs, speed, creation_flags, - cb, opaque, errp); +/* FIXME Use real permissions */ + s =block_job_create (job_id, driver, bs,0 ,BLK_PERM_ALL , speed, + creation_flags, cb, opaque, errp);if (!s) {return ; }
block/stream.c +3 -2
@@ -229,8 +229,9 @@ void stream_start(const char *job_id, BlockDriverState *bs,BlockDriverState *iter;int orig_bs_flags; - s =block_job_create (job_id, &stream_job_driver, bs, speed, -BLOCK_JOB_DEFAULT ,NULL ,NULL , errp); +/* FIXME Use real permissions */ + s =block_job_create (job_id, &stream_job_driver, bs,0 ,BLK_PERM_ALL , + speed,BLOCK_JOB_DEFAULT ,NULL ,NULL , errp);if (!s) {return ; }
blockjob.c +3 -3
@@ -123,7 +123,8 @@ void block_job_add_bdrv(BlockJob *job, BlockDriverState *bs) }void *block_job_create (const char *job_id,const BlockJobDriver *driver, -BlockDriverState *bs,int64_t speed,int flags, +BlockDriverState *bs,uint64_t perm, +uint64_t shared_perm,int64_t speed,int flags,BlockCompletionFunc *cb,void *opaque,Error **errp) {BlockBackend *blk;
@@ -160,8 +161,7 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver, } } -/* FIXME Use real permissions */ - blk =blk_new (0 ,BLK_PERM_ALL ); + blk =blk_new (perm, shared_perm); ret =blk_insert_bs (blk, bs, errp);if (ret <0 ) {blk_unref (blk);
include/block/blockjob_int.h +3 -1
@@ -119,6 +119,7 @@ struct BlockJobDriver {* generated automatically. * @job_type: The class object for the newly-created job. * @bs: The block +* @perm, @shared_perm: Permissions to request for @bs * @speed: The maximum speed, in bytes per second, or 0 for unlimited. * @cb: Completion function for the job. * @opaque: Opaque pointer value passed to @cb.
@@ -134,7 +135,8 @@ struct BlockJobDriver {* called from a wrapper that is specific to the job type. */ void *block_job_create (const char *job_id,const BlockJobDriver *driver, -BlockDriverState *bs,int64_t speed,int flags, +BlockDriverState *bs,uint64_t perm, +uint64_t shared_perm,int64_t speed,int flags,BlockCompletionFunc *cb,void *opaque,Error **errp);/**
tests/test-blockjob-txn.c +3 -3
@@ -101,9 +101,9 @@ static BlockJob *test_block_job_start(unsigned int iterations,g_assert_nonnull (bs);snprintf (job_id,sizeof (job_id),"job%u" , counter++); - s =block_job_create (job_id, &test_block_job_driver, bs,0 , -BLOCK_JOB_DEFAULT , test_block_job_cb, - data, &error_abort); + s =block_job_create (job_id, &test_block_job_driver, bs, +0 ,BLK_PERM_ALL ,0 ,BLOCK_JOB_DEFAULT , + test_block_job_cb, data, &error_abort); s->iterations = iterations; s->use_timer = use_timer; s->rc = rc;
tests/test-blockjob.c +3 -2
@@ -30,8 +30,9 @@ static BlockJob *do_test_id(BlockBackend *blk, const char *id,BlockJob *job;Error *errp =NULL ; - job =block_job_create (id, &test_block_job_driver,blk_bs (blk),0 , -BLOCK_JOB_DEFAULT , block_job_cb,NULL , &errp); + job =block_job_create (id, &test_block_job_driver,blk_bs (blk), +0 ,BLK_PERM_ALL ,0 ,BLOCK_JOB_DEFAULT , block_job_cb, +NULL , &errp);if (should_succeed) {g_assert_null (errp);g_assert_nonnull (job);
Signature · 1 line
1.8.3.1
PATCH v2 21/43 block: Add BdrvChildRole.get_parent_desc()
In reply to Kevin WolfFor meaningful error messages in the permission system, we need to get some human-readable description of the parent of a BdrvChild.
--- block.c | 9 +++++++++ block/block-backend.c | 21 +++++++++++++++++++++ include/block/block_int.h | 6 ++++++ 3 files changed, 36 insertions(+)
block.c +9 -0
@@ -707,6 +707,12 @@ int bdrv_parse_cache_mode(const char *mode, int *flags, bool *writethrough)return 0 ; } +static char *bdrv_child_get_parent_desc (BdrvChild *c) +{ +BlockDriverState *parent = c->opaque; +return g_strdup (bdrv_get_device_or_node_name (parent)); +} +static void bdrv_child_cb_drained_begin (BdrvChild *child) {BlockDriverState *bs = child->opaque;
@@ -774,6 +780,7 @@ static void bdrv_inherited_options(int *child_flags, QDict *child_options, }const BdrvChildRole child_file = { + .get_parent_desc = bdrv_child_get_parent_desc, .inherit_options = bdrv_inherited_options, .drained_begin = bdrv_child_cb_drained_begin, .drained_end = bdrv_child_cb_drained_end,
@@ -794,6 +801,7 @@ static void bdrv_inherited_fmt_options(int *child_flags, QDict *child_options, }const BdrvChildRole child_format = { + .get_parent_desc = bdrv_child_get_parent_desc, .inherit_options = bdrv_inherited_fmt_options, .drained_begin = bdrv_child_cb_drained_begin, .drained_end = bdrv_child_cb_drained_end,
@@ -824,6 +832,7 @@ static void bdrv_backing_options(int *child_flags, QDict *child_options, }const BdrvChildRole child_backing = { + .get_parent_desc = bdrv_child_get_parent_desc, .inherit_options = bdrv_backing_options, .drained_begin = bdrv_child_cb_drained_begin, .drained_end = bdrv_child_cb_drained_end,
block/block-backend.c +21 -0
@@ -80,6 +80,7 @@ static const AIOCBInfo block_backend_aiocb_info = {static void drive_info_del (DriveInfo *dinfo);static BlockBackend *bdrv_first_blk (BlockDriverState *bs); +static char *blk_get_attached_dev_id (BlockBackend *blk);/* All BlockBackends */ static QTAILQ_HEAD(, BlockBackend) block_backends =
@@ -102,6 +103,25 @@ static void blk_root_drained_end(BdrvChild *child);static void blk_root_change_media (BdrvChild *child,bool load);static void blk_root_resize (BdrvChild *child); +static char *blk_root_get_parent_desc (BdrvChild *child) +{ +BlockBackend *blk = child->opaque; +char *dev_id; + +if (blk->name) { +return g_strdup (blk->name); + } + + dev_id =blk_get_attached_dev_id (blk); +if (*dev_id) { +return dev_id; + }else { +/* TODO Callback into the BB owner for something more detailed */ +g_free (dev_id); +return g_strdup ("a block device" ); + } +} +static const char *blk_root_get_name (BdrvChild *child) {return blk_name (child->opaque);
@@ -113,6 +133,7 @@ static const BdrvChildRole child_root = { .change_media = blk_root_change_media, .resize = blk_root_resize, .get_name = blk_root_get_name, + .get_parent_desc = blk_root_get_parent_desc, .drained_begin = blk_root_drained_begin, .drained_end = blk_root_drained_end,
include/block/block_int.h +6 -0
@@ -452,6 +452,12 @@ struct BdrvChildRole {* name), or NULL if the parent can't provide a better name. */ const char * (*get_name)(BdrvChild *child); +/* Returns a malloced string that describes the parent of the child for a +* human reader. This could be a node-name, BlockBackend name, qdev ID or +* QOM path of the device owning the BlockBackend, job type and ID etc. The +* caller is responsible for freeing the memory. */ +char * (*get_parent_desc)(BdrvChild *child); +/* * If this pair of functions is implemented, the parent doesn't issue new * requests after returning from .drained_begin() until .drained_end() is
Signature · 1 line
1.8.3.1
PATCH v2 22/43 block: Include details on permission errors in message
In reply to Kevin WolfInstead of just telling that there was some conflict, we can be specific and tell which permissions were in conflict and which way the conflict is.
--- block.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 11 deletions(-)
block.c +56 -11
@@ -1471,6 +1471,43 @@ static void bdrv_update_perm(BlockDriverState *bs)bdrv_set_perm (bs, cumulative_perms, cumulative_shared_perms); } +static char *bdrv_child_user_desc (BdrvChild *c) +{ +if (c->role->get_parent_desc) { +return c->role->get_parent_desc (c); + } + +return g_strdup ("another user" ); +} + +static char *bdrv_perm_names (uint64_t perm) +{ +struct perm_name { +uint64_t perm; +const char *name; + } permissions[] = { + {BLK_PERM_CONSISTENT_READ ,"consistent read" }, + {BLK_PERM_WRITE ,"write" }, + {BLK_PERM_WRITE_UNCHANGED ,"write unchanged" }, + {BLK_PERM_RESIZE ,"resize" }, + {BLK_PERM_GRAPH_MOD ,"change children" }, + {0 ,NULL } + }; + +char *result =g_strdup ("" ); +struct perm_name *p; + +for (p = permissions; p->name; p++) { +if (perm & p->perm) { +char *old = result; + result =g_strdup_printf ("%s%s%s" , old, *old ?", " :"" , p->name); +g_free (old); + } + } + +return result; +} +/* * Checks whether a new reference to @bs can be added if the new user requires * @new_used_perm/@new_shared_perm as its permissions. If @ignore_child is set,
@@ -1495,17 +1532,25 @@ static int bdrv_check_update_perm(BlockDriverState *bs, uint64_t new_used_perm,continue ; } -if ((new_used_perm & c->shared_perm) != new_used_perm || - (c->perm & new_shared_perm) != c->perm) - { -const char *user =NULL ; -if (c->role->get_name) { - user = c->role->get_name (c); -if (user && !*user) { - user =NULL ; - } - } -error_setg (errp,"Conflicts with %s" , user ?:"another operation" ); +if ((new_used_perm & c->shared_perm) != new_used_perm) { +char *user =bdrv_child_user_desc (c); +char *perm_names =bdrv_perm_names (new_used_perm & ~c->shared_perm); +error_setg (errp,"Conflicts with use by %s as '%s', which does not " +"allow '%s' on %s" , + user, c->name, perm_names,bdrv_get_node_name (c->bs)); +g_free (user); +g_free (perm_names); +return -EPERM ; + } + +if ((c->perm & new_shared_perm) != c->perm) { +char *user =bdrv_child_user_desc (c); +char *perm_names =bdrv_perm_names (c->perm & ~new_shared_perm); +error_setg (errp,"Conflicts with use by %s as '%s', which uses " +"'%s' on %s" , + user, c->name, perm_names,bdrv_get_node_name (c->bs)); +g_free (user); +g_free (perm_names);return -EPERM ; }
Signature · 1 line
1.8.3.1
PATCH v2 23/43 block: Add BdrvChildRole.stay_at_node
In reply to Kevin WolfWhen the parents' child links are updated in bdrv_append() or bdrv_replace_in_backing_chain(), this should affect all child links of BlockBackends or other nodes, but not on child links held for other purposes (like for setting permissions). This patch allows to control the behaviour per BdrvChildRole.
--- block.c | 3 +++ include/block/block_int.h | 4 ++++ 2 files changed, 7 insertions(+)
block.c +3 -0
@@ -2844,6 +2844,9 @@ static void change_parent_backing_link(BlockDriverState *from,BdrvChild *c, *next, *to_c; QLIST_FOREACH_SAFE(c, &from->parents, next_parent, next) { +if (c->role->stay_at_node) { +continue ; + }if (c->role == &child_backing) {/* @from is generally not allowed to be a backing file, except for * when @to is the overlay. In that case, @from may not be replaced
include/block/block_int.h +4 -0
@@ -441,6 +441,10 @@ typedef struct BdrvAioNotifier { } BdrvAioNotifier;struct BdrvChildRole { +/* If true, bdrv_replace_in_backing_chain() doesn't change the node this +* BdrvChild points to. */ +bool stay_at_node; +void (*inherit_options)(int *child_flags,QDict *child_options,int parent_flags,QDict *parent_options);
Signature · 1 line
1.8.3.1
PATCH v2 24/43 blockjob: Add permissions to block_job_add_bdrv()
In reply to Kevin WolfBlock jobs don't actually do I/O through the the reference they create with block_job_add_bdrv(), but they might want to use the permisssion system to express what the block job does to intermediate nodes. This adds permissions to block_job_add_bdrv() to provide the means to request permissions.
--- block/backup.c | 4 +++- block/commit.c | 8 ++++++-- block/mirror.c | 9 +++++++-- block/stream.c | 4 +++- blockjob.c | 36 ++++++++++++++++++++++++++++++------ include/block/blockjob.h | 5 ++++- 6 files changed, 53 insertions(+), 13 deletions(-)
block/backup.c +3 -1
@@ -657,7 +657,9 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, job->cluster_size =MAX (BACKUP_CLUSTER_SIZE_DEFAULT , bdi.cluster_size); } -block_job_add_bdrv (&job->common, target); +/* FIXME Use real permissions */ +block_job_add_bdrv (&job->common,"target" , target,0 ,BLK_PERM_ALL , + &error_abort); job->common.len = len;block_job_txn_add_job (txn, &job->common);
block/commit.c +6 -2
@@ -267,13 +267,17 @@ void commit_start(const char *job_id, BlockDriverState *bs,* disappear from the chain after this operation. */ assert (bdrv_chain_contains (top, base));for (iter = top; iter !=backing_bs (base); iter =backing_bs (iter)) { -block_job_add_bdrv (&s->common, iter); +/* FIXME Use real permissions */ +block_job_add_bdrv (&s->common,"intermediate node" , iter,0 , +BLK_PERM_ALL , &error_abort); }/* overlay_bs must be blocked because it needs to be modified to * update the backing image string, but if it's the root node then * don't block it again */ if (bs != overlay_bs) { -block_job_add_bdrv (&s->common, overlay_bs); +/* FIXME Use real permissions */ +block_job_add_bdrv (&s->common,"overlay of top" , overlay_bs,0 , +BLK_PERM_ALL , &error_abort); }/* FIXME Use real permissions */
block/mirror.c +7 -2
@@ -1052,13 +1052,18 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,return ; } -block_job_add_bdrv (&s->common, target); +/* FIXME Use real permissions */ +block_job_add_bdrv (&s->common,"target" , target,0 ,BLK_PERM_ALL , + &error_abort); +/* In commit_active_start() all intermediate nodes disappear, so * any jobs in them must be blocked */ if (bdrv_chain_contains (bs, target)) {BlockDriverState *iter;for (iter =backing_bs (bs); iter != target; iter =backing_bs (iter)) { -block_job_add_bdrv (&s->common, iter); +/* FIXME Use real permissions */ +block_job_add_bdrv (&s->common,"intermediate node" , iter,0 , +BLK_PERM_ALL , &error_abort); } }
block/stream.c +3 -1
@@ -248,7 +248,9 @@ void stream_start(const char *job_id, BlockDriverState *bs,/* Block all intermediate nodes between bs and base, because they * will disappear from the chain after this operation */ for (iter =backing_bs (bs); iter && iter != base; iter =backing_bs (iter)) { -block_job_add_bdrv (&s->common, iter); +/* FIXME Use real permissions */ +block_job_add_bdrv (&s->common,"intermediate node" , iter,0 , +BLK_PERM_ALL , &error_abort); } s->base = base;
blockjob.c +30 -6
@@ -55,6 +55,19 @@ struct BlockJobTxn { static QLIST_HEAD(, BlockJob) block_jobs = QLIST_HEAD_INITIALIZER(block_jobs); +static char *child_job_get_parent_desc (BdrvChild *c) +{ +BlockJob *job = c->opaque; +return g_strdup_printf ("%s job '%s'" , + BlockJobType_lookup[job->driver->job_type], + job->id); +} + +static const BdrvChildRole child_job = { + .get_parent_desc = child_job_get_parent_desc, + .stay_at_node = true, +}; +BlockJob *block_job_next (BlockJob *job) {if (!job) {
@@ -115,11 +128,22 @@ static void block_job_detach_aio_context(void *opaque)block_job_unref (job); } -void block_job_add_bdrv (BlockJob *job,BlockDriverState *bs) +int block_job_add_bdrv (BlockJob *job,const char *name,BlockDriverState *bs, +uint64_t perm,uint64_t shared_perm,Error **errp) { - job->nodes =g_slist_prepend (job->nodes, bs); +BdrvChild *c; + + c =bdrv_root_attach_child (bs, name, &child_job, perm, shared_perm, + job, errp); +if (c ==NULL ) { +return -EPERM ; + } + + job->nodes =g_slist_prepend (job->nodes, c);bdrv_ref (bs);bdrv_op_block_all (bs, job->blocker); + +return 0 ; } void *block_job_create(const char *job_id, const BlockJobDriver *driver,
@@ -171,7 +195,7 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver, job =g_malloc0 (driver->instance_size);error_setg (&job->blocker,"block device is in use by block job: %s" , BlockJobType_lookup[driver->job_type]); -block_job_add_bdrv (job, bs); +block_job_add_bdrv (job,"main node" , bs,0 ,BLK_PERM_ALL , &error_abort);bdrv_op_unblock (bs,BLOCK_OP_TYPE_DATAPLANE , job->blocker); job->driver = driver;
@@ -238,9 +262,9 @@ void block_job_unref(BlockJob *job)BlockDriverState *bs =blk_bs (job->blk); bs->job =NULL ;for (l = job->nodes; l; l = l->next) { - bs = l->data; -bdrv_op_unblock_all (bs, job->blocker); -bdrv_unref (bs); +BdrvChild *c = l->data; +bdrv_op_unblock_all (c->bs, job->blocker); +bdrv_root_unref_child (c); }g_slist_free (job->nodes); blk_remove_aio_context_notifier(job->blk,
include/block/blockjob.h +4 -1
@@ -169,13 +169,16 @@ BlockJob *block_job_get(const char *id);/** * block_job_add_bdrv: * @job: A block job +* @name: The name to assign to the new BdrvChild * @bs: A BlockDriverState that is involved in @job +* @perm, @shared_perm: Permissions to request on the node * * Add @bs to the list of BlockDriverState that are involved in * @job. This means that all operations will be blocked on @bs while * @job exists. */ -void block_job_add_bdrv (BlockJob *job,BlockDriverState *bs); +int block_job_add_bdrv (BlockJob *job,const char *name,BlockDriverState *bs, +uint64_t perm,uint64_t shared_perm,Error **errp);/** * block_job_set_speed:
Signature · 1 line
1.8.3.1
PATCH v2 25/43 commit: Use real permissions in commit block job
In reply to Kevin WolfThis is probably one of the most interesting conversions to the new op blocker system because a commit block job intentionally leaves some intermediate block nodes in the backing chain that aren't valid on their own any more; only the whole chain together results in a valid view.
In order to provide the 'consistent read' permission to the parents of the 'top' node of the commit job, a new filter block driver is inserted above 'top' which doesn't require 'consistent read' on its backing chain. Subsequently, the commit job can block 'consistent read' on all intermediate nodes without causing a conflict.
--- block/commit.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 95 insertions(+), 18 deletions(-)
block/commit.c +95 -18
@@ -36,6 +36,7 @@ typedef struct CommitBlockJob {BlockJob common;RateLimit limit;BlockDriverState *active; +BlockDriverState *commit_top_bs;BlockBackend *top;BlockBackend *base;BlockdevOnError on_error;
@@ -83,12 +84,23 @@ static void commit_complete(BlockJob *job, void *opaque)BlockDriverState *active = s->active;BlockDriverState *top =blk_bs (s->top);BlockDriverState *base =blk_bs (s->base); -BlockDriverState *overlay_bs =bdrv_find_overlay (active, top); +BlockDriverState *overlay_bs =bdrv_find_overlay (active, s->commit_top_bs);int ret = data->ret; +bool remove_commit_top_bs = false; + +/* Remove base node parent that still uses BLK_PERM_WRITE/RESIZE before +* the normal backing chain can be restored. */ +blk_unref (s->base);if (!block_job_is_cancelled (&s->common) && ret ==0 ) {/* success */ - ret =bdrv_drop_intermediate (active, top, base, s->backing_file_str); + ret =bdrv_drop_intermediate (active, s->commit_top_bs, base, + s->backing_file_str); + }else if (overlay_bs) { +/* XXX Can (or should) we somehow keep 'consistent read' blocked even +* after the failed/cancelled commit job is gone? If we already wrote +* something to base, the intermediate images aren't valid any more. */ + remove_commit_top_bs = true; }/* restore base open flags here if appropriate (e.g., change the base back
@@ -102,9 +114,15 @@ static void commit_complete(BlockJob *job, void *opaque) }g_free (s->backing_file_str);blk_unref (s->top); -blk_unref (s->base);block_job_completed (&s->common, ret);g_free (data); + +/* If bdrv_drop_intermediate() didn't already do that, remove the commit +* filter driver from the backing chain. Do this as the final step so that +* the 'consistent read' permission can be granted. */ +if (remove_commit_top_bs) { +bdrv_set_backing_hd (overlay_bs, top); + } } static void coroutine_fn commit_run(void *opaque)
@@ -208,6 +226,34 @@ static const BlockJobDriver commit_job_driver = { .start = commit_run, }; +static int coroutine_fn bdrv_commit_top_preadv(BlockDriverState *bs, +uint64_t offset,uint64_t bytes,QEMUIOVector *qiov,int flags) +{ +return bdrv_co_preadv (bs->backing, offset, bytes, qiov, flags); +} + +static void bdrv_commit_top_close (BlockDriverState *bs) +{ +} + +static void bdrv_commit_top_child_perm (BlockDriverState *bs,BdrvChild *c, +const BdrvChildRole *role, +uint64_t perm,uint64_t shared, +uint64_t *nperm,uint64_t *nshared) +{ + *nperm =0 ; + *nshared =BLK_PERM_ALL ; +} + +/* Dummy node that provides consistent read to its users without requiring it +* from its backing file and that allows writes on the backing file chain. */ +static BlockDriver bdrv_commit_top = { + .format_name ="commit_top" , + .bdrv_co_preadv = bdrv_commit_top_preadv, + .bdrv_close = bdrv_commit_top_close, + .bdrv_child_perm = bdrv_commit_top_child_perm, +}; + void commit_start(const char *job_id, BlockDriverState *bs, BlockDriverState *base, BlockDriverState *top, int64_t speed, BlockdevOnError on_error, const char *backing_file_str,
@@ -219,6 +265,7 @@ void commit_start(const char *job_id, BlockDriverState *bs,int orig_base_flags;BlockDriverState *iter;BlockDriverState *overlay_bs; +BlockDriverState *commit_top_bs =NULL ;Error *local_err =NULL ;int ret;
@@ -235,7 +282,6 @@ void commit_start(const char *job_id, BlockDriverState *bs,return ; } -/* FIXME Use real permissions */ s =block_job_create (job_id, &commit_job_driver, bs,0 ,BLK_PERM_ALL , speed,BLOCK_JOB_DEFAULT ,NULL ,NULL , errp);if (!s) {
@@ -262,34 +308,62 @@ void commit_start(const char *job_id, BlockDriverState *bs, } } +/* Insert commit_top block node above top, so we can block consistent read +* on the backing chain below it */ + commit_top_bs =bdrv_new_open_driver (&bdrv_commit_top,NULL ,0 , errp); +if (commit_top_bs ==NULL ) { + goto fail; + } + +bdrv_set_backing_hd (commit_top_bs, top); +bdrv_set_backing_hd (overlay_bs, commit_top_bs); + + s->commit_top_bs = commit_top_bs; +bdrv_unref (commit_top_bs);/* Block all nodes between top and base, because they will * disappear from the chain after this operation. */ assert (bdrv_chain_contains (top, base)); -for (iter = top; iter !=backing_bs (base); iter =backing_bs (iter)) { -/* FIXME Use real permissions */ -block_job_add_bdrv (&s->common,"intermediate node" , iter,0 , -BLK_PERM_ALL , &error_abort); +for (iter = top; iter != base; iter =backing_bs (iter)) { +/* XXX BLK_PERM_WRITE needs to be allowed so we don't block ourselves +* at s->base (if writes are blocked for a node, they are also blocked +* for its backing file). The other options would be a second filter +* driver above s->base. */ + ret =block_job_add_bdrv (&s->common,"intermediate node" , iter,0 , +BLK_PERM_WRITE_UNCHANGED |BLK_PERM_WRITE , + errp); +if (ret <0 ) { + goto fail; + } } + + ret =block_job_add_bdrv (&s->common,"base" , base,0 ,BLK_PERM_ALL , errp); +if (ret <0 ) { + goto fail; + } +/* overlay_bs must be blocked because it needs to be modified to -* update the backing image string, but if it's the root node then -* don't block it again */ -if (bs != overlay_bs) { -/* FIXME Use real permissions */ -block_job_add_bdrv (&s->common,"overlay of top" , overlay_bs,0 , -BLK_PERM_ALL , &error_abort); +* update the backing image string. */ + ret =block_job_add_bdrv (&s->common,"overlay of top" , overlay_bs, +BLK_PERM_GRAPH_MOD ,BLK_PERM_ALL , errp); +if (ret <0 ) { + goto fail; } -/* FIXME Use real permissions */ - s->base =blk_new (0 ,BLK_PERM_ALL ); + s->base =blk_new (BLK_PERM_CONSISTENT_READ + |BLK_PERM_WRITE + |BLK_PERM_RESIZE , +BLK_PERM_CONSISTENT_READ + |BLK_PERM_GRAPH_MOD + |BLK_PERM_WRITE_UNCHANGED ); ret =blk_insert_bs (s->base, base, errp);if (ret <0 ) { goto fail; } -/* FIXME Use real permissions */ +/* Required permissions are already taken with block_job_add_bdrv() */ s->top =blk_new (0 ,BLK_PERM_ALL ); - ret =blk_insert_bs (s->top, top, errp); +blk_insert_bs (s->top, top, errp);if (ret <0 ) { goto fail; }
@@ -314,6 +388,9 @@ fail:if (s->top) {blk_unref (s->top); } +if (commit_top_bs) { +bdrv_set_backing_hd (overlay_bs, top); + }block_job_unref (&s->common); }
Signature · 1 line
1.8.3.1
PATCH v2 26/43 commit: Use real permissions for HMP 'commit'
In reply to Kevin WolfThis is a little simpler than the commit block job because it's synchronous and only commits into the immediate backing file, but otherwise doing more or less the same.
--- block/commit.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-)
block/commit.c +27 -6
@@ -401,11 +401,14 @@ fail:int bdrv_commit (BlockDriverState *bs) {BlockBackend *src, *backing; +BlockDriverState *backing_file_bs =NULL ; +BlockDriverState *commit_top_bs =NULL ;BlockDriver *drv = bs->drv;int64_t sector, total_sectors, length, backing_length;int n, ro, open_flags;int ret =0 ;uint8_t *buf =NULL ; +Error *local_err =NULL ;if (!drv)return -ENOMEDIUM ;
@@ -428,17 +431,31 @@ int bdrv_commit(BlockDriverState *bs) } } -/* FIXME Use real permissions */ - src =blk_new (0 ,BLK_PERM_ALL ); - backing =blk_new (0 ,BLK_PERM_ALL ); + src =blk_new (BLK_PERM_CONSISTENT_READ ,BLK_PERM_ALL ); + backing =blk_new (BLK_PERM_WRITE |BLK_PERM_RESIZE ,BLK_PERM_ALL ); - ret =blk_insert_bs (src, bs,NULL ); + ret =blk_insert_bs (src, bs, &local_err);if (ret <0 ) { +error_report_err (local_err); + goto ro_cleanup; + } + +/* Insert commit_top block node above backing, so we can write to it */ + backing_file_bs =backing_bs (bs); + + commit_top_bs =bdrv_new_open_driver (&bdrv_commit_top,NULL ,BDRV_O_RDWR , + &local_err); +if (commit_top_bs ==NULL ) { +error_report_err (local_err); goto ro_cleanup; } - ret =blk_insert_bs (backing, bs->backing->bs,NULL ); +bdrv_set_backing_hd (commit_top_bs, backing_file_bs); +bdrv_set_backing_hd (bs, commit_top_bs); + + ret =blk_insert_bs (backing, backing_file_bs, &local_err);if (ret <0 ) { +error_report_err (local_err); goto ro_cleanup; }
@@ -512,8 +529,12 @@ int bdrv_commit(BlockDriverState *bs) ro_cleanup:qemu_vfree (buf); -blk_unref (src);blk_unref (backing); +if (backing_file_bs) { +bdrv_set_backing_hd (bs, backing_file_bs); + } +bdrv_unref (commit_top_bs); +blk_unref (src);if (ro) {/* ignoring error return here */
Signature · 1 line
1.8.3.1
PATCH v2 27/43 backup: Use real permissions in backup block job
In reply to Kevin WolfThe backup block job doesn't have very complicated requirements: It needs to read from the source and write to the target, but it's fine with either side being changed. The only restriction is that we can't resize the image because the job uses a cached value.
qemu-iotests 055 needs to be changed because it used a target which was already attached to a virtio-blk device. The permission system correctly forbids this (virtio-blk can't accept another writer with its default share-rw=off).
--- block/backup.c | 15 ++++++++++----- tests/qemu-iotests/055 | 11 +++++++---- 2 files changed, 17 insertions(+), 9 deletions(-)
block/backup.c +10 -5
@@ -618,15 +618,20 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, goto error; } -/* FIXME Use real permissions */ - job =block_job_create (job_id, &backup_job_driver, bs,0 ,BLK_PERM_ALL , +/* job->common.len is fixed, so we can't allow resize */ + job =block_job_create (job_id, &backup_job_driver, bs, +BLK_PERM_CONSISTENT_READ , +BLK_PERM_CONSISTENT_READ |BLK_PERM_WRITE | +BLK_PERM_WRITE_UNCHANGED |BLK_PERM_GRAPH_MOD , speed, creation_flags, cb, opaque, errp);if (!job) { goto error; } -/* FIXME Use real permissions */ - job->target =blk_new (0 ,BLK_PERM_ALL ); +/* The target must match the source in size, so no resize here either */ + job->target =blk_new (BLK_PERM_WRITE , +BLK_PERM_CONSISTENT_READ |BLK_PERM_WRITE | +BLK_PERM_WRITE_UNCHANGED |BLK_PERM_GRAPH_MOD ); ret =blk_insert_bs (job->target, target, errp);if (ret <0 ) { goto error;
@@ -657,7 +662,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, job->cluster_size =MAX (BACKUP_CLUSTER_SIZE_DEFAULT , bdi.cluster_size); } -/* FIXME Use real permissions */ +/* Required permissions are already taken with target's blk_new() */ block_job_add_bdrv (&job->common,"target" , target,0 ,BLK_PERM_ALL , &error_abort); job->common.len = len;
tests/qemu-iotests/055 +7 -4
@@ -48,7 +48,8 @@ class TestSingleDrive(iotests.QMPTestCase): def setUp(self): qemu_img('create', '-f', iotests.imgfmt, blockdev_target_img, str(image_len)) - self.vm = iotests.VM().add_drive(test_img).add_drive(blockdev_target_img) + self.vm = iotests.VM().add_drive(test_img) + self.vm.add_drive(blockdev_target_img, interface="none") if iotests.qemu_default_machine == 'pc': self.vm.add_drive(None, 'media=cdrom', 'ide') self.vm.launch()
@@ -164,7 +165,8 @@ class TestSetSpeed(iotests.QMPTestCase): def setUp(self): qemu_img('create', '-f', iotests.imgfmt, blockdev_target_img, str(image_len)) - self.vm = iotests.VM().add_drive(test_img).add_drive(blockdev_target_img) + self.vm = iotests.VM().add_drive(test_img) + self.vm.add_drive(blockdev_target_img, interface="none") self.vm.launch() def tearDown(self):
@@ -247,7 +249,8 @@ class TestSingleTransaction(iotests.QMPTestCase): def setUp(self): qemu_img('create', '-f', iotests.imgfmt, blockdev_target_img, str(image_len)) - self.vm = iotests.VM().add_drive(test_img).add_drive(blockdev_target_img) + self.vm = iotests.VM().add_drive(test_img) + self.vm.add_drive(blockdev_target_img, interface="none") if iotests.qemu_default_machine == 'pc': self.vm.add_drive(None, 'media=cdrom', 'ide') self.vm.launch()
@@ -460,7 +463,7 @@ class TestDriveCompression(iotests.QMPTestCase): qemu_img('create', '-f', fmt, blockdev_target_img, str(TestDriveCompression.image_len), *args) - self.vm.add_drive(blockdev_target_img, format=fmt) + self.vm.add_drive(blockdev_target_img, format=fmt, interface="none") self.vm.launch()
Signature · 1 line
1.8.3.1
PATCH v2 28/43 block: Fix pending requests check in bdrv_append()
In reply to Kevin Wolfbdrv_append() cares about isolation of the node that it modifies, but not about activity in some subtree below it. Instead of using the recursive bdrv_requests_pending(), directly check bs->in_flight, which considers only the node in question.
--- block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
block.c +2 -2
@@ -2886,8 +2886,8 @@ static void change_parent_backing_link(BlockDriverState *from,*/ void bdrv_append (BlockDriverState *bs_new,BlockDriverState *bs_top) { -assert (!bdrv_requests_pending (bs_top)); -assert (!bdrv_requests_pending (bs_new)); +assert (!atomic_read (&bs_top->in_flight)); +assert (!atomic_read (&bs_new->in_flight));bdrv_ref (bs_top);
Signature · 1 line
1.8.3.1
PATCH v2 29/43 block: BdrvChildRole.attach/detach() callbacks
In reply to Kevin WolfBacking files are somewhat special compared to other kinds of children because they are attached and detached using bdrv_set_backing_hd() rather than the normal set of functions, which does a few more things like setting backing blockers, toggling the BDRV_O_NO_BACKING flag, setting parent_bs->backing_file, etc.
These special features are a reason why change_parent_backing_link() can't handle backing files yet. With abstracting the additional features into .attach/.detach callbacks, we get a step closer to a function that can actually deal with this.
--- block.c | 94 +++++++++++++++++++++++++++++------------------ include/block/block_int.h | 3 ++ 2 files changed, 62 insertions(+), 35 deletions(-)
block.c +59 -35
@@ -807,6 +807,57 @@ const BdrvChildRole child_format = { .drained_end = bdrv_child_cb_drained_end, }; +static void bdrv_backing_attach (BdrvChild *c) +{ +BlockDriverState *parent = c->opaque; +BlockDriverState *backing_hd = c->bs; + +assert (!parent->backing_blocker); +error_setg (&parent->backing_blocker, +"node is used as backing hd of '%s'" , +bdrv_get_device_or_node_name (parent)); + + parent->open_flags &= ~BDRV_O_NO_BACKING ; +pstrcpy (parent->backing_file,sizeof (parent->backing_file), + backing_hd->filename); +pstrcpy (parent->backing_format,sizeof (parent->backing_format), + backing_hd->drv ? backing_hd->drv->format_name :"" ); + +bdrv_op_block_all (backing_hd, parent->backing_blocker); +/* Otherwise we won't be able to commit or stream */ +bdrv_op_unblock (backing_hd,BLOCK_OP_TYPE_COMMIT_TARGET , + parent->backing_blocker); +bdrv_op_unblock (backing_hd,BLOCK_OP_TYPE_STREAM , + parent->backing_blocker); +/* +* We do backup in 3 ways: +* 1. drive backup +* The target bs is new opened, and the source is top BDS +* 2. blockdev backup +* Both the source and the target are top BDSes. +* 3. internal backup(used for block replication) +* Both the source and the target are backing file +* +* In case 1 and 2, neither the source nor the target is the backing file. +* In case 3, we will block the top BDS, so there is only one block job +* for the top BDS and its backing chain. +*/ +bdrv_op_unblock (backing_hd,BLOCK_OP_TYPE_BACKUP_SOURCE , + parent->backing_blocker); +bdrv_op_unblock (backing_hd,BLOCK_OP_TYPE_BACKUP_TARGET , + parent->backing_blocker); +} + +static void bdrv_backing_detach (BdrvChild *c) +{ +BlockDriverState *parent = c->opaque; + +assert (parent->backing_blocker); +bdrv_op_unblock_all (c->bs, parent->backing_blocker); +error_free (parent->backing_blocker); + parent->backing_blocker =NULL ; +} +/* * Returns the options and flags that bs->backing should get, based on the * given options and flags for the parent BDS
@@ -833,6 +884,8 @@ static void bdrv_backing_options(int *child_flags, QDict *child_options,const BdrvChildRole child_backing = { .get_parent_desc = bdrv_child_get_parent_desc, + .attach = bdrv_backing_attach, + .detach = bdrv_backing_detach, .inherit_options = bdrv_backing_options, .drained_begin = bdrv_child_cb_drained_begin, .drained_end = bdrv_child_cb_drained_end,
@@ -1672,6 +1725,9 @@ static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs)if (old_bs->quiesce_counter && child->role->drained_end) { child->role->drained_end (child); } +if (child->role->detach) { + child->role->detach (child); + }QLIST_REMOVE (child, next_parent);bdrv_update_perm (old_bs); }
@@ -1684,6 +1740,9 @@ static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs) child->role->drained_begin (child); }bdrv_update_perm (new_bs); +if (child->role->attach) { + child->role->attach (child); + } } }
@@ -1821,52 +1880,17 @@ void bdrv_set_backing_hd(BlockDriverState *bs, BlockDriverState *backing_hd) }if (bs->backing) { -assert (bs->backing_blocker); -bdrv_op_unblock_all (bs->backing->bs, bs->backing_blocker);bdrv_unref_child (bs, bs->backing); - }else if (backing_hd) { -error_setg (&bs->backing_blocker, -"node is used as backing hd of '%s'" , -bdrv_get_device_or_node_name (bs)); }if (!backing_hd) { -error_free (bs->backing_blocker); - bs->backing_blocker =NULL ; bs->backing =NULL ; goto out; }/* FIXME Error handling */ bs->backing =bdrv_attach_child (bs, backing_hd,"backing" , &child_backing, &error_abort); - bs->open_flags &= ~BDRV_O_NO_BACKING ; -pstrcpy (bs->backing_file,sizeof (bs->backing_file), backing_hd->filename); -pstrcpy (bs->backing_format,sizeof (bs->backing_format), - backing_hd->drv ? backing_hd->drv->format_name :"" ); -bdrv_op_block_all (backing_hd, bs->backing_blocker); -/* Otherwise we won't be able to commit or stream */ -bdrv_op_unblock (backing_hd,BLOCK_OP_TYPE_COMMIT_TARGET , - bs->backing_blocker); -bdrv_op_unblock (backing_hd,BLOCK_OP_TYPE_STREAM , - bs->backing_blocker); -/* -* We do backup in 3 ways: -* 1. drive backup -* The target bs is new opened, and the source is top BDS -* 2. blockdev backup -* Both the source and the target are top BDSes. -* 3. internal backup(used for block replication) -* Both the source and the target are backing file -* -* In case 1 and 2, neither the source nor the target is the backing file. -* In case 3, we will block the top BDS, so there is only one block job -* for the top BDS and its backing chain. -*/ -bdrv_op_unblock (backing_hd,BLOCK_OP_TYPE_BACKUP_SOURCE , - bs->backing_blocker); -bdrv_op_unblock (backing_hd,BLOCK_OP_TYPE_BACKUP_TARGET , - bs->backing_blocker); out:bdrv_refresh_limits (bs,NULL ); }
include/block/block_int.h +3 -0
@@ -472,6 +472,9 @@ struct BdrvChildRole {*/ void (*drained_begin)(BdrvChild *child);void (*drained_end)(BdrvChild *child); + +void (*attach)(BdrvChild *child); +void (*detach)(BdrvChild *child); };extern const BdrvChildRole child_file;
Signature · 1 line
1.8.3.1
PATCH v2 30/43 block: Allow backing file links in change_parent_backing_link()
In reply to Kevin WolfNow that the backing file child role implements .attach/.detach callbacks, nothing prevents us from modifying the graph even if that involves changing backing file links.
--- block.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
block.c +3 -4
@@ -2872,9 +2872,9 @@ static void change_parent_backing_link(BlockDriverState *from,continue ; }if (c->role == &child_backing) { -/* @from is generally not allowed to be a backing file, except for -* when @to is the overlay. In that case, @from may not be replaced -* by @to as @to's backing node. */ +/* If @from is a backing file of @to, ignore the child to avoid +* creating a loop. We only want to change the pointer of other +* parents. */ QLIST_FOREACH(to_c, &to->children, next) {if (to_c == c) {break ;
@@ -2885,7 +2885,6 @@ static void change_parent_backing_link(BlockDriverState *from, } } -assert (c->role != &child_backing);bdrv_ref (to);bdrv_replace_child (c, to);bdrv_unref (from);
Signature · 1 line
1.8.3.1
PATCH v2 31/43 mirror: Use real permissions in mirror/active commit block job
In reply to Kevin WolfThe mirror block job is mainly used for two different scenarios:
Mirroring to an otherwise unused, independent target node, or for active commit where the target node is part of the backing chain of the source.
Similarly to the commit block job patch, we need to insert a new filter node to keep the permissions correct during active commit.
Note that one change this implies is that job->blk points to mirror_top_bs as its root now, and mirror_top_bs (rather than the actual source node) contains the bs->job pointer. This requires qemu-img commit to get the job by name now rather than just taking bs->job.
--- block/mirror.c | 212 +++++++++++++++++++++++++++++++++++++-------- qemu-img.c | 6 +- tests/qemu-iotests/141 | 2 +- tests/qemu-iotests/141.out | 4 +- 4 files changed, 186 insertions(+), 38 deletions(-)
block/mirror.c +178 -34
@@ -38,7 +38,10 @@ typedef struct MirrorBlockJob {BlockJob common;RateLimit limit;BlockBackend *target; +BlockDriverState *mirror_top_bs; +BlockDriverState *source;BlockDriverState *base; +/* The name of the graph node to replace */ char *replaces;/* The BDS to replace */
@@ -327,7 +330,7 @@ static void mirror_do_zero_or_discard(MirrorBlockJob *s, static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s) { -BlockDriverState *source =blk_bs (s->common.blk); +BlockDriverState *source = s->source;int64_t sector_num, first_chunk;uint64_t delay_ns =0 ;/* At least the first dirty chunk is mirrored in one iteration. */
@@ -497,12 +500,24 @@ static void mirror_exit(BlockJob *job, void *opaque)MirrorBlockJob *s =container_of (job, MirrorBlockJob, common);MirrorExitData *data = opaque;AioContext *replace_aio_context =NULL ; -BlockDriverState *src =blk_bs (s->common.blk); +BlockDriverState *src = s->source;BlockDriverState *target_bs =blk_bs (s->target); +BlockDriverState *mirror_top_bs = s->mirror_top_bs;/* Make sure that the source BDS doesn't go away before we called * block_job_completed(). */ bdrv_ref (src); +bdrv_ref (mirror_top_bs); + +/* We don't access the source any more. Dropping any WRITE/RESIZE is +* required before it could become a backing file of target_bs. */ +bdrv_child_set_perm (mirror_top_bs->backing,0 ,BLK_PERM_ALL ); +if (s->backing_mode ==MIRROR_SOURCE_BACKING_CHAIN ) { +BlockDriverState *backing = s->is_none_mode ? src : s->base; +if (backing_bs (target_bs) != backing) { +bdrv_set_backing_hd (target_bs, backing); + } + }if (s->to_replace) { replace_aio_context =bdrv_get_aio_context (s->to_replace);
@@ -524,13 +539,6 @@ static void mirror_exit(BlockJob *job, void *opaque)bdrv_drained_begin (target_bs);bdrv_replace_in_backing_chain (to_replace, target_bs);bdrv_drained_end (target_bs); - -/* We just changed the BDS the job BB refers to, so switch the BB back -* so the cleanup does the right thing. We don't need any permissions -* any more now. */ -blk_remove_bs (job->blk); -blk_set_perm (job->blk,0 ,BLK_PERM_ALL , &error_abort); -blk_insert_bs (job->blk, src, &error_abort); }if (s->to_replace) {bdrv_op_unblock_all (s->to_replace, s->replace_blocker);
@@ -543,9 +551,23 @@ static void mirror_exit(BlockJob *job, void *opaque)g_free (s->replaces);blk_unref (s->target); s->target =NULL ; + +/* Remove the mirror filter driver from the graph */ +bdrv_replace_in_backing_chain (mirror_top_bs,backing_bs (mirror_top_bs)); + +/* We just changed the BDS the job BB refers to (with either or both of the +* bdrv_replace_in_backing_chain() calls), so switch the BB back so the +* cleanup does the right thing. We don't need any permissions any more +* now. */ +blk_remove_bs (job->blk); +blk_set_perm (job->blk,0 ,BLK_PERM_ALL , &error_abort); +blk_insert_bs (job->blk, mirror_top_bs, &error_abort); +block_job_completed (&s->common, data->ret); +g_free (data);bdrv_drained_end (src); +bdrv_unref (mirror_top_bs);bdrv_unref (src); }
@@ -565,7 +587,7 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s) {int64_t sector_num, end;BlockDriverState *base = s->base; -BlockDriverState *bs =blk_bs (s->common.blk); +BlockDriverState *bs = s->source;BlockDriverState *target_bs =blk_bs (s->target);int ret, n;
@@ -647,7 +669,7 @@ static void coroutine_fn mirror_run(void *opaque) {MirrorBlockJob *s = opaque;MirrorExitData *data; -BlockDriverState *bs =blk_bs (s->common.blk); +BlockDriverState *bs = s->source;BlockDriverState *target_bs =blk_bs (s->target);bool need_drain = true;int64_t length;
@@ -879,9 +901,8 @@ static void mirror_set_speed(BlockJob *job, int64_t speed, Error **errp)static void mirror_complete (BlockJob *job,Error **errp) {MirrorBlockJob *s =container_of (job, MirrorBlockJob, common); -BlockDriverState *src, *target; +BlockDriverState *target; - src =blk_bs (job->blk); target =blk_bs (s->target);if (!s->synced) {
@@ -913,6 +934,10 @@ static void mirror_complete(BlockJob *job, Error **errp) replace_aio_context =bdrv_get_aio_context (s->to_replace);aio_context_acquire (replace_aio_context); +/* TODO Translate this into permission system. Current definition of +* GRAPH_MOD would require to request it for the parents; they might +* not even be BlockDriverStates, however, so a BdrvChild can't address +* them. May need redefinition of GRAPH_MOD. */ error_setg (&s->replace_blocker,"block device is in use by block-job-complete" );bdrv_op_block_all (s->to_replace, s->replace_blocker);
@@ -921,13 +946,6 @@ static void mirror_complete(BlockJob *job, Error **errp)aio_context_release (replace_aio_context); } -if (s->backing_mode ==MIRROR_SOURCE_BACKING_CHAIN ) { -BlockDriverState *backing = s->is_none_mode ? src : s->base; -if (backing_bs (target) != backing) { -bdrv_set_backing_hd (target, backing); - } - } - s->should_complete = true;block_job_enter (&s->common); }
@@ -983,6 +1001,77 @@ static const BlockJobDriver commit_active_job_driver = { .drain = mirror_drain, }; +static int coroutine_fn bdrv_mirror_top_preadv(BlockDriverState *bs, +uint64_t offset,uint64_t bytes,QEMUIOVector *qiov,int flags) +{ +return bdrv_co_preadv (bs->backing, offset, bytes, qiov, flags); +} + +static int coroutine_fn bdrv_mirror_top_pwritev(BlockDriverState *bs, +uint64_t offset,uint64_t bytes,QEMUIOVector *qiov,int flags) +{ +return bdrv_co_pwritev (bs->backing, offset, bytes, qiov, flags); +} + +static int coroutine_fn bdrv_mirror_top_flush(BlockDriverState *bs) +{ +return bdrv_co_flush (bs->backing->bs); +} + +static int64_t coroutine_fn bdrv_mirror_top_get_block_status( +BlockDriverState *bs,int64_t sector_num,int nb_sectors,int *pnum, +BlockDriverState **file) +{ + *pnum = nb_sectors; + *file = bs->backing->bs; +return BDRV_BLOCK_RAW |BDRV_BLOCK_OFFSET_VALID |BDRV_BLOCK_DATA | + (sector_num <<BDRV_SECTOR_BITS ); +} + +static int coroutine_fn bdrv_mirror_top_pwrite_zeroes(BlockDriverState *bs, +int64_t offset,int count,BdrvRequestFlags flags) +{ +return bdrv_co_pwrite_zeroes (bs->backing, offset, count, flags); +} + +static int coroutine_fn bdrv_mirror_top_pdiscard(BlockDriverState *bs, +int64_t offset,int count) +{ +return bdrv_co_pdiscard (bs->backing->bs, offset, count); +} + +static void bdrv_mirror_top_close (BlockDriverState *bs) +{ +} + +static void bdrv_mirror_top_child_perm (BlockDriverState *bs,BdrvChild *c, +const BdrvChildRole *role, +uint64_t perm,uint64_t shared, +uint64_t *nperm,uint64_t *nshared) +{ +/* Must be able to forward guest writes to the real image */ + *nperm =0 ; +if (perm &BLK_PERM_WRITE ) { + *nperm |=BLK_PERM_WRITE ; + } + + *nshared =BLK_PERM_ALL ; +} + +/* Dummy node that provides consistent read to its users without requiring it +* from its backing file and that allows writes on the backing file chain. */ +static BlockDriver bdrv_mirror_top = { + .format_name ="mirror_top" , + .bdrv_co_preadv = bdrv_mirror_top_preadv, + .bdrv_co_pwritev = bdrv_mirror_top_pwritev, + .bdrv_co_pwrite_zeroes = bdrv_mirror_top_pwrite_zeroes, + .bdrv_co_pdiscard = bdrv_mirror_top_pdiscard, + .bdrv_co_flush = bdrv_mirror_top_flush, + .bdrv_co_get_block_status = bdrv_mirror_top_get_block_status, + .bdrv_close = bdrv_mirror_top_close, + .bdrv_child_perm = bdrv_mirror_top_child_perm, +}; + static void mirror_start_job(const char *job_id, BlockDriverState *bs, int creation_flags, BlockDriverState *target, const char *replaces, int64_t speed,
@@ -998,6 +1087,9 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, bool auto_complete) {MirrorBlockJob *s; +BlockDriverState *mirror_top_bs; +bool target_graph_mod; +bool target_is_backing;int ret;if (granularity ==0 ) {
@@ -1015,20 +1107,55 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, buf_size =DEFAULT_MIRROR_BUF_SIZE ; } -/* FIXME Use real permissions */ - s =block_job_create (job_id, driver, bs,0 ,BLK_PERM_ALL , speed, +/* In the case of active commit, add dummy driver to provide consistent +* reads on the top, while disabling it in the intermediate nodes, and make +* the backing chain writable. */ + mirror_top_bs =bdrv_new_open_driver (&bdrv_mirror_top,NULL ,BDRV_O_RDWR , + errp); +if (mirror_top_bs ==NULL ) { +return ; + } + mirror_top_bs->total_sectors = bs->total_sectors; + +/* bdrv_append takes ownership of the mirror_top_bs reference, need to keep +* it alive until block_job_create() even if bs has no parent. */ +bdrv_ref (mirror_top_bs); +bdrv_drained_begin (bs); +bdrv_append (mirror_top_bs, bs); +bdrv_drained_end (bs); + +/* Make sure that the source is not resized while the job is running */ + s =block_job_create (job_id, driver, mirror_top_bs, +BLK_PERM_CONSISTENT_READ , +BLK_PERM_CONSISTENT_READ |BLK_PERM_WRITE_UNCHANGED | +BLK_PERM_WRITE |BLK_PERM_GRAPH_MOD , speed, creation_flags, cb, opaque, errp); +bdrv_unref (mirror_top_bs);if (!s) { -return ; + goto fail; } - -/* FIXME Use real permissions */ - s->target =blk_new (0 ,BLK_PERM_ALL ); + s->source = bs; + s->mirror_top_bs = mirror_top_bs; + +/* No resize for the target either; while the mirror is still running, a +* consistent read isn't necessarily possible. We could possibly allow +* writes and graph modifications, though it would likely defeat the +* purpose of a mirror, so leave them blocked for now. +* +* In the case of active commit, things look a bit different, though, +* because the target is an already populated backing file in active use. +* We can allow anything except resize there.*/ + target_is_backing =bdrv_chain_contains (bs, target); + target_graph_mod = (backing_mode !=MIRROR_LEAVE_BACKING_CHAIN ); + s->target =blk_new (BLK_PERM_WRITE |BLK_PERM_RESIZE | + (target_graph_mod ?BLK_PERM_GRAPH_MOD :0 ), +BLK_PERM_WRITE_UNCHANGED | + (target_is_backing ?BLK_PERM_CONSISTENT_READ | +BLK_PERM_WRITE | +BLK_PERM_GRAPH_MOD :0 )); ret =blk_insert_bs (s->target, target, errp);if (ret <0 ) { -blk_unref (s->target); -block_job_unref (&s->common); -return ; + goto fail; } s->replaces =g_strdup (replaces);
@@ -1052,23 +1179,40 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,return ; } -/* FIXME Use real permissions */ +/* Required permissions are already taken with blk_new() */ block_job_add_bdrv (&s->common,"target" , target,0 ,BLK_PERM_ALL , &error_abort);/* In commit_active_start() all intermediate nodes disappear, so * any jobs in them must be blocked */ -if (bdrv_chain_contains (bs, target)) { +if (target_is_backing) {BlockDriverState *iter;for (iter =backing_bs (bs); iter != target; iter =backing_bs (iter)) { -/* FIXME Use real permissions */ -block_job_add_bdrv (&s->common,"intermediate node" , iter,0 , -BLK_PERM_ALL , &error_abort); +/* XXX BLK_PERM_WRITE needs to be allowed so we don't block +* ourselves at s->base (if writes are blocked for a node, they are +* also blocked for its backing file). The other options would be a +* second filter driver above s->base (== target). */ + ret =block_job_add_bdrv (&s->common,"intermediate node" , iter,0 , +BLK_PERM_WRITE_UNCHANGED |BLK_PERM_WRITE , + errp); +if (ret <0 ) { + goto fail; + } } }trace_mirror_start (bs, s, opaque);block_job_start (&s->common); +return ; + +fail: +if (s) { +g_free (s->replaces); +blk_unref (s->target); +block_job_unref (&s->common); + } + +bdrv_replace_in_backing_chain (mirror_top_bs,backing_bs (mirror_top_bs)); } void mirror_start(const char *job_id, BlockDriverState *bs,
qemu-img.c +5 -1
@@ -809,6 +809,8 @@ static void run_block_job(BlockJob *job, Error **errp) {AioContext *aio_context =blk_get_aio_context (job->blk); +/* FIXME In error cases, the job simply goes away and we access a dangling +* pointer below. */ aio_context_acquire (aio_context); do { aio_poll(aio_context, true);
@@ -830,6 +832,7 @@ static int img_commit(int argc, char **argv)const char *filename, *fmt, *cache, *base;BlockBackend *blk;BlockDriverState *bs, *base_bs; +BlockJob *job;bool progress = false, quiet = false, drop = false;bool writethrough;Error *local_err =NULL ;
@@ -965,7 +968,8 @@ static int img_commit(int argc, char **argv)bdrv_ref (bs); } -run_block_job (bs->job, &local_err); + job =block_job_get ("commit" ); +run_block_job (job, &local_err);if (local_err) { goto unref_backing; }
tests/qemu-iotests/141 +1 -1
@@ -67,7 +67,7 @@ test_blockjob() _send_qemu_cmd $QEMU_HANDLE \ "{'execute': 'x-blockdev-del', 'arguments': {'node-name': 'drv0'}}" \ - 'error' + 'error' | _filter_generated_node_ids _send_qemu_cmd $QEMU_HANDLE \ "{'execute': 'block-job-cancel',
tests/qemu-iotests/141.out +2 -2
@@ -20,7 +20,7 @@ Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t. Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "mirror"}} {"return": {}} -{"error": {"class": "GenericError", "desc": "Node drv0 is in use"}} +{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: node is used as backing hd of 'NODE_NAME'"}} {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "mirror"}} {"return": {}}
@@ -30,7 +30,7 @@ Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t. {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}} {"return": {}} -{"error": {"class": "GenericError", "desc": "Node drv0 is in use"}} +{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: node is used as backing hd of 'NODE_NAME'"}} {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}} {"return": {}}
Signature · 1 line
1.8.3.1
PATCH v2 32/43 stream: Use real permissions in streaming block job
In reply to Kevin WolfThe correct permissions are relatively obvious here (and explained in code comments). For intermediate streaming, we need to reopen the top node read-write before creating the job now because the permissions system catches attempts to get the BLK_PERM_WRITE_UNCHANGED permission on a read-only node.
--- block/stream.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-)
block/stream.c +25 -12
@@ -229,28 +229,35 @@ void stream_start(const char *job_id, BlockDriverState *bs,BlockDriverState *iter;int orig_bs_flags; -/* FIXME Use real permissions */ - s =block_job_create (job_id, &stream_job_driver, bs,0 ,BLK_PERM_ALL , - speed,BLOCK_JOB_DEFAULT ,NULL ,NULL , errp); -if (!s) { -return ; - } -/* Make sure that the image is opened in read-write mode */ orig_bs_flags =bdrv_get_flags (bs);if (!(orig_bs_flags &BDRV_O_RDWR )) {if (bdrv_reopen (bs, orig_bs_flags |BDRV_O_RDWR , errp) !=0 ) { -block_job_unref (&s->common);return ; } } -/* Block all intermediate nodes between bs and base, because they -* will disappear from the chain after this operation */ +/* Prevent concurrent jobs trying to modify the graph structure here, we +* already have our own plans. Also don't allow resize as the image size is +* queried only at the job start and then cached. */ + s =block_job_create (job_id, &stream_job_driver, bs, +BLK_PERM_CONSISTENT_READ |BLK_PERM_WRITE_UNCHANGED | +BLK_PERM_GRAPH_MOD , +BLK_PERM_CONSISTENT_READ |BLK_PERM_WRITE_UNCHANGED | +BLK_PERM_WRITE , + speed,BLOCK_JOB_DEFAULT ,NULL ,NULL , errp); +if (!s) { + goto fail; + } + +/* Block all intermediate nodes between bs and base, because they will +* disappear from the chain after this operation. The streaming job reads +* every block only once, assuming that it doesn't change, so block writes +* and resizes. */ for (iter =backing_bs (bs); iter && iter != base; iter =backing_bs (iter)) { -/* FIXME Use real permissions */ block_job_add_bdrv (&s->common,"intermediate node" , iter,0 , -BLK_PERM_ALL , &error_abort); +BLK_PERM_CONSISTENT_READ |BLK_PERM_WRITE_UNCHANGED , + &error_abort); } s->base = base;
@@ -260,4 +267,10 @@ void stream_start(const char *job_id, BlockDriverState *bs, s->on_error = on_error;trace_stream_start (bs, base, s);block_job_start (&s->common); +return ; + +fail: +if (orig_bs_flags !=bdrv_get_flags (bs)) { +bdrv_reopen (bs, s->bs_flags,NULL ); + } }
Signature · 1 line
1.8.3.1
PATCH v2 33/43 mirror: Add filter-node-name to blockdev-mirror
In reply to Kevin WolfManagement tools need to be able to know about every node in the graph and need a way to address them. Changing the graph structure was okay because libvirt doesn't really manage the node level yet, but future libvirt versions need to deal with both new and old version of qemu.
This new option to blockdev-mirror allows the client to set a node-name for the automatically inserted filter driver, and at the same time serves as a witness for a future libvirt that this version of qemu does automatically insert a filter driver.
--- block/mirror.c | 14 ++++++++------ blockdev.c | 12 +++++++++++- include/block/block_int.h | 5 ++++- qapi/block-core.json | 8 +++++++- 4 files changed, 30 insertions(+), 9 deletions(-)
block/mirror.c +8 -6
@@ -1084,7 +1084,7 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, void *opaque, Error **errp, const BlockJobDriver *driver, bool is_none_mode, BlockDriverState *base, - bool auto_complete) + bool auto_complete, const char *filter_node_name) { MirrorBlockJob *s;BlockDriverState *mirror_top_bs;
@@ -1110,8 +1110,8 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,/* In the case of active commit, add dummy driver to provide consistent * reads on the top, while disabling it in the intermediate nodes, and make * the backing chain writable. */ - mirror_top_bs =bdrv_new_open_driver (&bdrv_mirror_top,NULL ,BDRV_O_RDWR , - errp); + mirror_top_bs =bdrv_new_open_driver (&bdrv_mirror_top, filter_node_name, +BDRV_O_RDWR , errp);if (mirror_top_bs ==NULL ) {return ; }
@@ -1221,7 +1221,7 @@ void mirror_start(const char *job_id, BlockDriverState *bs, MirrorSyncMode mode, BlockMirrorBackingMode backing_mode, BlockdevOnError on_source_error, BlockdevOnError on_target_error, - bool unmap, Error **errp) + bool unmap, const char *filter_node_name, Error **errp) { bool is_none_mode;BlockDriverState *base;
@@ -1235,7 +1235,8 @@ void mirror_start(const char *job_id, BlockDriverState *bs,mirror_start_job (job_id, bs,BLOCK_JOB_DEFAULT , target, replaces, speed, granularity, buf_size, backing_mode, on_source_error, on_target_error, unmap,NULL ,NULL , errp, - &mirror_job_driver, is_none_mode, base, false); + &mirror_job_driver, is_none_mode, base, false, + filter_node_name); } void commit_active_start(const char *job_id, BlockDriverState *bs,
@@ -1256,7 +1257,8 @@ void commit_active_start(const char *job_id, BlockDriverState *bs,mirror_start_job (job_id, bs, creation_flags, base,NULL , speed,0 ,0 ,MIRROR_LEAVE_BACKING_CHAIN , on_error, on_error, true, cb, opaque, &local_err, - &commit_active_job_driver, false, base, auto_complete); + &commit_active_job_driver, false, base, auto_complete, +NULL );if (local_err) {error_propagate (errp, local_err); goto error_restore_flags;
blockdev.c +11 -1
@@ -3365,6 +3365,8 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,bool has_on_target_error, BlockdevOnError on_target_error, bool has_unmap, bool unmap, + bool has_filter_node_name, + const char *filter_node_name, Error **errp) {
@@ -3386,6 +3388,9 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,if (!has_unmap) { unmap = true; } +if (!has_filter_node_name) { + filter_node_name =NULL ; + }if (granularity !=0 && (granularity <512 || granularity >1048576 *64 )) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "granularity",
@@ -3415,7 +3420,8 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,mirror_start (job_id, bs, target, has_replaces ? replaces :NULL , speed, granularity, buf_size, sync, backing_mode, - on_source_error, on_target_error, unmap, errp); + on_source_error, on_target_error, unmap, filter_node_name, + errp); }void qmp_drive_mirror (DriveMirror *arg,Error **errp)
@@ -3553,6 +3559,7 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp) arg->has_on_source_error, arg->on_source_error, arg->has_on_target_error, arg->on_target_error, arg->has_unmap, arg->unmap, + false,NULL , &local_err);bdrv_unref (target_bs);error_propagate (errp, local_err);
@@ -3571,6 +3578,8 @@ void qmp_blockdev_mirror(bool has_job_id, const char *job_id,BlockdevOnError on_source_error, bool has_on_target_error, BlockdevOnError on_target_error, + bool has_filter_node_name, + const char *filter_node_name, Error **errp) { BlockDriverState *bs;
@@ -3602,6 +3611,7 @@ void qmp_blockdev_mirror(bool has_job_id, const char *job_id, has_on_source_error, on_source_error, has_on_target_error, on_target_error, true, true, + has_filter_node_name, filter_node_name, &local_err);error_propagate (errp, local_err);
include/block/block_int.h +4 -1
@@ -824,6 +824,9 @@ void commit_active_start(const char *job_id, BlockDriverState *bs,* @on_source_error: The action to take upon error reading from the source. * @on_target_error: The action to take upon error writing to the target. * @unmap: Whether to unmap target where source sectors only contain zeroes. +* @filter_node_name: The node name that should be assigned to the filter +* driver that the mirror job inserts into the graph above @bs. NULL means that +* a node name should be autogenerated. * @errp: Error object. * * Start a mirroring operation on @bs. Clusters that are allocated
@@ -837,7 +840,7 @@ void mirror_start(const char *job_id, BlockDriverState *bs, MirrorSyncMode mode, BlockMirrorBackingMode backing_mode, BlockdevOnError on_source_error, BlockdevOnError on_target_error, - bool unmap, Error **errp); + bool unmap, const char *filter_node_name, Error **errp);/* * backup_job_create:
qapi/block-core.json +7 -1
@@ -1671,6 +1671,11 @@ # default 'report' (no limitations, since this applies to # a different block device than @device). # +# @filter-node-name: #optional the node name that should be assigned to the +# filter driver that the mirror job inserts into the graph +# above @device. If this option is not given, a node name is +# autogenerated. (Since: 2.9) +# # Returns: nothing on success. # # Since: 2.6
@@ -1690,7 +1695,8 @@ 'sync': 'MirrorSyncMode', '*speed': 'int', '*granularity': 'uint32', '*buf-size': 'int', '*on-source-error': 'BlockdevOnError', - '*on-target-error': 'BlockdevOnError' } } + '*on-target-error': 'BlockdevOnError', + '*filter-node-name': 'str' } } ## # @block_set_io_throttle:
Signature · 1 line
1.8.3.1
PATCH v2 34/43 commit: Add filter-node-name to block-commit
In reply to Kevin WolfManagement tools need to be able to know about every node in the graph and need a way to address them. Changing the graph structure was okay because libvirt doesn't really manage the node level yet, but future libvirt versions need to deal with both new and old version of qemu.
This new option to blockdev-commit allows the client to set a node-name for the automatically inserted filter driver, and at the same time serves as a witness for a future libvirt that this version of qemu does automatically insert a filter driver.
--- block/commit.c | 5 +++-- block/mirror.c | 3 ++- block/replication.c | 2 +- blockdev.c | 10 +++++++--- include/block/block_int.h | 13 ++++++++++--- qapi/block-core.json | 8 +++++++- qemu-img.c | 4 ++-- 7 files changed, 32 insertions(+), 13 deletions(-)
block/commit.c +3 -2
@@ -257,7 +257,7 @@ static BlockDriver bdrv_commit_top = {void commit_start (const char *job_id,BlockDriverState *bs,BlockDriverState *base,BlockDriverState *top,int64_t speed,BlockdevOnError on_error,const char *backing_file_str, -Error **errp) +const char *filter_node_name,Error **errp) {CommitBlockJob *s;BlockReopenQueue *reopen_queue =NULL ;
@@ -310,7 +310,8 @@ void commit_start(const char *job_id, BlockDriverState *bs,/* Insert commit_top block node above top, so we can block consistent read * on the backing chain below it */ - commit_top_bs =bdrv_new_open_driver (&bdrv_commit_top,NULL ,0 , errp); + commit_top_bs =bdrv_new_open_driver (&bdrv_commit_top, filter_node_name,0 , + errp);if (commit_top_bs ==NULL ) { goto fail; }
block/mirror.c +2 -1
@@ -1242,6 +1242,7 @@ void mirror_start(const char *job_id, BlockDriverState *bs,void commit_active_start (const char *job_id,BlockDriverState *bs,BlockDriverState *base,int creation_flags,int64_t speed,BlockdevOnError on_error, +const char *filter_node_name,BlockCompletionFunc *cb,void *opaque,Error **errp,bool auto_complete) {
@@ -1258,7 +1259,7 @@ void commit_active_start(const char *job_id, BlockDriverState *bs,MIRROR_LEAVE_BACKING_CHAIN , on_error, on_error, true, cb, opaque, &local_err, &commit_active_job_driver, false, base, auto_complete, - NULL); + filter_node_name);if (local_err) {error_propagate (errp, local_err); goto error_restore_flags;
block/replication.c +1 -1
@@ -644,7 +644,7 @@ static void replication_stop(ReplicationState *rs, bool failover, Error **errp) s->replication_state =BLOCK_REPLICATION_FAILOVER ;commit_active_start (NULL , s->active_disk->bs, s->secondary_disk->bs,BLOCK_JOB_INTERNAL ,0 ,BLOCKDEV_ON_ERROR_REPORT , - replication_done, bs, errp, true); +NULL , replication_done, bs, errp, true);break ;default :aio_context_release (aio_context);
blockdev.c +7 -3
@@ -3031,6 +3031,7 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device, bool has_top, const char *top, bool has_backing_file, const char *backing_file, bool has_speed, int64_t speed, + bool has_filter_node_name, const char *filter_node_name, Error **errp) { BlockDriverState *bs;
@@ -3046,6 +3047,9 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device,if (!has_speed) { speed =0 ; } +if (!has_filter_node_name) { + filter_node_name =NULL ; + }/* Important Note: * libvirt relies on the DeviceNotFound error class in order to probe for
@@ -3120,8 +3124,8 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device, goto out; }commit_active_start (has_job_id ? job_id :NULL , bs, base_bs, -BLOCK_JOB_DEFAULT , speed, on_error,NULL ,NULL , - &local_err, false); +BLOCK_JOB_DEFAULT , speed, on_error, + filter_node_name,NULL ,NULL , &local_err, false); }else {BlockDriverState *overlay_bs =bdrv_find_overlay (bs, top_bs);if (bdrv_op_is_blocked (overlay_bs,BLOCK_OP_TYPE_COMMIT_TARGET , errp)) {
@@ -3129,7 +3133,7 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device, }commit_start (has_job_id ? job_id :NULL , bs, base_bs, top_bs, speed, on_error, has_backing_file ? backing_file :NULL , - &local_err); + filter_node_name, &local_err); }if (local_err !=NULL ) {error_propagate (errp, local_err);
include/block/block_int.h +10 -3
@@ -780,13 +780,16 @@ void stream_start(const char *job_id, BlockDriverState *bs,* @speed: The maximum speed, in bytes per second, or 0 for unlimited. * @on_error: The action to take upon error. * @backing_file_str: String to use as the backing file in @top's overlay +* @filter_node_name: The node name that should be assigned to the filter +* driver that the commit job inserts into the graph above @top. NULL means +* that a node name should be autogenerated. * @errp: Error object. * */ void commit_start (const char *job_id,BlockDriverState *bs,BlockDriverState *base,BlockDriverState *top,int64_t speed,BlockdevOnError on_error,const char *backing_file_str, -Error **errp); +const char *filter_node_name,Error **errp);/** * commit_active_start: * @job_id: The id of the newly-created job, or %NULL to use the
@@ -797,6 +800,9 @@ void commit_start(const char *job_id, BlockDriverState *bs,* See @BlockJobCreateFlags * @speed: The maximum speed, in bytes per second, or 0 for unlimited. * @on_error: The action to take upon error. +* @filter_node_name: The node name that should be assigned to the filter +* driver that the commit job inserts into the graph above @bs. NULL means that +* a node name should be autogenerated. * @cb: Completion function for the job. * @opaque: Opaque pointer value passed to @cb. * @errp: Error object.
@@ -806,8 +812,9 @@ void commit_start(const char *job_id, BlockDriverState *bs,void commit_active_start (const char *job_id,BlockDriverState *bs,BlockDriverState *base,int creation_flags,int64_t speed,BlockdevOnError on_error, -BlockCompletionFunc *cb, -void *opaque,Error **errp,bool auto_complete); +const char *filter_node_name, +BlockCompletionFunc *cb,void *opaque,Error **errp, +bool auto_complete);/* * mirror_start: * @job_id: The id of the newly-created job, or %NULL to use the
qapi/block-core.json +7 -1
@@ -1304,6 +1304,11 @@ # # @speed: #optional the maximum speed, in bytes per second # +# @filter-node-name: #optional the node name that should be assigned to the +# filter driver that the commit job inserts into the graph +# above @top. If this option is not given, a node name is +# autogenerated. (Since: 2.9) +# # Returns: Nothing on success # If commit or stream is already active on this device, DeviceInUse # If @device does not exist, DeviceNotFound
@@ -1323,7 +1328,8 @@ ## { 'command': 'block-commit', 'data': { '*job-id': 'str', 'device': 'str', '*base': 'str', '*top': 'str', - '*backing-file': 'str', '*speed': 'int' } } + '*backing-file': 'str', '*speed': 'int', + '*filter-node-name': 'str' } } ## # @drive-backup:
qemu-img.c +2 -2
@@ -953,8 +953,8 @@ static int img_commit(int argc, char **argv) aio_context =bdrv_get_aio_context (bs);aio_context_acquire (aio_context);commit_active_start ("commit" , bs, base_bs,BLOCK_JOB_DEFAULT ,0 , -BLOCKDEV_ON_ERROR_REPORT , common_block_job_cb, &cbi, - &local_err, false); +BLOCKDEV_ON_ERROR_REPORT ,NULL , common_block_job_cb, + &cbi, &local_err, false);aio_context_release (aio_context);if (local_err) { goto done;
Signature · 1 line
1.8.3.1
PATCH v2 35/43 hmp: Request permissions in qemu-io
In reply to Kevin WolfThe HMP command 'qemu-io' is a bit tricky because it wants to work on the original BlockBackend, but additional permissions could be required. The details are explained in a comment in the code, but in summary, just request whatever permissions the current qemu-io command needs.
--- block/block-backend.c | 6 ++++++ hmp.c | 26 +++++++++++++++++++++++++- include/qemu-io.h | 1 + include/sysemu/block-backend.h | 1 + qemu-io-cmds.c | 28 ++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+), 1 deletion(-)
block/block-backend.c +6 -0
@@ -584,6 +584,12 @@ int blk_set_perm(BlockBackend *blk, uint64_t perm, uint64_t shared_perm,return 0 ; } +void blk_get_perm (BlockBackend *blk,uint64_t *perm,uint64_t *shared_perm) +{ + *perm = blk->perm; + *shared_perm = blk->shared_perm; +} +static int blk_do_attach_dev (BlockBackend *blk,void *dev) {if (blk->dev) {
hmp.c +25 -1
@@ -2051,7 +2051,6 @@ void hmp_qemu_io(Monitor *mon, const QDict *qdict)if (!blk) {BlockDriverState *bs =bdrv_lookup_bs (NULL , device, &err);if (bs) { -/* FIXME Use real permissions */ blk = local_blk =blk_new (0 ,BLK_PERM_ALL ); ret =blk_insert_bs (blk, bs, &err);if (ret <0 ) {
@@ -2065,6 +2064,31 @@ void hmp_qemu_io(Monitor *mon, const QDict *qdict) aio_context =blk_get_aio_context (blk);aio_context_acquire (aio_context); +/* +* Notably absent: Proper permission management. This is sad, but it seems +* almost impossible to achieve without changing the semantics and thereby +* limiting the use cases of the qemu-io HMP command. +* +* In an ideal world we would unconditionally create a new BlockBackend for +* qemuio_command(), but we have commands like 'reopen' and want them to +* take effect on the exact BlockBackend whose name the user passed instead +* of just on a temporary copy of it. +* +* Another problem is that deleting the temporary BlockBackend involves +* draining all requests on it first, but some qemu-iotests cases want to +* issue multiple aio_read/write requests and expect them to complete in +* the background while the monitor has already returned. +* +* This is also what prevents us from saving the original permissions and +* restoring them later: We can't revoke permissions until all requests +* have completed, and we don't know when that is nor can we really let +* anything else run before we have revoken them to avoid race conditions. +* +* What happens now is that command() in qemu-io-cmds.c can extend the +* permissions if necessary for the qemu-io command. And they simply stay +* extended, possibly resulting in a read-only guest device keeping write +* permissions. Ugly, but it appears to be the lesser evil. +*/ qemuio_command (blk, command);aio_context_release (aio_context);
include/qemu-io.h +1 -0
@@ -36,6 +36,7 @@ typedef struct cmdinfo {const char *args;const char *oneline;helpfunc_t help; +uint64_t perm; } cmdinfo_t;extern bool qemuio_misalign;
include/sysemu/block-backend.h +1 -0
@@ -107,6 +107,7 @@ bool bdrv_has_blk(BlockDriverState *bs);bool bdrv_is_root_node (BlockDriverState *bs);int blk_set_perm (BlockBackend *blk,uint64_t perm,uint64_t shared_perm,Error **errp); +void blk_get_perm (BlockBackend *blk,uint64_t *perm,uint64_t *shared_perm);void blk_set_allow_write_beyond_eof (BlockBackend *blk,bool allow);void blk_iostatus_enable (BlockBackend *blk);
qemu-io-cmds.c +28 -0
@@ -83,6 +83,29 @@ static int command(BlockBackend *blk, const cmdinfo_t *ct, int argc, }return 0 ; } + +/* Request additional permissions if necessary for this command. The caller +* is responsible for restoring the original permissions afterwards if this +* is what it wants. */ +if (ct->perm &&blk_is_available (blk)) { +uint64_t orig_perm, orig_shared_perm; +blk_get_perm (blk, &orig_perm, &orig_shared_perm); + +if (ct->perm & ~orig_perm) { +uint64_t new_perm; +Error *local_err =NULL ; +int ret; + + new_perm = orig_perm | ct->perm; + + ret =blk_set_perm (blk, new_perm, orig_shared_perm, &local_err); +if (ret <0 ) { +error_report_err (local_err); +return 0 ; + } + } + } + optind =0 ;return ct->cfunc (blk, argc, argv); }
@@ -918,6 +941,7 @@ static const cmdinfo_t write_cmd = { .name = "write", .altname = "w", .cfunc = write_f, + .perm = BLK_PERM_WRITE, .argmin = 2, .argmax = -1, .args = "[-bcCfquz] [-P pattern] off len",
@@ -1093,6 +1117,7 @@ static int writev_f(BlockBackend *blk, int argc, char **argv);static const cmdinfo_t writev_cmd = { .name ="writev" , .cfunc = writev_f, + .perm =BLK_PERM_WRITE , .argmin =2 , .argmax =-1 , .args ="[-Cfq] [-P pattern] off len [len..]" ,
@@ -1392,6 +1417,7 @@ static int aio_write_f(BlockBackend *blk, int argc, char **argv);static const cmdinfo_t aio_write_cmd = { .name ="aio_write" , .cfunc = aio_write_f, + .perm =BLK_PERM_WRITE , .argmin =2 , .argmax =-1 , .args ="[-Cfiquz] [-P pattern] off len [len..]" ,
@@ -1556,6 +1582,7 @@ static const cmdinfo_t truncate_cmd = { .name = "truncate", .altname = "t", .cfunc = truncate_f, + .perm = BLK_PERM_WRITE | BLK_PERM_RESIZE, .argmin = 1, .argmax = 1, .args = "off",
@@ -1653,6 +1680,7 @@ static const cmdinfo_t discard_cmd = { .name = "discard", .altname = "d", .cfunc = discard_f, + .perm = BLK_PERM_WRITE, .argmin = 2, .argmax = -1, .args = "[-Cq] off len",
Signature · 1 line
1.8.3.1
PATCH v2 36/43 migration/block: Use real permissions
In reply to Kevin WolfRequest BLK_PERM_CONSISTENT_READ for the source of block migration, and handle potential permission errors as good as we can in this place (which is not very good, but it matches the other failure cases).
--- migration/block.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
migration/block.c +17 -5
@@ -379,7 +379,7 @@ static void unset_dirty_tracking(void) } } -static void init_blk_migration (QEMUFile *f) +static int init_blk_migration (QEMUFile *f) {BlockDriverState *bs;BlkMigDevState *bmds;
@@ -390,6 +390,8 @@ static void init_blk_migration(QEMUFile *f)BlkMigDevState *bmds;BlockDriverState *bs; } *bmds_bs; +Error *local_err =NULL ; +int ret; block_mig_state.submitted =0 ; block_mig_state.read_done =0 ;
@@ -411,12 +413,12 @@ static void init_blk_migration(QEMUFile *f) sectors =bdrv_nb_sectors (bs);if (sectors <=0 ) { + ret = sectors; goto out; } bmds =g_new0 (BlkMigDevState,1 ); -/* FIXME Use real permissions */ - bmds->blk =blk_new (0 ,BLK_PERM_ALL ); + bmds->blk =blk_new (BLK_PERM_CONSISTENT_READ ,BLK_PERM_ALL ); bmds->blk_name =g_strdup (bdrv_get_device_name (bs)); bmds->bulk_completed =0 ; bmds->total_sectors = sectors;
@@ -446,7 +448,11 @@ static void init_blk_migration(QEMUFile *f)BlockDriverState *bs = bmds_bs[i].bs;if (bmds) { -blk_insert_bs (bmds->blk, bs, &error_abort); + ret =blk_insert_bs (bmds->blk, bs, &local_err); +if (ret <0 ) { +error_report_err (local_err); + goto out; + }alloc_aio_bitmap (bmds);error_setg (&bmds->blocker,"block device is in use by migration" );
@@ -454,8 +460,10 @@ static void init_blk_migration(QEMUFile *f) } } + ret =0 ; out:g_free (bmds_bs); +return ret; }/* Called with no lock taken. */
@@ -706,7 +714,11 @@ static int block_save_setup(QEMUFile *f, void *opaque) block_mig_state.submitted, block_mig_state.transferred);qemu_mutex_lock_iothread (); -init_blk_migration (f); + ret =init_blk_migration (f); +if (ret <0 ) { +qemu_mutex_unlock_iothread (); +return ret; + }/* start track dirty blocks */ ret =set_dirty_tracking ();
Signature · 1 line
1.8.3.1
PATCH v2 37/43 nbd/server: Use real permissions for NBD exports
In reply to Kevin WolfNBD can't cope with device size changes, so resize must be forbidden, but otherwise we can tolerate anything. Depending on whether the export is writable or not, we only require consistent reads and writes.
--- nbd/server.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
nbd/server.c +9 -2
@@ -891,10 +891,17 @@ NBDExport *nbd_export_new(BlockDriverState *bs, off_t dev_offset, off_t size, {BlockBackend *blk;NBDExport *exp =g_malloc0 (sizeof (NBDExport)); +uint64_t perm;int ret; -/* FIXME Use real permissions */ - blk =blk_new (0 ,BLK_PERM_ALL ); +/* Don't allow resize while the NBD server is running, otherwise we don't +* care what happens with the node. */ + perm =BLK_PERM_CONSISTENT_READ ; +if ((nbdflags &NBD_FLAG_READ_ONLY ) ==0 ) { + perm |=BLK_PERM_WRITE ; + } + blk =blk_new (perm,BLK_PERM_CONSISTENT_READ |BLK_PERM_WRITE_UNCHANGED | +BLK_PERM_WRITE |BLK_PERM_GRAPH_MOD ); ret =blk_insert_bs (blk, bs, errp);if (ret <0 ) { goto fail;
Signature · 1 line
1.8.3.1
PATCH v2 38/43 tests: Remove FIXME comments
In reply to Kevin WolfNot requesting any permissions is actually correct for these test cases because no actual I/O or other operation covered by the permission system is performed.
--- tests/test-blockjob.c | 2 +- tests/test-throttle.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tests/test-blockjob.c +1 -1
@@ -54,7 +54,7 @@ static BlockJob *do_test_id(BlockBackend *blk, const char *id,* BlockDriverState inserted. */ static BlockBackend *create_blk (const char *name) { -/* FIXME Use real permissions */ +/* No I/O is performed on this device */ BlockBackend *blk =blk_new (0 ,BLK_PERM_ALL );BlockDriverState *bs;
tests/test-throttle.c +1 -1
@@ -593,7 +593,7 @@ static void test_groups(void)BlockBackend *blk1, *blk2, *blk3;BlockBackendPublic *blkp1, *blkp2, *blkp3; -/* FIXME Use real permissions */ +/* No actual I/O is performed on these devices */ blk1 =blk_new (0 ,BLK_PERM_ALL ); blk2 =blk_new (0 ,BLK_PERM_ALL ); blk3 =blk_new (0 ,BLK_PERM_ALL );
Signature · 1 line
1.8.3.1
PATCH v2 39/43 block: Pass BdrvChild to bdrv_aligned_preadv/pwritev and copy-on-read
In reply to Kevin WolfThis is where we want to check the permissions, so we need to have the BdrvChild around where they are stored.
--- block/io.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)
block/io.c +21 -16
@@ -925,9 +925,11 @@ bdrv_driver_pwritev_compressed(BlockDriverState *bs, uint64_t offset,return drv->bdrv_co_pwritev_compressed (bs, offset, bytes, qiov); } -static int coroutine_fn bdrv_co_do_copy_on_readv(BlockDriverState *bs, +static int coroutine_fn bdrv_co_do_copy_on_readv(BdrvChild *child,int64_t offset,unsigned int bytes,QEMUIOVector *qiov) { +BlockDriverState *bs = child->bs; +/* Perform I/O through a temporary buffer so that users who scribble over * their read buffer while the operation is in progress do not end up * modifying the image file. This is critical for zero-copy guest I/O
@@ -1001,10 +1003,11 @@ err:* handles copy on read, zeroing after EOF, and fragmentation of large * reads; any other features must be implemented by the caller. */ -static int coroutine_fn bdrv_aligned_preadv(BlockDriverState *bs, +static int coroutine_fn bdrv_aligned_preadv(BdrvChild *child,BdrvTrackedRequest *req,int64_t offset,unsigned int bytes,int64_t align,QEMUIOVector *qiov,int flags) { +BlockDriverState *bs = child->bs;int64_t total_bytes, max_bytes;int ret =0 ;uint64_t bytes_remaining = bytes;
@@ -1050,7 +1053,7 @@ static int coroutine_fn bdrv_aligned_preadv(BlockDriverState *bs, }if (!ret || pnum != nb_sectors) { - ret =bdrv_co_do_copy_on_readv (bs, offset, bytes, qiov); + ret =bdrv_co_do_copy_on_readv (child, offset, bytes, qiov); goto out; } }
@@ -1158,7 +1161,7 @@ int coroutine_fn bdrv_co_preadv(BdrvChild *child, }tracked_request_begin (&req, bs, offset, bytes,BDRV_TRACKED_READ ); - ret =bdrv_aligned_preadv (bs, &req, offset, bytes, align, + ret =bdrv_aligned_preadv (child, &req, offset, bytes, align, use_local_qiov ? &local_qiov : qiov, flags);tracked_request_end (&req);
@@ -1306,10 +1309,11 @@ fail:* Forwards an already correctly aligned write request to the BlockDriver, * after possibly fragmenting it. */ -static int coroutine_fn bdrv_aligned_pwritev(BlockDriverState *bs, +static int coroutine_fn bdrv_aligned_pwritev(BdrvChild *child,BdrvTrackedRequest *req,int64_t offset,unsigned int bytes,int64_t align,QEMUIOVector *qiov,int flags) { +BlockDriverState *bs = child->bs;BlockDriver *drv = bs->drv;bool waited;int ret;
@@ -1397,12 +1401,13 @@ static int coroutine_fn bdrv_aligned_pwritev(BlockDriverState *bs,return ret; } -static int coroutine_fn bdrv_co_do_zero_pwritev(BlockDriverState *bs, +static int coroutine_fn bdrv_co_do_zero_pwritev(BdrvChild *child,int64_t offset,unsigned int bytes,BdrvRequestFlags flags,BdrvTrackedRequest *req) { +BlockDriverState *bs = child->bs;uint8_t *buf =NULL ;QEMUIOVector local_qiov;struct iovec iov;
@@ -1430,7 +1435,7 @@ static int coroutine_fn bdrv_co_do_zero_pwritev(BlockDriverState *bs,mark_request_serialising (req, align);wait_serialising_requests (req);bdrv_debug_event (bs,BLKDBG_PWRITEV_RMW_HEAD ); - ret =bdrv_aligned_preadv (bs, req, offset & ~(align -1 ), align, + ret =bdrv_aligned_preadv (child, req, offset & ~(align -1 ), align, align, &local_qiov,0 );if (ret <0 ) { goto fail;
@@ -1438,7 +1443,7 @@ static int coroutine_fn bdrv_co_do_zero_pwritev(BlockDriverState *bs,bdrv_debug_event (bs,BLKDBG_PWRITEV_RMW_AFTER_HEAD );memset (buf + head_padding_bytes,0 , zero_bytes); - ret =bdrv_aligned_pwritev (bs, req, offset & ~(align -1 ), align, + ret =bdrv_aligned_pwritev (child, req, offset & ~(align -1 ), align, align, &local_qiov, flags & ~BDRV_REQ_ZERO_WRITE );if (ret <0 ) {
@@ -1452,7 +1457,7 @@ static int coroutine_fn bdrv_co_do_zero_pwritev(BlockDriverState *bs,if (bytes >= align) {/* Write the aligned part in the middle. */ uint64_t aligned_bytes = bytes & ~(align -1 ); - ret =bdrv_aligned_pwritev (bs, req, offset, aligned_bytes, align, + ret =bdrv_aligned_pwritev (child, req, offset, aligned_bytes, align,NULL , flags);if (ret <0 ) { goto fail;
@@ -1468,7 +1473,7 @@ static int coroutine_fn bdrv_co_do_zero_pwritev(BlockDriverState *bs,mark_request_serialising (req, align);wait_serialising_requests (req);bdrv_debug_event (bs,BLKDBG_PWRITEV_RMW_TAIL ); - ret =bdrv_aligned_preadv (bs, req, offset, align, + ret =bdrv_aligned_preadv (child, req, offset, align, align, &local_qiov,0 );if (ret <0 ) { goto fail;
@@ -1476,7 +1481,7 @@ static int coroutine_fn bdrv_co_do_zero_pwritev(BlockDriverState *bs,bdrv_debug_event (bs,BLKDBG_PWRITEV_RMW_AFTER_TAIL );memset (buf,0 , bytes); - ret =bdrv_aligned_pwritev (bs, req, offset, align, align, + ret =bdrv_aligned_pwritev (child, req, offset, align, align, &local_qiov, flags & ~BDRV_REQ_ZERO_WRITE ); } fail:
@@ -1523,7 +1528,7 @@ int coroutine_fn bdrv_co_pwritev(BdrvChild *child,tracked_request_begin (&req, bs, offset, bytes,BDRV_TRACKED_WRITE );if (!qiov) { - ret =bdrv_co_do_zero_pwritev (bs, offset, bytes, flags, &req); + ret =bdrv_co_do_zero_pwritev (child, offset, bytes, flags, &req); goto out; }
@@ -1542,7 +1547,7 @@ int coroutine_fn bdrv_co_pwritev(BdrvChild *child,qemu_iovec_init_external (&head_qiov, &head_iov,1 );bdrv_debug_event (bs,BLKDBG_PWRITEV_RMW_HEAD ); - ret =bdrv_aligned_preadv (bs, &req, offset & ~(align -1 ), align, + ret =bdrv_aligned_preadv (child, &req, offset & ~(align -1 ), align, align, &head_qiov,0 );if (ret <0 ) { goto fail;
@@ -1584,8 +1589,8 @@ int coroutine_fn bdrv_co_pwritev(BdrvChild *child,qemu_iovec_init_external (&tail_qiov, &tail_iov,1 );bdrv_debug_event (bs,BLKDBG_PWRITEV_RMW_TAIL ); - ret =bdrv_aligned_preadv (bs, &req, (offset + bytes) & ~(align -1 ), align, - align, &tail_qiov,0 ); + ret =bdrv_aligned_preadv (child, &req, (offset + bytes) & ~(align -1 ), + align, align, &tail_qiov,0 );if (ret <0 ) { goto fail; }
@@ -1603,7 +1608,7 @@ int coroutine_fn bdrv_co_pwritev(BdrvChild *child, bytes =ROUND_UP (bytes, align); } - ret =bdrv_aligned_pwritev (bs, &req, offset, bytes, align, + ret =bdrv_aligned_pwritev (child, &req, offset, bytes, align, use_local_qiov ? &local_qiov : qiov, flags);
Signature · 1 line
1.8.3.1
PATCH v2 40/43 block: Assertions for write permissions
In reply to Kevin WolfThis adds assertions that ensure that the necessary write permissions have been granted before someone attempts to write to a node.
--- block/io.c | 3 +++ 1 file changed, 3 insertions(+)
block/io.c +3 -0
@@ -945,6 +945,8 @@ static int coroutine_fn bdrv_co_do_copy_on_readv(BdrvChild *child,size_t skip_bytes;int ret; +assert (child->perm & (BLK_PERM_WRITE_UNCHANGED |BLK_PERM_WRITE )); +/* Cover entire cluster so no additional backing file I/O is required when * allocating cluster in the image file. */
@@ -1336,6 +1338,7 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChild *child,assert (!waited || !req->serialising);assert (req->overlap_offset <= offset);assert (offset + bytes <= req->overlap_offset + req->overlap_bytes); +assert (child->perm &BLK_PERM_WRITE ); ret =notifier_with_return_list_notify (&bs->before_write_notifiers, req);
Signature · 1 line
1.8.3.1
PATCH v2 41/43 block: Assertions for resize permission
In reply to Kevin WolfThis adds an assertion that ensures that the necessary resize permission has been granted before bdrv_truncate() is called.
--- block.c | 3 +++ block/io.c | 1 + 2 files changed, 4 insertions(+)
block.c +3 -0
@@ -3110,6 +3110,9 @@ int bdrv_truncate(BdrvChild *child, int64_t offset)BlockDriverState *bs = child->bs;BlockDriver *drv = bs->drv;int ret; + +assert (child->perm &BLK_PERM_RESIZE ); +if (!drv)return -ENOMEDIUM ;if (!drv->bdrv_truncate)
block/io.c +1 -0
@@ -1339,6 +1339,7 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChild *child,assert (req->overlap_offset <= offset);assert (offset + bytes <= req->overlap_offset + req->overlap_bytes);assert (child->perm &BLK_PERM_WRITE ); +assert (end_sector <= bs->total_sectors || child->perm &BLK_PERM_RESIZE ); ret =notifier_with_return_list_notify (&bs->before_write_notifiers, req);
Signature · 1 line
1.8.3.1
PATCH v2 42/43 block: Add Error parameter to bdrv_set_backing_hd()
In reply to Kevin WolfNot all callers of bdrv_set_backing_hd() know for sure that attaching the backing file will be allowed by the permission system. Return the error from the function rather than aborting.
--- block.c | 30 +++++++++++++++++++++++------- block/commit.c | 14 +++++++------- block/mirror.c | 7 ++++++- block/stream.c | 9 ++++++++- block/vvfat.c | 2 +- include/block/block.h | 3 ++- 6 files changed, 47 insertions(+), 18 deletions(-)
block.c +23 -7
@@ -1873,7 +1873,8 @@ static void bdrv_parent_cb_resize(BlockDriverState *bs)* Sets the backing file link of a BDS. A new reference is created; callers * which don't need their own reference any more must call bdrv_unref(). */ -void bdrv_set_backing_hd (BlockDriverState *bs,BlockDriverState *backing_hd) +void bdrv_set_backing_hd (BlockDriverState *bs,BlockDriverState *backing_hd, +Error **errp) {if (backing_hd) {bdrv_ref (backing_hd);
@@ -1887,9 +1888,12 @@ void bdrv_set_backing_hd(BlockDriverState *bs, BlockDriverState *backing_hd) bs->backing =NULL ; goto out; } -/* FIXME Error handling */ + bs->backing =bdrv_attach_child (bs, backing_hd,"backing" , &child_backing, - &error_abort); + errp); +if (!bs->backing) { +bdrv_unref (backing_hd); + } out:bdrv_refresh_limits (bs,NULL );
@@ -1973,8 +1977,12 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *parent_options,/* Hook up the backing file link; drop our reference, bs owns the * backing_hd reference now */ -bdrv_set_backing_hd (bs, backing_hd); +bdrv_set_backing_hd (bs, backing_hd, &local_err);bdrv_unref (backing_hd); +if (local_err) { + ret = -EINVAL ; + goto free_exit; + }qdict_del (parent_options, bdref_key);
@@ -2808,7 +2816,7 @@ static void bdrv_close(BlockDriverState *bs) bs->drv->bdrv_close (bs); bs->drv =NULL ; -bdrv_set_backing_hd (bs,NULL ); +bdrv_set_backing_hd (bs,NULL , &error_abort);if (bs->file !=NULL ) {bdrv_unref_child (bs, bs->file);
@@ -2915,7 +2923,8 @@ void bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top)bdrv_ref (bs_top);change_parent_backing_link (bs_top, bs_new); -bdrv_set_backing_hd (bs_new, bs_top); +/* FIXME Error handling */ +bdrv_set_backing_hd (bs_new, bs_top, &error_abort);bdrv_unref (bs_top);/* bs_new is now referenced by its new parents, we don't need the
@@ -3063,6 +3072,7 @@ int bdrv_drop_intermediate(BlockDriverState *active, BlockDriverState *top, BlockDriverState *base, const char *backing_file_str) { BlockDriverState *new_top_bs = NULL; +Error *local_err =NULL ;int ret = -EIO ;if (!top->drv || !base->drv) {
@@ -3095,7 +3105,13 @@ int bdrv_drop_intermediate(BlockDriverState *active, BlockDriverState *top,if (ret) { goto exit; } -bdrv_set_backing_hd (new_top_bs, base); + +bdrv_set_backing_hd (new_top_bs, base, &local_err); +if (local_err) { + ret = -EPERM ; +error_report_err (local_err); + goto exit; + } ret =0 ; exit:
block/commit.c +7 -7
@@ -121,7 +121,7 @@ static void commit_complete(BlockJob *job, void *opaque)* filter driver from the backing chain. Do this as the final step so that * the 'consistent read' permission can be granted. */ if (remove_commit_top_bs) { -bdrv_set_backing_hd (overlay_bs, top); +bdrv_set_backing_hd (overlay_bs, top, &error_abort); } }
@@ -316,8 +316,8 @@ void commit_start(const char *job_id, BlockDriverState *bs, goto fail; } -bdrv_set_backing_hd (commit_top_bs, top); -bdrv_set_backing_hd (overlay_bs, commit_top_bs); +bdrv_set_backing_hd (commit_top_bs, top, &error_abort); +bdrv_set_backing_hd (overlay_bs, commit_top_bs, &error_abort); s->commit_top_bs = commit_top_bs;bdrv_unref (commit_top_bs);
@@ -390,7 +390,7 @@ fail:blk_unref (s->top); }if (commit_top_bs) { -bdrv_set_backing_hd (overlay_bs, top); +bdrv_set_backing_hd (overlay_bs, top, &error_abort); }block_job_unref (&s->common); }
@@ -451,8 +451,8 @@ int bdrv_commit(BlockDriverState *bs) goto ro_cleanup; } -bdrv_set_backing_hd (commit_top_bs, backing_file_bs); -bdrv_set_backing_hd (bs, commit_top_bs); +bdrv_set_backing_hd (commit_top_bs, backing_file_bs, &error_abort); +bdrv_set_backing_hd (bs, commit_top_bs, &error_abort); ret =blk_insert_bs (backing, backing_file_bs, &local_err);if (ret <0 ) {
@@ -532,7 +532,7 @@ ro_cleanup:blk_unref (backing);if (backing_file_bs) { -bdrv_set_backing_hd (bs, backing_file_bs); +bdrv_set_backing_hd (bs, backing_file_bs, &error_abort); }bdrv_unref (commit_top_bs);blk_unref (src);
block/mirror.c +6 -1
@@ -503,6 +503,7 @@ static void mirror_exit(BlockJob *job, void *opaque)BlockDriverState *src = s->source;BlockDriverState *target_bs =blk_bs (s->target);BlockDriverState *mirror_top_bs = s->mirror_top_bs; +Error *local_err =NULL ;/* Make sure that the source BDS doesn't go away before we called * block_job_completed(). */
@@ -515,7 +516,11 @@ static void mirror_exit(BlockJob *job, void *opaque)if (s->backing_mode ==MIRROR_SOURCE_BACKING_CHAIN ) {BlockDriverState *backing = s->is_none_mode ? src : s->base;if (backing_bs (target_bs) != backing) { -bdrv_set_backing_hd (target_bs, backing); +bdrv_set_backing_hd (target_bs, backing, &local_err); +if (local_err) { +error_report_err (local_err); + data->ret = -EPERM ; + } } }
block/stream.c +8 -1
@@ -68,6 +68,7 @@ static void stream_complete(BlockJob *job, void *opaque)StreamCompleteData *data = opaque;BlockDriverState *bs =blk_bs (job->blk);BlockDriverState *base = s->base; +Error *local_err =NULL ;if (!block_job_is_cancelled (&s->common) && data->reached_end && data->ret ==0 ) {
@@ -79,9 +80,15 @@ static void stream_complete(BlockJob *job, void *opaque) } } data->ret =bdrv_change_backing_file (bs, base_id, base_fmt); -bdrv_set_backing_hd (bs, base); +bdrv_set_backing_hd (bs, base, &local_err); +if (local_err) { +error_report_err (local_err); + data->ret = -EPERM ; + goto out; + } } +out:/* Reopen the image back in read-only mode if necessary */ if (s->bs_flags !=bdrv_get_flags (bs)) {bdrv_reopen (bs, s->bs_flags,NULL );
block/vvfat.c +1 -1
@@ -3041,7 +3041,7 @@ static int enable_write_target(BlockDriverState *bs, Error **errp) &error_abort); *(void **) backing->opaque = s; -bdrv_set_backing_hd (s->bs, backing); +bdrv_set_backing_hd (s->bs, backing, &error_abort);bdrv_unref (backing);return 0 ;
include/block/block.h +2 -1
@@ -247,7 +247,8 @@ BdrvChild *bdrv_open_child(const char *filename,BlockDriverState * parent, const BdrvChildRole *child_role, bool allow_none, Error **errp); -void bdrv_set_backing_hd (BlockDriverState *bs,BlockDriverState *backing_hd); +void bdrv_set_backing_hd (BlockDriverState *bs,BlockDriverState *backing_hd, +Error **errp);int bdrv_open_backing_file (BlockDriverState *bs,QDict *parent_options,const char *bdref_key,Error **errp); BlockDriverState *bdrv_open(const char *filename, const char *reference,
Signature · 1 line
1.8.3.1
PATCH v2 43/43 block: Add Error parameter to bdrv_append()
In reply to Kevin WolfAborting on error in bdrv_append() isn't correct. This patch fixes it and lets the callers handle failures.
Test case 085 needs a reference output update. This is caused by the reversed order of bdrv_set_backing_hd() and change_parent_backing_link() in bdrv_append(): When the backing file of the new node is set, the parent nodes are still pointing to the old top, so the backing blocker is now initialised with the node name rather than the BlockBackend name.
--- block.c | 23 +++++++++++++++++------ block/mirror.c | 9 ++++++++- blockdev.c | 18 +++++++++++++++--- include/block/block.h | 3 ++- tests/qemu-iotests/085.out | 2 +- 5 files changed, 43 insertions(+), 12 deletions(-)
block.c +17 -6
@@ -2077,6 +2077,7 @@ static BlockDriverState *bdrv_append_temp_snapshot(BlockDriverState *bs,int64_t total_size;QemuOpts *opts =NULL ;BlockDriverState *bs_snapshot; +Error *local_err =NULL ;int ret;/* if snapshot, we create a temporary backing file and open it
@@ -2126,7 +2127,12 @@ static BlockDriverState *bdrv_append_temp_snapshot(BlockDriverState *bs,* call bdrv_unref() on it), so in order to be able to return one, we have * to increase bs_snapshot's refcount here */ bdrv_ref (bs_snapshot); -bdrv_append (bs_snapshot, bs); +bdrv_append (bs_snapshot, bs, &local_err); +if (local_err) { +error_propagate (errp, local_err); + ret = -EINVAL ; + goto out; + }g_free (tmp_filename);return bs_snapshot;
@@ -2915,20 +2921,25 @@ static void change_parent_backing_link(BlockDriverState *from,* parents of bs_top after bdrv_append() returns. If the caller needs to keep a * reference of its own, it must call bdrv_ref(). */ -void bdrv_append (BlockDriverState *bs_new,BlockDriverState *bs_top) +void bdrv_append (BlockDriverState *bs_new,BlockDriverState *bs_top, +Error **errp) { +Error *local_err =NULL ; +assert (!atomic_read (&bs_top->in_flight));assert (!atomic_read (&bs_new->in_flight)); -bdrv_ref (bs_top); +bdrv_set_backing_hd (bs_new, bs_top, &local_err); +if (local_err) { +error_propagate (errp, local_err); + goto out; + }change_parent_backing_link (bs_top, bs_new); -/* FIXME Error handling */ -bdrv_set_backing_hd (bs_new, bs_top, &error_abort); -bdrv_unref (bs_top);/* bs_new is now referenced by its new parents, we don't need the * additional reference any more. */ +out:bdrv_unref (bs_new); }
block/mirror.c +8 -1
@@ -1095,6 +1095,7 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,BlockDriverState *mirror_top_bs;bool target_graph_mod;bool target_is_backing; +Error *local_err =NULL ;int ret;if (granularity ==0 ) {
@@ -1126,9 +1127,15 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,* it alive until block_job_create() even if bs has no parent. */ bdrv_ref (mirror_top_bs);bdrv_drained_begin (bs); -bdrv_append (mirror_top_bs, bs); +bdrv_append (mirror_top_bs, bs, &local_err);bdrv_drained_end (bs); +if (local_err) { +bdrv_unref (mirror_top_bs); +error_propagate (errp, local_err); +return ; + } +/* Make sure that the source is not resized while the job is running */ s = block_job_create(job_id, driver, mirror_top_bs, BLK_PERM_CONSISTENT_READ,
blockdev.c +15 -3
@@ -1767,6 +1767,17 @@ static void external_snapshot_prepare(BlkActionState *common,if (!state->new_bs->drv->supports_backing) {error_setg (errp,"The snapshot does not support backing images" ); +return ; + } + +/* This removes our old bs and adds the new bs. This is an operation that +* can fail, so we need to do it in .prepare; undoing it for abort is +* always possible. */ +bdrv_ref (state->new_bs); +bdrv_append (state->new_bs, state->old_bs, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; } }
@@ -1777,8 +1788,6 @@ static void external_snapshot_commit(BlkActionState *common)bdrv_set_aio_context (state->new_bs, state->aio_context); -/* This removes our old bs and adds the new bs */ -bdrv_append (state->new_bs, state->old_bs);/* We don't need (or want) to use the transactional * bdrv_reopen_multiple() across all the entries at once, because we * don't want to abort all of them if one of them fails the reopen */
@@ -1793,7 +1802,9 @@ static void external_snapshot_abort(BlkActionState *common)ExternalSnapshotState *state =DO_UPCAST (ExternalSnapshotState, common, common);if (state->new_bs) { -bdrv_unref (state->new_bs); +if (state->new_bs->backing) { +bdrv_replace_in_backing_chain (state->new_bs, state->old_bs); + } } }
@@ -1804,6 +1815,7 @@ static void external_snapshot_clean(BlkActionState *common)if (state->aio_context) {bdrv_drained_end (state->old_bs);aio_context_release (state->aio_context); +bdrv_unref (state->new_bs); } }
include/block/block.h +2 -1
@@ -236,7 +236,8 @@ int bdrv_create(BlockDriver *drv, const char* filename, QemuOpts *opts, Error **errp);int bdrv_create_file (const char *filename,QemuOpts *opts,Error **errp);BlockDriverState *bdrv_new (void ); -void bdrv_append (BlockDriverState *bs_new,BlockDriverState *bs_top); +void bdrv_append (BlockDriverState *bs_new,BlockDriverState *bs_top, +Error **errp);void bdrv_replace_in_backing_chain (BlockDriverState *old,BlockDriverState *new);
tests/qemu-iotests/085.out +1 -1
@@ -74,7 +74,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/ === Invalid command - snapshot node used as backing hd === -{"error": {"class": "GenericError", "desc": "Node 'snap_11' is busy: node is used as backing hd of 'virtio0'"}} +{"error": {"class": "GenericError", "desc": "Node 'snap_11' is busy: node is used as backing hd of 'snap_12'"}} === Invalid command - snapshot node has a backing image ===
Signature · 1 line
1.8.3.1