All the global state (GS) API functions will check that
qemu_in_main_thread() returns true. If not, it means
that the safety of BQL cannot be guaranteed, and
they need to be moved to I/O.
Signed-off-by: Emanuele Giuseppe Esposito <eespo...@redhat.com>
---
block/block-backend.c | 89 +++++++++++++++++++++++++++++++++++++++++-
softmmu/qdev-monitor.c | 2 +
2 files changed, 90 insertions(+), 1 deletion(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index d31ae16b99..9cd3b27b53 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -227,6 +227,7 @@ static void blk_root_activate(BdrvChild *child, Error
**errp)
void blk_set_force_allow_inactivate(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
blk->force_allow_inactivate = true;
}
@@ -345,6 +346,8 @@ BlockBackend *blk_new(AioContext *ctx, uint64_t perm,
uint64_t shared_perm)
{
BlockBackend *blk;
+ g_assert(qemu_in_main_thread());
+
blk = g_new0(BlockBackend, 1);
blk->refcnt = 1;
blk->ctx = ctx;
@@ -382,6 +385,8 @@ BlockBackend *blk_new_with_bs(BlockDriverState *bs,
uint64_t perm,
{
BlockBackend *blk = blk_new(bdrv_get_aio_context(bs), perm, shared_perm);
+ g_assert(qemu_in_main_thread());
+
if (blk_insert_bs(blk, bs, errp) < 0) {
blk_unref(blk);
return NULL;
@@ -410,6 +415,8 @@ BlockBackend *blk_new_open(const char *filename, const char
*reference,
uint64_t perm = 0;
uint64_t shared = BLK_PERM_ALL;
+ g_assert(qemu_in_main_thread());
+
/*
* blk_new_open() is mainly used in .bdrv_create implementations and the
* tools where sharing isn't a major concern because the BDS stays private
@@ -487,6 +494,7 @@ static void drive_info_del(DriveInfo *dinfo)
int blk_get_refcnt(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
return blk ? blk->refcnt : 0;
}
@@ -497,6 +505,7 @@ int blk_get_refcnt(BlockBackend *blk)
void blk_ref(BlockBackend *blk)
{
assert(blk->refcnt > 0);
+ g_assert(qemu_in_main_thread());
blk->refcnt++;
}
@@ -507,6 +516,7 @@ void blk_ref(BlockBackend *blk)
*/
void blk_unref(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
if (blk) {
assert(blk->refcnt > 0);
if (blk->refcnt > 1) {
@@ -527,6 +537,7 @@ void blk_unref(BlockBackend *blk)
*/
BlockBackend *blk_all_next(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
return blk ? QTAILQ_NEXT(blk, link)
: QTAILQ_FIRST(&block_backends);
}
@@ -535,6 +546,8 @@ void blk_remove_all_bs(void)
{
BlockBackend *blk = NULL;
+ g_assert(qemu_in_main_thread());
+
while ((blk = blk_all_next(blk)) != NULL) {
AioContext *ctx = blk_get_aio_context(blk);
@@ -558,6 +571,7 @@ void blk_remove_all_bs(void)
*/
BlockBackend *blk_next(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
return blk ? QTAILQ_NEXT(blk, monitor_link)
: QTAILQ_FIRST(&monitor_block_backends);
}
@@ -624,6 +638,7 @@ static void bdrv_next_reset(BdrvNextIterator *it)
BlockDriverState *bdrv_first(BdrvNextIterator *it)
{
+ g_assert(qemu_in_main_thread());
bdrv_next_reset(it);
return bdrv_next(it);
}
@@ -661,6 +676,7 @@ bool monitor_add_blk(BlockBackend *blk, const char *name,
Error **errp)
{
assert(!blk->name);
assert(name && name[0]);
+ g_assert(qemu_in_main_thread());
if (!id_wellformed(name)) {
error_setg(errp, "Invalid device name");
@@ -688,6 +704,8 @@ bool monitor_add_blk(BlockBackend *blk, const char *name,
Error **errp)
*/
void monitor_remove_blk(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
+
if (!blk->name) {
return;
}
@@ -703,6 +721,7 @@ void monitor_remove_blk(BlockBackend *blk)
*/
const char *blk_name(const BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
return blk->name ?: "";
}
@@ -714,6 +733,7 @@ BlockBackend *blk_by_name(const char *name)
{
BlockBackend *blk = NULL;
+ g_assert(qemu_in_main_thread());
assert(name);
while ((blk = blk_next(blk)) != NULL) {
if (!strcmp(name, blk->name)) {
@@ -748,6 +768,7 @@ static BlockBackend *bdrv_first_blk(BlockDriverState *bs)
*/
bool bdrv_has_blk(BlockDriverState *bs)
{
+ g_assert(qemu_in_main_thread());
return bdrv_first_blk(bs) != NULL;
}
@@ -758,6 +779,7 @@ bool bdrv_is_root_node(BlockDriverState *bs)
{
BdrvChild *c;
+ g_assert(qemu_in_main_thread());
QLIST_FOREACH(c, &bs->parents, next_parent) {
if (c->klass != &child_root) {
return false;
@@ -807,6 +829,7 @@ BlockBackend *blk_by_legacy_dinfo(DriveInfo *dinfo)
*/
BlockBackendPublic *blk_get_public(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
return &blk->public;
}
@@ -815,6 +838,7 @@ BlockBackendPublic *blk_get_public(BlockBackend *blk)
*/
BlockBackend *blk_by_public(BlockBackendPublic *public)
{
+ g_assert(qemu_in_main_thread());
return container_of(public, BlockBackend, public);
}
@@ -827,6 +851,8 @@ void blk_remove_bs(BlockBackend *blk)
BlockDriverState *bs;
BdrvChild *root;
+ g_assert(qemu_in_main_thread());
+
notifier_list_notify(&blk->remove_bs_notifiers, blk);
if (tgm->throttle_state) {
bs = blk_bs(blk);
@@ -854,6 +880,7 @@ void blk_remove_bs(BlockBackend *blk)
int blk_insert_bs(BlockBackend *blk, BlockDriverState *bs, Error **errp)
{
ThrottleGroupMember *tgm = &blk->public.throttle_group_member;
+ g_assert(qemu_in_main_thread());
bdrv_ref(bs);
blk->root = bdrv_root_attach_child(bs, "root", &child_root,
BDRV_CHILD_FILTERED |
BDRV_CHILD_PRIMARY,
@@ -880,6 +907,7 @@ int blk_set_perm(BlockBackend *blk, uint64_t perm, uint64_t
shared_perm,
{
int ret;
+ g_assert(qemu_in_main_thread());
if (blk->root && !blk->disable_perm) {
ret = bdrv_child_try_set_perm(blk->root, perm, shared_perm, errp);
if (ret < 0) {
@@ -895,6 +923,7 @@ int blk_set_perm(BlockBackend *blk, uint64_t perm, uint64_t
shared_perm,
void blk_get_perm(BlockBackend *blk, uint64_t *perm, uint64_t *shared_perm)
{
+ g_assert(qemu_in_main_thread());
*perm = blk->perm;
*shared_perm = blk->shared_perm;
}
@@ -905,6 +934,7 @@ void blk_get_perm(BlockBackend *blk, uint64_t *perm,
uint64_t *shared_perm)
*/
int blk_attach_dev(BlockBackend *blk, DeviceState *dev)
{
+ g_assert(qemu_in_main_thread());
if (blk->dev) {
return -EBUSY;
}
@@ -930,6 +960,7 @@ int blk_attach_dev(BlockBackend *blk, DeviceState *dev)
void blk_detach_dev(BlockBackend *blk, DeviceState *dev)
{
assert(blk->dev == dev);
+ g_assert(qemu_in_main_thread());
blk->dev = NULL;
blk->dev_ops = NULL;
blk->dev_opaque = NULL;
@@ -943,6 +974,7 @@ void blk_detach_dev(BlockBackend *blk, DeviceState *dev)
*/
DeviceState *blk_get_attached_dev(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
return blk->dev;
}
@@ -951,6 +983,7 @@ DeviceState *blk_get_attached_dev(BlockBackend *blk)
char *blk_get_attached_dev_id(BlockBackend *blk)
{
DeviceState *dev = blk->dev;
+ g_assert(qemu_in_main_thread());
if (!dev) {
return g_strdup("");
@@ -971,6 +1004,8 @@ BlockBackend *blk_by_dev(void *dev)
{
BlockBackend *blk = NULL;
+ g_assert(qemu_in_main_thread());
+
assert(dev != NULL);
while ((blk = blk_all_next(blk)) != NULL) {
if (blk->dev == dev) {
@@ -1010,6 +1045,7 @@ void blk_set_dev_ops(BlockBackend *blk, const BlockDevOps
*ops,
*/
void blk_dev_change_media_cb(BlockBackend *blk, bool load, Error **errp)
{
+ g_assert(qemu_in_main_thread());
if (blk->dev_ops && blk->dev_ops->change_media_cb) {
bool tray_was_open, tray_is_open;
Error *local_err = NULL;
@@ -1101,6 +1137,7 @@ static void blk_root_resize(BdrvChild *child)
void blk_iostatus_enable(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
blk->iostatus_enabled = true;
blk->iostatus = BLOCK_DEVICE_IO_STATUS_OK;
}
@@ -1109,6 +1146,7 @@ void blk_iostatus_enable(BlockBackend *blk)
* enables it _and_ the VM is configured to stop on errors */
bool blk_iostatus_is_enabled(const BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
return (blk->iostatus_enabled &&
(blk->on_write_error == BLOCKDEV_ON_ERROR_ENOSPC ||
blk->on_write_error == BLOCKDEV_ON_ERROR_STOP ||
@@ -1117,16 +1155,19 @@ bool blk_iostatus_is_enabled(const BlockBackend *blk)
BlockDeviceIoStatus blk_iostatus(const BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
return blk->iostatus;
}
void blk_iostatus_disable(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
blk->iostatus_enabled = false;
}
void blk_iostatus_reset(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
if (blk_iostatus_is_enabled(blk)) {
blk->iostatus = BLOCK_DEVICE_IO_STATUS_OK;
}
@@ -1134,6 +1175,7 @@ void blk_iostatus_reset(BlockBackend *blk)
void blk_iostatus_set_err(BlockBackend *blk, int error)
{
+ g_assert(qemu_in_main_thread());
assert(blk_iostatus_is_enabled(blk));
if (blk->iostatus == BLOCK_DEVICE_IO_STATUS_OK) {
blk->iostatus = error == ENOSPC ? BLOCK_DEVICE_IO_STATUS_NOSPACE :
@@ -1366,6 +1408,7 @@ int blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,
int blk_make_zero(BlockBackend *blk, BdrvRequestFlags flags)
{
+ g_assert(qemu_in_main_thread());
return bdrv_make_zero(blk->root, flags);
}
@@ -1394,6 +1437,7 @@ BlockAIOCB *blk_abort_aio_request(BlockBackend *blk,
void *opaque, int ret)
{
struct BlockBackendAIOCB *acb;
+ g_assert(qemu_in_main_thread());
blk_inc_in_flight(blk);
acb = blk_aio_get(&block_backend_aiocb_info, blk, cb, opaque);
@@ -1544,6 +1588,7 @@ void blk_get_geometry(BlockBackend *blk, uint64_t
*nb_sectors_ptr)
int64_t blk_nb_sectors(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
if (!blk_is_available(blk)) {
return -ENOMEDIUM;
}
@@ -1569,6 +1614,7 @@ BlockAIOCB *blk_aio_pwritev(BlockBackend *blk, int64_t
offset,
void blk_aio_cancel(BlockAIOCB *acb)
{
+ g_assert(qemu_in_main_thread());
bdrv_aio_cancel(acb);
}
@@ -1732,6 +1778,8 @@ void blk_drain(BlockBackend *blk)
{
BlockDriverState *bs = blk_bs(blk);
+ g_assert(qemu_in_main_thread());
+
if (bs) {
bdrv_drained_begin(bs);
}
@@ -1749,6 +1797,8 @@ void blk_drain_all(void)
{
BlockBackend *blk = NULL;
+ g_assert(qemu_in_main_thread());
+
bdrv_drain_all_begin();
while ((blk = blk_all_next(blk)) != NULL) {
@@ -1768,6 +1818,7 @@ void blk_drain_all(void)
void blk_set_on_error(BlockBackend *blk, BlockdevOnError on_read_error,
BlockdevOnError on_write_error)
{
+ g_assert(qemu_in_main_thread());
blk->on_read_error = on_read_error;
blk->on_write_error = on_write_error;
}
@@ -1851,6 +1902,7 @@ void blk_error_action(BlockBackend *blk, BlockErrorAction
action,
bool blk_supports_write_perm(BlockBackend *blk)
{
BlockDriverState *bs = blk_bs(blk);
+ g_assert(qemu_in_main_thread());
if (bs) {
return !bdrv_is_read_only(bs);
@@ -1871,6 +1923,7 @@ bool blk_is_writable(BlockBackend *blk)
bool blk_is_sg(BlockBackend *blk)
{
BlockDriverState *bs = blk_bs(blk);
+ g_assert(qemu_in_main_thread());
if (!bs) {
return false;
@@ -1881,17 +1934,20 @@ bool blk_is_sg(BlockBackend *blk)
bool blk_enable_write_cache(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
return blk->enable_write_cache;
}
void blk_set_enable_write_cache(BlockBackend *blk, bool wce)
{
+ g_assert(qemu_in_main_thread());
blk->enable_write_cache = wce;
}
void blk_invalidate_cache(BlockBackend *blk, Error **errp)
{
BlockDriverState *bs = blk_bs(blk);
+ g_assert(qemu_in_main_thread());
if (!bs) {
error_setg(errp, "Device '%s' has no medium", blk->name);
@@ -1904,7 +1960,6 @@ void blk_invalidate_cache(BlockBackend *blk, Error **errp)
bool blk_is_inserted(BlockBackend *blk)
{
BlockDriverState *bs = blk_bs(blk);
-
return bs && bdrv_is_inserted(bs);
}
@@ -1916,6 +1971,7 @@ bool blk_is_available(BlockBackend *blk)
void blk_lock_medium(BlockBackend *blk, bool locked)
{
BlockDriverState *bs = blk_bs(blk);
+ g_assert(qemu_in_main_thread());
if (bs) {
bdrv_lock_medium(bs, locked);
@@ -1925,6 +1981,8 @@ void blk_lock_medium(BlockBackend *blk, bool locked)
void blk_eject(BlockBackend *blk, bool eject_flag)
{
BlockDriverState *bs = blk_bs(blk);
+ g_assert(qemu_in_main_thread());
+
char *id;
if (bs) {
@@ -1942,6 +2000,7 @@ void blk_eject(BlockBackend *blk, bool eject_flag)
int blk_get_flags(BlockBackend *blk)
{
BlockDriverState *bs = blk_bs(blk);
+ g_assert(qemu_in_main_thread());
if (bs) {
return bdrv_get_flags(bs);
@@ -1989,6 +2048,7 @@ int blk_get_max_iov(BlockBackend *blk)
void blk_set_guest_block_size(BlockBackend *blk, int align)
{
+ g_assert(qemu_in_main_thread());
blk->guest_block_size = align;
}
@@ -2005,6 +2065,7 @@ void *blk_blockalign(BlockBackend *blk, size_t size)
bool blk_op_is_blocked(BlockBackend *blk, BlockOpType op, Error **errp)
{
BlockDriverState *bs = blk_bs(blk);
+ g_assert(qemu_in_main_thread());
if (!bs) {
return false;
@@ -2016,6 +2077,7 @@ bool blk_op_is_blocked(BlockBackend *blk, BlockOpType op,
Error **errp)
void blk_op_unblock(BlockBackend *blk, BlockOpType op, Error *reason)
{
BlockDriverState *bs = blk_bs(blk);
+ g_assert(qemu_in_main_thread());
if (bs) {
bdrv_op_unblock(bs, op, reason);
@@ -2025,6 +2087,7 @@ void blk_op_unblock(BlockBackend *blk, BlockOpType op,
Error *reason)
void blk_op_block_all(BlockBackend *blk, Error *reason)
{
BlockDriverState *bs = blk_bs(blk);
+ g_assert(qemu_in_main_thread());
if (bs) {
bdrv_op_block_all(bs, reason);
@@ -2034,6 +2097,7 @@ void blk_op_block_all(BlockBackend *blk, Error *reason)
void blk_op_unblock_all(BlockBackend *blk, Error *reason)
{
BlockDriverState *bs = blk_bs(blk);
+ g_assert(qemu_in_main_thread());
if (bs) {
bdrv_op_unblock_all(bs, reason);
@@ -2088,6 +2152,7 @@ static int blk_do_set_aio_context(BlockBackend *blk,
AioContext *new_context,
int blk_set_aio_context(BlockBackend *blk, AioContext *new_context,
Error **errp)
{
+ g_assert(qemu_in_main_thread());
return blk_do_set_aio_context(blk, new_context, true, errp);
}
@@ -2124,6 +2189,7 @@ void blk_add_aio_context_notifier(BlockBackend *blk,
{
BlockBackendAioNotifier *notifier;
BlockDriverState *bs = blk_bs(blk);
+ g_assert(qemu_in_main_thread());
notifier = g_new(BlockBackendAioNotifier, 1);
notifier->attached_aio_context = attached_aio_context;
@@ -2146,6 +2212,8 @@ void blk_remove_aio_context_notifier(BlockBackend *blk,
BlockBackendAioNotifier *notifier;
BlockDriverState *bs = blk_bs(blk);
+ g_assert(qemu_in_main_thread());
+
if (bs) {
bdrv_remove_aio_context_notifier(bs, attached_aio_context,
detach_aio_context, opaque);
@@ -2166,11 +2234,13 @@ void blk_remove_aio_context_notifier(BlockBackend *blk,
void blk_add_remove_bs_notifier(BlockBackend *blk, Notifier *notify)
{
+ g_assert(qemu_in_main_thread());
notifier_list_add(&blk->remove_bs_notifiers, notify);
}
void blk_add_insert_bs_notifier(BlockBackend *blk, Notifier *notify)
{
+ g_assert(qemu_in_main_thread());
notifier_list_add(&blk->insert_bs_notifiers, notify);
}
@@ -2232,6 +2302,7 @@ int blk_save_vmstate(BlockBackend *blk, const uint8_t
*buf,
int64_t pos, int size)
{
int ret;
+ g_assert(qemu_in_main_thread());
if (!blk_is_available(blk)) {
return -ENOMEDIUM;
@@ -2251,6 +2322,7 @@ int blk_save_vmstate(BlockBackend *blk, const uint8_t
*buf,
int blk_load_vmstate(BlockBackend *blk, uint8_t *buf, int64_t pos, int size)
{
+ g_assert(qemu_in_main_thread());
if (!blk_is_available(blk)) {
return -ENOMEDIUM;
}
@@ -2260,6 +2332,7 @@ int blk_load_vmstate(BlockBackend *blk, uint8_t *buf,
int64_t pos, int size)
int blk_probe_blocksizes(BlockBackend *blk, BlockSizes *bsz)
{
+ g_assert(qemu_in_main_thread());
if (!blk_is_available(blk)) {
return -ENOMEDIUM;
}
@@ -2269,6 +2342,7 @@ int blk_probe_blocksizes(BlockBackend *blk, BlockSizes
*bsz)
int blk_probe_geometry(BlockBackend *blk, HDGeometry *geo)
{
+ g_assert(qemu_in_main_thread());
if (!blk_is_available(blk)) {
return -ENOMEDIUM;
}
@@ -2282,6 +2356,7 @@ int blk_probe_geometry(BlockBackend *blk, HDGeometry *geo)
*/
void blk_update_root_state(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
assert(blk->root);
blk->root_state.open_flags = blk->root->bs->open_flags;
@@ -2294,6 +2369,7 @@ void blk_update_root_state(BlockBackend *blk)
*/
bool blk_get_detect_zeroes_from_root_state(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
return blk->root_state.detect_zeroes;
}
@@ -2303,17 +2379,20 @@ bool blk_get_detect_zeroes_from_root_state(BlockBackend
*blk)
*/
int blk_get_open_flags_from_root_state(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
return blk->root_state.open_flags;
}
BlockBackendRootState *blk_get_root_state(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
return &blk->root_state;
}
int blk_commit_all(void)
{
BlockBackend *blk = NULL;
+ g_assert(qemu_in_main_thread());
while ((blk = blk_all_next(blk)) != NULL) {
AioContext *aio_context = blk_get_aio_context(blk);
@@ -2338,6 +2417,7 @@ int blk_commit_all(void)
/* throttling disk I/O limits */
void blk_set_io_limits(BlockBackend *blk, ThrottleConfig *cfg)
{
+ g_assert(qemu_in_main_thread());
throttle_group_config(&blk->public.throttle_group_member, cfg);
}
@@ -2346,6 +2426,7 @@ void blk_io_limits_disable(BlockBackend *blk)
BlockDriverState *bs = blk_bs(blk);
ThrottleGroupMember *tgm = &blk->public.throttle_group_member;
assert(tgm->throttle_state);
+ g_assert(qemu_in_main_thread());
if (bs) {
bdrv_drained_begin(bs);
}
@@ -2359,12 +2440,14 @@ void blk_io_limits_disable(BlockBackend *blk)
void blk_io_limits_enable(BlockBackend *blk, const char *group)
{
assert(!blk->public.throttle_group_member.throttle_state);
+ g_assert(qemu_in_main_thread());
throttle_group_register_tgm(&blk->public.throttle_group_member,
group, blk_get_aio_context(blk));
}
void blk_io_limits_update_group(BlockBackend *blk, const char *group)
{
+ g_assert(qemu_in_main_thread());
/* this BB is not part of any group */
if (!blk->public.throttle_group_member.throttle_state) {
return;
@@ -2432,11 +2515,13 @@ static void blk_root_drained_end(BdrvChild *child, int
*drained_end_counter)
void blk_register_buf(BlockBackend *blk, void *host, size_t size)
{
+ g_assert(qemu_in_main_thread());
bdrv_register_buf(blk_bs(blk), host, size);
}
void blk_unregister_buf(BlockBackend *blk, void *host)
{
+ g_assert(qemu_in_main_thread());
bdrv_unregister_buf(blk_bs(blk), host);
}
@@ -2461,11 +2546,13 @@ int coroutine_fn blk_co_copy_range(BlockBackend
*blk_in, int64_t off_in,
const BdrvChild *blk_root(BlockBackend *blk)
{
+ g_assert(qemu_in_main_thread());
return blk->root;
}
int blk_make_empty(BlockBackend *blk, Error **errp)
{
+ g_assert(qemu_in_main_thread());
if (!blk_is_available(blk)) {
error_setg(errp, "No medium inserted");
return -ENOMEDIUM;
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index 721dec2d82..dcf298b6af 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -928,6 +928,8 @@ BlockBackend *blk_by_qdev_id(const char *id, Error **errp)
DeviceState *dev;
BlockBackend *blk;
+ g_assert(qemu_in_main_thread());
+
dev = find_device_state(id, errp);
if (dev == NULL) {
return NULL;
--
2.27.0
