OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block: Convert bdrv_lock_medium() to co_wrapper

Browse Source 
bdrv_lock_medium() is categorized as an I/O function, and it currently
doesn't run in a coroutine. We should let it take a graph rdlock since
it traverses the block nodes graph, which however is only possible in a
coroutine.

The only caller of this function is blk_lock_medium(). Therefore make
blk_lock_medium() a co_wrapper, so that it always creates a new
coroutine, and then make bdrv_lock_medium() a coroutine_fn where the
lock can be taken.

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20230113204212.359076-13-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Emanuele Giuseppe Esposito 2023-01-13 21:42:10 +01:00 committed by Kevin Wolf
parent 2531b390fb
commit 2c75261cc2
9 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block.c
View File

@ -6835,14 +6835,14 @@ void coroutine_fn bdrv_co_eject(BlockDriverState *bs, bool eject_flag)
* Lock or unlock the media (if it is locked, the user won't be able * Lock or unlock the media (if it is locked, the user won't be able
* to eject it manually). * to eject it manually).
*/ */
void bdrv_lock_medium(BlockDriverState *bs, bool locked) void coroutine_fn bdrv_co_lock_medium(BlockDriverState *bs, bool locked)
{ {
BlockDriver *drv = bs->drv; BlockDriver *drv = bs->drv;
IO_CODE(); IO_CODE();
trace_bdrv_lock_medium(bs, locked); trace_bdrv_lock_medium(bs, locked);
if (drv && drv->bdrv_lock_medium) { if (drv && drv->bdrv_co_lock_medium) {
drv->bdrv_lock_medium(bs, locked); drv->bdrv_co_lock_medium(bs, locked);
} }
} }

4
block/block-backend.c
View File

@ -1999,13 +1999,13 @@ bool blk_is_available(BlockBackend *blk)
return blk_is_inserted(blk) && !blk_dev_is_tray_open(blk); return blk_is_inserted(blk) && !blk_dev_is_tray_open(blk);
} }
void blk_lock_medium(BlockBackend *blk, bool locked) void coroutine_fn blk_co_lock_medium(BlockBackend *blk, bool locked)
{ {
BlockDriverState *bs = blk_bs(blk); BlockDriverState *bs = blk_bs(blk);
IO_CODE(); IO_CODE();
if (bs) { if (bs) {
bdrv_lock_medium(bs, locked); bdrv_co_lock_medium(bs, locked);
} }
} }

6
block/copy-on-read.c
View File

@ -223,9 +223,9 @@ static void coroutine_fn cor_co_eject(BlockDriverState *bs, bool eject_flag)
} }
static void cor_lock_medium(BlockDriverState *bs, bool locked) static void coroutine_fn cor_co_lock_medium(BlockDriverState *bs, bool locked)
{ {
bdrv_lock_medium(bs->file->bs, locked); bdrv_co_lock_medium(bs->file->bs, locked);
} }
@ -259,7 +259,7 @@ static BlockDriver bdrv_copy_on_read = {
.bdrv_co_pwritev_compressed = cor_co_pwritev_compressed, .bdrv_co_pwritev_compressed = cor_co_pwritev_compressed,
.bdrv_co_eject = cor_co_eject, .bdrv_co_eject = cor_co_eject,
.bdrv_lock_medium = cor_lock_medium, .bdrv_co_lock_medium = cor_co_lock_medium,
.has_variable_length = true, .has_variable_length = true,
.is_filter = true, .is_filter = true,

8
block/file-posix.c
View File

@ -3778,7 +3778,7 @@ static void coroutine_fn cdrom_co_eject(BlockDriverState *bs, bool eject_flag)
} }
} }
static void cdrom_lock_medium(BlockDriverState *bs, bool locked) static void coroutine_fn cdrom_co_lock_medium(BlockDriverState *bs, bool locked)
{ {
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
@ -3824,7 +3824,7 @@ static BlockDriver bdrv_host_cdrom = {
/* removable device support */ /* removable device support */
.bdrv_co_is_inserted = cdrom_co_is_inserted, .bdrv_co_is_inserted = cdrom_co_is_inserted,
.bdrv_co_eject = cdrom_co_eject, .bdrv_co_eject = cdrom_co_eject,
.bdrv_lock_medium = cdrom_lock_medium, .bdrv_co_lock_medium = cdrom_co_lock_medium,
/* generic scsi device */ /* generic scsi device */
.bdrv_co_ioctl = hdev_co_ioctl, .bdrv_co_ioctl = hdev_co_ioctl,
@ -3906,7 +3906,7 @@ static void coroutine_fn cdrom_co_eject(BlockDriverState *bs, bool eject_flag)
cdrom_reopen(bs); cdrom_reopen(bs);
} }
static void cdrom_lock_medium(BlockDriverState *bs, bool locked) static void coroutine_fn cdrom_co_lock_medium(BlockDriverState *bs, bool locked)
{ {
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
@ -3953,7 +3953,7 @@ static BlockDriver bdrv_host_cdrom = {
/* removable device support */ /* removable device support */
.bdrv_co_is_inserted = cdrom_co_is_inserted, .bdrv_co_is_inserted = cdrom_co_is_inserted,
.bdrv_co_eject = cdrom_co_eject, .bdrv_co_eject = cdrom_co_eject,
.bdrv_lock_medium = cdrom_lock_medium, .bdrv_co_lock_medium = cdrom_co_lock_medium,
}; };
#endif /* __FreeBSD__ */ #endif /* __FreeBSD__ */

7
block/filter-compress.c
View File

@ -124,9 +124,10 @@ compress_co_eject(BlockDriverState *bs, bool eject_flag)
} }
static void compress_lock_medium(BlockDriverState *bs, bool locked) static void coroutine_fn
compress_co_lock_medium(BlockDriverState *bs, bool locked)
{ {
bdrv_lock_medium(bs->file->bs, locked); bdrv_co_lock_medium(bs->file->bs, locked);
} }
@ -145,7 +146,7 @@ static BlockDriver bdrv_compress = {
.bdrv_refresh_limits = compress_refresh_limits, .bdrv_refresh_limits = compress_refresh_limits,
.bdrv_co_eject = compress_co_eject, .bdrv_co_eject = compress_co_eject,
.bdrv_lock_medium = compress_lock_medium, .bdrv_co_lock_medium = compress_co_lock_medium,
.has_variable_length = true, .has_variable_length = true,
.is_filter = true, .is_filter = true,

6
block/raw-format.c
View File

@ -410,9 +410,9 @@ static void coroutine_fn raw_co_eject(BlockDriverState *bs, bool eject_flag)
bdrv_co_eject(bs->file->bs, eject_flag); bdrv_co_eject(bs->file->bs, eject_flag);
} }
static void raw_lock_medium(BlockDriverState *bs, bool locked) static void coroutine_fn raw_co_lock_medium(BlockDriverState *bs, bool locked)
{ {
bdrv_lock_medium(bs->file->bs, locked); bdrv_co_lock_medium(bs->file->bs, locked);
} }
static int coroutine_fn raw_co_ioctl(BlockDriverState *bs, static int coroutine_fn raw_co_ioctl(BlockDriverState *bs,
@ -632,7 +632,7 @@ BlockDriver bdrv_raw = {
.bdrv_probe_blocksizes = &raw_probe_blocksizes, .bdrv_probe_blocksizes = &raw_probe_blocksizes,
.bdrv_probe_geometry = &raw_probe_geometry, .bdrv_probe_geometry = &raw_probe_geometry,
.bdrv_co_eject = &raw_co_eject, .bdrv_co_eject = &raw_co_eject,
.bdrv_lock_medium = &raw_lock_medium, .bdrv_co_lock_medium = &raw_co_lock_medium,
.bdrv_co_ioctl = &raw_co_ioctl, .bdrv_co_ioctl = &raw_co_ioctl,
.create_opts = &raw_create_opts, .create_opts = &raw_create_opts,
.bdrv_has_zero_init = &raw_has_zero_init, .bdrv_has_zero_init = &raw_has_zero_init,

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

@ -146,7 +146,7 @@ int bdrv_get_flags(BlockDriverState *bs);
bool coroutine_fn bdrv_co_is_inserted(BlockDriverState *bs); bool coroutine_fn bdrv_co_is_inserted(BlockDriverState *bs);
bool co_wrapper bdrv_is_inserted(BlockDriverState *bs); bool co_wrapper bdrv_is_inserted(BlockDriverState *bs);
void bdrv_lock_medium(BlockDriverState *bs, bool locked); void coroutine_fn bdrv_co_lock_medium(BlockDriverState *bs, bool locked);
void coroutine_fn bdrv_co_eject(BlockDriverState *bs, bool eject_flag); void coroutine_fn bdrv_co_eject(BlockDriverState *bs, bool eject_flag);
const char *bdrv_get_format_name(BlockDriverState *bs); const char *bdrv_get_format_name(BlockDriverState *bs);

2
include/block/block_int-common.h
View File

@ -709,7 +709,7 @@ struct BlockDriver {
/* removable device specific */ /* removable device specific */
bool coroutine_fn (*bdrv_co_is_inserted)(BlockDriverState *bs); bool coroutine_fn (*bdrv_co_is_inserted)(BlockDriverState *bs);
void coroutine_fn (*bdrv_co_eject)(BlockDriverState *bs, bool eject_flag); void coroutine_fn (*bdrv_co_eject)(BlockDriverState *bs, bool eject_flag);
void (*bdrv_lock_medium)(BlockDriverState *bs, bool locked); void coroutine_fn (*bdrv_co_lock_medium)(BlockDriverState *bs, bool locked);
/* to control generic scsi devices */ /* to control generic scsi devices */
BlockAIOCB *(*bdrv_aio_ioctl)(BlockDriverState *bs, BlockAIOCB *(*bdrv_aio_ioctl)(BlockDriverState *bs,

4
include/sysemu/block-backend-io.h
View File

@ -59,7 +59,9 @@ bool coroutine_fn blk_co_is_inserted(BlockBackend *blk);
bool co_wrapper_mixed blk_is_inserted(BlockBackend *blk); bool co_wrapper_mixed blk_is_inserted(BlockBackend *blk);
bool blk_is_available(BlockBackend *blk); bool blk_is_available(BlockBackend *blk);
void blk_lock_medium(BlockBackend *blk, bool locked);
void coroutine_fn blk_co_lock_medium(BlockBackend *blk, bool locked);
void co_wrapper blk_lock_medium(BlockBackend *blk, bool locked);
void coroutine_fn blk_co_eject(BlockBackend *blk, bool eject_flag); void coroutine_fn blk_co_eject(BlockBackend *blk, bool eject_flag);
void co_wrapper blk_eject(BlockBackend *blk, bool eject_flag); void co_wrapper blk_eject(BlockBackend *blk, bool eject_flag);