motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 18:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

block: Mark bdrv_filter_bs() and callers GRAPH_RDLOCK

Browse source 
This adds GRAPH_RDLOCK annotations to declare that callers of
bdrv_filter_bs() need to hold a reader lock for the graph because
it calls bdrv_filter_child(), which accesses bs->file/backing.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20231027155333.420094-4-kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2023-10-27 17:53:12 +02:00
parent 067179868e
commit f5a3a270fe
5 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
block.c
View file

@ -820,12 +820,17 @@ int bdrv_probe_blocksizes(BlockDriverState *bs, BlockSizes *bsz)
int bdrv_probe_geometry(BlockDriverState *bs, HDGeometry *geo) int bdrv_probe_geometry(BlockDriverState *bs, HDGeometry *geo)
{ {
BlockDriver *drv = bs->drv; BlockDriver *drv = bs->drv;
BlockDriverState *filtered = bdrv_filter_bs(bs); BlockDriverState *filtered;
GLOBAL_STATE_CODE(); GLOBAL_STATE_CODE();
GRAPH_RDLOCK_GUARD_MAINLOOP();
if (drv && drv->bdrv_probe_geometry) { if (drv && drv->bdrv_probe_geometry) {
return drv->bdrv_probe_geometry(bs, geo); return drv->bdrv_probe_geometry(bs, geo);
} else if (filtered) { }
filtered = bdrv_filter_bs(bs);
if (filtered) {
return bdrv_probe_geometry(filtered, geo); return bdrv_probe_geometry(filtered, geo);
} }

2
block/stream.c
View file

@ -268,6 +268,8 @@ void stream_start(const char *job_id, BlockDriverState *bs,
assert(!bottom->drv->is_filter); assert(!bottom->drv->is_filter);
base_overlay = above_base = bottom; base_overlay = above_base = bottom;
} else { } else {
GRAPH_RDLOCK_GUARD_MAINLOOP();
base_overlay = bdrv_find_overlay(bs, base); base_overlay = bdrv_find_overlay(bs, base);
if (!base_overlay) { if (!base_overlay) {
error_setg(errp, "'%s' is not in the backing chain of '%s'", error_setg(errp, "'%s' is not in the backing chain of '%s'",

2
include/block/block-io.h
View file

@ -183,7 +183,7 @@ bdrv_co_eject(BlockDriverState *bs, bool eject_flag);
const char *bdrv_get_format_name(BlockDriverState *bs); const char *bdrv_get_format_name(BlockDriverState *bs);
bool bdrv_supports_compressed_writes(BlockDriverState *bs); bool GRAPH_RDLOCK bdrv_supports_compressed_writes(BlockDriverState *bs);
const char *bdrv_get_node_name(const BlockDriverState *bs); const char *bdrv_get_node_name(const BlockDriverState *bs);
const char * GRAPH_RDLOCK const char * GRAPH_RDLOCK

3
include/block/block_int-io.h
View file

@ -143,7 +143,8 @@ static inline BlockDriverState *bdrv_cow_bs(BlockDriverState *bs)
return child_bs(bdrv_cow_child(bs)); return child_bs(bdrv_cow_child(bs));
} }
static inline BlockDriverState *bdrv_filter_bs(BlockDriverState *bs) static inline BlockDriverState * GRAPH_RDLOCK
bdrv_filter_bs(BlockDriverState *bs)
{ {
IO_CODE(); IO_CODE();
return child_bs(bdrv_filter_child(bs)); return child_bs(bdrv_filter_child(bs));

4
migration/block-dirty-bitmap.c
View file

@ -607,6 +607,10 @@ static int init_dirty_bitmap_migration(DBMSaveState *s)
BlockBackend *blk; BlockBackend *blk;
GHashTable *alias_map = NULL; GHashTable *alias_map = NULL;
/* Runs in the migration thread, but holds the iothread lock */
GLOBAL_STATE_CODE();
GRAPH_RDLOCK_GUARD_MAINLOOP();
if (migrate_has_block_bitmap_mapping()) { if (migrate_has_block_bitmap_mapping()) {
alias_map = construct_alias_map(migrate_block_bitmap_mapping(), true, alias_map = construct_alias_map(migrate_block_bitmap_mapping(), true,
&error_abort); &error_abort);