[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 31/45] qapi: block: add blockdev-add transaction action
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v5 31/45] qapi: block: add blockdev-add transaction action |
Date: |
Thu, 31 Mar 2022 00:28:48 +0300 |
Use new flag to avoid permission updates where possible during
blockdev_add, so that a bunch of add/del (and soon, new 'replace')
command may be done before actual permission update to avoid
intermediate permission conflicts.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@openvz.org>
---
blockdev.c | 54 ++++++++++++++++++++++++++++++++++++++++---
qapi/transaction.json | 10 +++++++-
2 files changed, 60 insertions(+), 4 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 16a9b98afc..3afd2ceea8 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -65,6 +65,8 @@
static int blockdev_del(const char *node_name, GSList **detached,
Transaction *tran, Error **errp);
+static int blockdev_add(BlockdevOptions *options, GSList **refresh_list,
+ Transaction *tran, Error **errp);
/* Protected by BQL */
QTAILQ_HEAD(, BlockDriverState) monitor_bdrv_states =
@@ -2216,6 +2218,10 @@ static void transaction_action(TransactionAction *act,
JobTxn *block_job_txn,
blockdev_del(act->u.blockdev_del.data->node_name,
refresh_list, tran, errp);
return;
+ case TRANSACTION_ACTION_KIND_BLOCKDEV_ADD:
+ blockdev_add(act->u.blockdev_add.data,
+ refresh_list, tran, errp);
+ return;
/*
* Where are transactions for MIRROR, COMMIT and STREAM?
* Although these blockjobs use transaction callbacks like the backup job,
@@ -2283,7 +2289,8 @@ void qmp_transaction(TransactionActionList *actions,
TransactionActionKind type = act->value->type;
if (refresh_list &&
- type != TRANSACTION_ACTION_KIND_BLOCKDEV_DEL)
+ type != TRANSACTION_ACTION_KIND_BLOCKDEV_DEL &&
+ type != TRANSACTION_ACTION_KIND_BLOCKDEV_ADD)
{
ret = bdrv_list_refresh_perms(refresh_list, NULL, tran, errp);
if (ret < 0) {
@@ -3454,7 +3461,21 @@ out:
aio_context_release(aio_context);
}
-void qmp_blockdev_add(BlockdevOptions *options, Error **errp)
+static void blockdev_add_abort(void *opaque)
+{
+ BlockDriverState *bs = opaque;
+
+ QTAILQ_REMOVE(&monitor_bdrv_states, bs, monitor_list);
+ bdrv_unref(bs);
+}
+
+TransactionActionDrv blockdev_add_drv = {
+ .abort = blockdev_add_abort,
+};
+
+/* Caller is responsible to refresh permissions */
+static int blockdev_add(BlockdevOptions *options, GSList **refresh_list,
+ Transaction *tran, Error **errp)
{
BlockDriverState *bs;
QObject *obj;
@@ -3472,15 +3493,42 @@ void qmp_blockdev_add(BlockdevOptions *options, Error
**errp)
goto fail;
}
- bs = bds_tree_init(qdict, 0, errp);
+ bs = bds_tree_init(qdict, BDRV_O_NOPERM, errp);
if (!bs) {
goto fail;
}
+ *refresh_list = g_slist_prepend(*refresh_list, bs);
+ tran_add(tran, &blockdev_add_drv, bs);
+
bdrv_set_monitor_owned(bs);
+ visit_free(v);
+ return 0;
+
fail:
visit_free(v);
+ return -EINVAL;
+}
+
+void qmp_blockdev_add(BlockdevOptions *options, Error **errp)
+{
+ int ret;
+ Transaction *tran = tran_new();
+ g_autoptr(GSList) refresh_list = NULL;
+
+ ret = blockdev_add(options, &refresh_list, tran, errp);
+ if (ret < 0) {
+ goto out;
+ }
+
+ ret = bdrv_list_refresh_perms(refresh_list, NULL, tran, errp);
+ if (ret < 0) {
+ goto out;
+ }
+
+out:
+ tran_finalize(tran, ret);
}
void qmp_blockdev_reopen(BlockdevOptionsList *reopen_list, Error **errp)
diff --git a/qapi/transaction.json b/qapi/transaction.json
index ea20df770c..000dd16bb7 100644
--- a/qapi/transaction.json
+++ b/qapi/transaction.json
@@ -67,7 +67,7 @@
'block-dirty-bitmap-disable', 'block-dirty-bitmap-merge',
'blockdev-backup', 'blockdev-snapshot',
'blockdev-snapshot-internal-sync', 'blockdev-snapshot-sync',
- 'blockdev-del',
+ 'blockdev-del', 'blockdev-add',
{ 'name': 'drive-backup', 'features': [ 'deprecated' ] } ] }
##
@@ -150,6 +150,13 @@
{ 'struct': 'BlockdevDelWrapper',
'data': { 'data': 'BlockdevDel' } }
+##
+# @BlockdevAddWrapper:
+#
+# Since: 7.1
+##
+{ 'struct': 'BlockdevAddWrapper',
+ 'data': { 'data': 'BlockdevOptions' } }
##
# @TransactionAction:
@@ -175,6 +182,7 @@
'blockdev-snapshot-internal-sync': 'BlockdevSnapshotInternalWrapper',
'blockdev-snapshot-sync': 'BlockdevSnapshotSyncWrapper',
'blockdev-del': 'BlockdevDelWrapper',
+ 'blockdev-add': 'BlockdevAddWrapper',
'drive-backup': 'DriveBackupWrapper'
} }
--
2.35.1
- [PATCH v5 44/45] block: bdrv_open_inherit: create BlockBackend only when necessary, (continued)
- [PATCH v5 44/45] block: bdrv_open_inherit: create BlockBackend only when necessary, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 07/45] block: document connection between child roles and bs->backing/bs->file, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 10/45] Revert "block: Let replace_child_tran keep indirect pointer", Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 14/45] block/snapshot: drop indirection around bdrv_snapshot_fallback_ptr, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 15/45] block: refactor bdrv_remove_file_or_backing_child to bdrv_remove_child, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 20/45] block: make permission update functions public, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 24/45] blockdev: transactions: rename some things, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 27/45] blockdev: qmp_transaction: drop extra generic layer, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 28/45] qapi: block: add blockdev-del transaction action, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 30/45] block: bdrv_insert_node(): use BDRV_O_NOPERM, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 31/45] qapi: block: add blockdev-add transaction action,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v5 33/45] block-backend: blk_root(): drop const specifier on return type, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 34/45] block/export: add blk_by_export_id(), Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 37/45] qapi: add x-blockdev-replace command, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 38/45] qapi: add x-blockdev-replace transaction action, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 40/45] iotests.py: qemu_img_create: use imgfmt by default, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 41/45] iotests.py: introduce VM.assert_edges_list() method, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 42/45] iotests.py: add VM.qmp_check() helper, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 43/45] iotests: add filter-insertion, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 03/45] block/blklogwrites: don't care to remove bs->file child on failure, Vladimir Sementsov-Ogievskiy, 2022/03/30
- [PATCH v5 04/45] test-bdrv-graph-mod: update test_parallel_perm_update test case, Vladimir Sementsov-Ogievskiy, 2022/03/30