qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, armbru@redhat.com, fam@euphon.net,
	stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com,
	mreitz@redhat.com, kwolf@redhat.com
Subject: [PATCH v3 09/36] block: bdrv_refresh_perms: check for parents permissions conflict
Date: Wed, 17 Mar 2021 17:35:02 +0300	[thread overview]
Message-ID: <20210317143529.615584-10-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com>

Add additional check that node parents do not interfere with each
other. This should not hurt existing callers and allows in further
patch use bdrv_refresh_perms() to update a subtree of changed
BdrvChild (check that change is correct).

New check will substitute bdrv_check_update_perm() in following
permissions refactoring, so keep error messages the same to avoid
unit test result changes.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 block.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 54 insertions(+), 9 deletions(-)

diff --git a/block.c b/block.c
index b951ecb5db..69db01c2ec 100644
--- a/block.c
+++ b/block.c
@@ -1992,6 +1992,57 @@ bool bdrv_is_writable(BlockDriverState *bs)
     return bdrv_is_writable_after_reopen(bs, NULL);
 }
 
+static char *bdrv_child_user_desc(BdrvChild *c)
+{
+    if (c->klass->get_parent_desc) {
+        return c->klass->get_parent_desc(c);
+    }
+
+    return g_strdup("another user");
+}
+
+static bool bdrv_a_allow_b(BdrvChild *a, BdrvChild *b, Error **errp)
+{
+    g_autofree char *user = NULL;
+    g_autofree char *perm_names = NULL;
+
+    if ((b->perm & a->shared_perm) == b->perm) {
+        return true;
+    }
+
+    perm_names = bdrv_perm_names(b->perm & ~a->shared_perm);
+    user = bdrv_child_user_desc(a);
+    error_setg(errp, "Conflicts with use by %s as '%s', which does not "
+               "allow '%s' on %s",
+               user, a->name, perm_names, bdrv_get_node_name(b->bs));
+
+    return false;
+}
+
+static bool bdrv_parent_perms_conflict(BlockDriverState *bs, Error **errp)
+{
+    BdrvChild *a, *b;
+
+    /*
+     * During the loop we'll look at each pair twice. That's correct because
+     * bdrv_a_allow_b() is asymmetric and we should check each pair in both
+     * directions.
+     */
+    QLIST_FOREACH(a, &bs->parents, next_parent) {
+        QLIST_FOREACH(b, &bs->parents, next_parent) {
+            if (a == b) {
+                continue;
+            }
+
+            if (!bdrv_a_allow_b(a, b, errp)) {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
 static void bdrv_child_perm(BlockDriverState *bs, BlockDriverState *child_bs,
                             BdrvChild *c, BdrvChildRole role,
                             BlockReopenQueue *reopen_queue,
@@ -2169,15 +2220,6 @@ void bdrv_get_cumulative_perm(BlockDriverState *bs, uint64_t *perm,
     *shared_perm = cumulative_shared_perms;
 }
 
-static char *bdrv_child_user_desc(BdrvChild *c)
-{
-    if (c->klass->get_parent_desc) {
-        return c->klass->get_parent_desc(c);
-    }
-
-    return g_strdup("another user");
-}
-
 char *bdrv_perm_names(uint64_t perm)
 {
     struct perm_name {
@@ -2321,6 +2363,9 @@ static int bdrv_refresh_perms(BlockDriverState *bs, Error **errp)
     int ret;
     uint64_t perm, shared_perm;
 
+    if (bdrv_parent_perms_conflict(bs, errp)) {
+        return -EPERM;
+    }
     bdrv_get_cumulative_perm(bs, &perm, &shared_perm);
     ret = bdrv_check_perm(bs, NULL, perm, shared_perm, NULL, errp);
     if (ret < 0) {
-- 
2.29.2



  parent reply	other threads:[~2021-03-17 14:48 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-17 14:34 [PATCH v3 00/36] block: update graph permissions update Vladimir Sementsov-Ogievskiy
2021-03-17 14:34 ` [PATCH v3 01/36] tests/test-bdrv-graph-mod: add test_parallel_exclusive_write Vladimir Sementsov-Ogievskiy
2021-04-23 12:25   ` Kevin Wolf
2021-04-23 12:46     ` Vladimir Sementsov-Ogievskiy
2021-04-23 12:59       ` Kevin Wolf
2021-04-23 13:03         ` Vladimir Sementsov-Ogievskiy
2021-03-17 14:34 ` [PATCH v3 02/36] tests/test-bdrv-graph-mod: add test_parallel_perm_update Vladimir Sementsov-Ogievskiy
2021-03-17 14:34 ` [PATCH v3 03/36] tests/test-bdrv-graph-mod: add test_append_greedy_filter Vladimir Sementsov-Ogievskiy
2021-03-17 14:34 ` [PATCH v3 04/36] block: bdrv_append(): don't consume reference Vladimir Sementsov-Ogievskiy
2021-04-07 17:46   ` Alberto Garcia
2021-04-23 14:11   ` Kevin Wolf
2021-03-17 14:34 ` [PATCH v3 05/36] block: BdrvChildClass: add .get_parent_aio_context handler Vladimir Sementsov-Ogievskiy
2021-04-12 15:06   ` Alberto Garcia
2021-03-17 14:34 ` [PATCH v3 06/36] block: drop ctx argument from bdrv_root_attach_child Vladimir Sementsov-Ogievskiy
2021-04-12 14:23   ` Alberto Garcia
2021-03-17 14:35 ` [PATCH v3 07/36] block: make bdrv_reopen_{prepare, commit, abort} private Vladimir Sementsov-Ogievskiy via
2021-03-17 14:35 ` [PATCH v3 08/36] util: add transactions.c Vladimir Sementsov-Ogievskiy
2021-04-23 14:43   ` Kevin Wolf
2021-03-17 14:35 ` Vladimir Sementsov-Ogievskiy [this message]
2021-04-12 15:57   ` [PATCH v3 09/36] block: bdrv_refresh_perms: check for parents permissions conflict Alberto Garcia
2021-03-17 14:35 ` [PATCH v3 10/36] block: refactor bdrv_child* permission functions Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 11/36] block: rewrite bdrv_child_try_set_perm() using bdrv_refresh_perms() Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 12/36] block: inline bdrv_child_*() permission functions calls Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 13/36] block: use topological sort for permission update Vladimir Sementsov-Ogievskiy
2021-03-17 16:50   ` Alberto Garcia
2021-03-17 14:35 ` [PATCH v3 14/36] block: add bdrv_drv_set_perm transaction action Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 15/36] block: add bdrv_list_* permission update functions Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 16/36] block: add bdrv_replace_child_safe() transaction action Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 17/36] block: fix bdrv_replace_node_common Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 18/36] block: add bdrv_attach_child_common() transaction action Vladimir Sementsov-Ogievskiy
2021-04-26 16:14   ` Kevin Wolf
2021-04-26 16:56     ` Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 19/36] block: add bdrv_attach_child_noperm() " Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 20/36] block: split out bdrv_replace_node_noperm() Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 21/36] block: adapt bdrv_append() for inserting filters Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 22/36] block: add bdrv_remove_filter_or_cow transaction action Vladimir Sementsov-Ogievskiy
2021-04-26 16:26   ` Kevin Wolf
2021-04-26 17:18     ` Vladimir Sementsov-Ogievskiy
2021-04-27 11:09       ` Kevin Wolf
2021-04-27 11:41         ` Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 23/36] block: introduce bdrv_drop_filter() Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 24/36] block/backup-top: drop .active Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 25/36] block: drop ignore_children for permission update functions Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 26/36] block: make bdrv_unset_inherits_from to be a transaction action Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 27/36] block: make bdrv_refresh_limits() " Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 28/36] block: add bdrv_set_backing_noperm() " Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 29/36] block: bdrv_reopen_multiple(): move bdrv_flush to separate pre-prepare Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 30/36] block: bdrv_reopen_multiple: refresh permissions on updated graph Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 31/36] block: drop unused permission update functions Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 32/36] block: inline bdrv_check_perm_common() Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 33/36] block: inline bdrv_replace_child() Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 34/36] block: refactor bdrv_child_set_perm_safe() transaction action Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 35/36] block: rename bdrv_replace_child_safe() to bdrv_replace_child() Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 36/36] block: refactor bdrv_node_check_perm() Vladimir Sementsov-Ogievskiy
2021-03-17 15:21 ` [PATCH v3 00/36] block: update graph permissions update no-reply
2021-03-17 15:38   ` Vladimir Sementsov-Ogievskiy
2021-03-17 17:33     ` Eric Blake
2021-03-17 17:42       ` Eric Blake
2021-03-18  8:04       ` Vladimir Sementsov-Ogievskiy
2021-04-23  8:34         ` Kevin Wolf
2021-04-23 16:16 ` Kevin Wolf
2021-04-28 11:28 ` Kevin Wolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210317143529.615584-10-vsementsov@virtuozzo.com \
    --to=vsementsov@virtuozzo.com \
    --cc=armbru@redhat.com \
    --cc=fam@euphon.net \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).