mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: move BQL logic of bdrv_co_invalidate_cache in bdrv_activate

Browse Source 
Split bdrv_co_invalidate cache in two: the Global State (under BQL)
code that takes care of permissions and running GS callbacks,
and leave only the I/O code (->bdrv_co_invalidate_cache) running in
the I/O coroutine.

The only side effect is that bdrv_co_invalidate_cache is not
recursive anymore, and so is every direct call to
bdrv_invalidate_cache().

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Message-Id: <20220209105452.1694545-6-eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Emanuele Giuseppe Esposito 2022-02-09 05:54:52 -05:00 committed by Kevin Wolf
parent 3b71719462
commit 11d0c9b37e
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
block.c
View File

@ -6394,11 +6394,6 @@ void bdrv_init_with_whitelist(void)
} }
int bdrv_activate(BlockDriverState *bs, Error **errp) int bdrv_activate(BlockDriverState *bs, Error **errp)
{
return bdrv_invalidate_cache(bs, errp);
}
int coroutine_fn bdrv_co_invalidate_cache(BlockDriverState *bs, Error **errp)
{ {
BdrvChild *child, *parent; BdrvChild *child, *parent;
Error *local_err = NULL; Error *local_err = NULL;
@ -6410,7 +6405,7 @@ int coroutine_fn bdrv_co_invalidate_cache(BlockDriverState *bs, Error **errp)
} }
QLIST_FOREACH(child, &bs->children, next) { QLIST_FOREACH(child, &bs->children, next) {
bdrv_co_invalidate_cache(child->bs, &local_err); bdrv_activate(child->bs, &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
return -EINVAL; return -EINVAL;
@ -6423,7 +6418,7 @@ int coroutine_fn bdrv_co_invalidate_cache(BlockDriverState *bs, Error **errp)
* Note that the required permissions of inactive images are always a * Note that the required permissions of inactive images are always a
* subset of the permissions required after activating the image. This * subset of the permissions required after activating the image. This
* allows us to just get the permissions upfront without restricting * allows us to just get the permissions upfront without restricting
* drv->bdrv_invalidate_cache(). * bdrv_co_invalidate_cache().
* *
* It also means that in error cases, we don't have to try and revert to * It also means that in error cases, we don't have to try and revert to
* the old permissions (which is an operation that could fail, too). We can * the old permissions (which is an operation that could fail, too). We can
@ -6438,13 +6433,10 @@ int coroutine_fn bdrv_co_invalidate_cache(BlockDriverState *bs, Error **errp)
return ret; return ret;
} }
if (bs->drv->bdrv_co_invalidate_cache) { ret = bdrv_invalidate_cache(bs, errp);
bs->drv->bdrv_co_invalidate_cache(bs, &local_err); if (ret < 0) {
if (local_err) {
bs->open_flags |= BDRV_O_INACTIVE; bs->open_flags |= BDRV_O_INACTIVE;
error_propagate(errp, local_err); return ret;
return -EINVAL;
}
} }
FOR_EACH_DIRTY_BITMAP(bs, bm) { FOR_EACH_DIRTY_BITMAP(bs, bm) {
@ -6473,6 +6465,23 @@ int coroutine_fn bdrv_co_invalidate_cache(BlockDriverState *bs, Error **errp)
return 0; return 0;
} }
int coroutine_fn bdrv_co_invalidate_cache(BlockDriverState *bs, Error **errp)
{
Error *local_err = NULL;
assert(!(bs->open_flags & BDRV_O_INACTIVE));
if (bs->drv->bdrv_co_invalidate_cache) {
bs->drv->bdrv_co_invalidate_cache(bs, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return -EINVAL;
}
}
return 0;
}
void bdrv_activate_all(Error **errp) void bdrv_activate_all(Error **errp)
{ {
BlockDriverState *bs; BlockDriverState *bs;