SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

block: Mark bdrv_amend_options() and callers GRAPH_RDLOCK

Browse Source 
This adds GRAPH_RDLOCK annotations to declare that callers of
bdrv_amend_options() need to hold a reader lock for the graph. This
removes an assume_graph_lock() call in crypto's implementation.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-14-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2023-09-29 16:51:48 +02:00
parent 4026f1c4f3
commit bd131d6705
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/crypto.c
View File

@ -828,7 +828,7 @@ block_crypto_amend_options_generic_luks(BlockDriverState *bs,
errp); errp);
} }
static int static int GRAPH_RDLOCK
block_crypto_amend_options_luks(BlockDriverState *bs, block_crypto_amend_options_luks(BlockDriverState *bs,
QemuOpts *opts, QemuOpts *opts,
BlockDriverAmendStatusCB *status_cb, BlockDriverAmendStatusCB *status_cb,
@ -841,8 +841,6 @@ block_crypto_amend_options_luks(BlockDriverState *bs,
QCryptoBlockAmendOptions *amend_options = NULL; QCryptoBlockAmendOptions *amend_options = NULL;
int ret = -EINVAL; int ret = -EINVAL;
assume_graph_lock(); /* FIXME */
assert(crypto); assert(crypto);
assert(crypto->block); assert(crypto->block);

6
include/block/block-global-state.h
View File

@ -160,10 +160,10 @@ void bdrv_unfreeze_backing_chain(BlockDriverState *bs, BlockDriverState *base);
*/ */
typedef void BlockDriverAmendStatusCB(BlockDriverState *bs, int64_t offset, typedef void BlockDriverAmendStatusCB(BlockDriverState *bs, int64_t offset,
int64_t total_work_size, void *opaque); int64_t total_work_size, void *opaque);
int bdrv_amend_options(BlockDriverState *bs_new, QemuOpts *opts, int GRAPH_RDLOCK
bdrv_amend_options(BlockDriverState *bs_new, QemuOpts *opts,
BlockDriverAmendStatusCB *status_cb, void *cb_opaque, BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
bool force, bool force, Error **errp);
Error **errp);
/* check if a named node can be replaced when doing drive-mirror */ /* check if a named node can be replaced when doing drive-mirror */
BlockDriverState * GRAPH_RDLOCK BlockDriverState * GRAPH_RDLOCK

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

@ -259,12 +259,10 @@ struct BlockDriver {
int coroutine_fn GRAPH_UNLOCKED_PTR (*bdrv_co_create_opts)( int coroutine_fn GRAPH_UNLOCKED_PTR (*bdrv_co_create_opts)(
BlockDriver *drv, const char *filename, QemuOpts *opts, Error **errp); BlockDriver *drv, const char *filename, QemuOpts *opts, Error **errp);
int (*bdrv_amend_options)(BlockDriverState *bs, int GRAPH_RDLOCK_PTR (*bdrv_amend_options)(
QemuOpts *opts, BlockDriverState *bs, QemuOpts *opts,
BlockDriverAmendStatusCB *status_cb, BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
void *cb_opaque, bool force, Error **errp);
bool force,
Error **errp);
int (*bdrv_make_empty)(BlockDriverState *bs); int (*bdrv_make_empty)(BlockDriverState *bs);

7
qemu-img.c
View File

@ -4129,6 +4129,8 @@ static int print_amend_option_help(const char *format)
{ {
BlockDriver *drv; BlockDriver *drv;
GRAPH_RDLOCK_GUARD_MAINLOOP();
/* Find driver and parse its options */ /* Find driver and parse its options */
drv = bdrv_find_format(format); drv = bdrv_find_format(format);
if (!drv) { if (!drv) {
@ -4267,9 +4269,11 @@ static int img_amend(int argc, char **argv)
goto out; goto out;
} }
bdrv_graph_rdlock_main_loop();
if (!bs->drv->bdrv_amend_options) { if (!bs->drv->bdrv_amend_options) {
error_report("Format driver '%s' does not support option amendment", error_report("Format driver '%s' does not support option amendment",
fmt); fmt);
bdrv_graph_rdunlock_main_loop();
ret = -1; ret = -1;
goto out; goto out;
} }
@ -4289,6 +4293,7 @@ static int img_amend(int argc, char **argv)
"This option is only supported for image creation\n"); "This option is only supported for image creation\n");
} }
bdrv_graph_rdunlock_main_loop();
error_report_err(err); error_report_err(err);
ret = -1; ret = -1;
goto out; goto out;
@ -4298,6 +4303,8 @@ static int img_amend(int argc, char **argv)
qemu_progress_print(0.f, 0); qemu_progress_print(0.f, 0);
ret = bdrv_amend_options(bs, opts, &amend_status_cb, NULL, force, &err); ret = bdrv_amend_options(bs, opts, &amend_status_cb, NULL, force, &err);
qemu_progress_print(100.f, 0); qemu_progress_print(100.f, 0);
bdrv_graph_rdunlock_main_loop();
if (ret < 0) { if (ret < 0) {
error_report_err(err); error_report_err(err);
goto out; goto out;