From 6c5f6c4a5d6471c620c905ec911b2a0cbb5687c8 Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Mon, 4 Dec 2017 12:10:02 +0100

Subject: [PATCH 31/36] block: Add reopen queue to bdrv_check_perm()

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <20171204121007.12964-4-kwolf@redhat.com>

Patchwork-id: 78110

O-Subject: [RHV-7.5 qemu-kvm-rhev PATCH v2 3/8] block: Add reopen queue to bdrv_check_perm()

Bugzilla: 1492178

RH-Acked-by: Fam Zheng <famz@redhat.com>

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Jeffrey Cody <jcody@redhat.com>

In the context of bdrv_reopen(), we'll have to look at the state of the

graph as it will be after the reopen. This interface addition is in

preparation for the change.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Reviewed-by: Eric Blake <eblake@redhat.com>

(cherry picked from commit 3121fb45b004ea85fb3589368ea699f32e6ef832)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 block.c | 34 +++++++++++++++++++---------------

 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/block.c b/block.c

index ab67062..5ce773a 100644

--- a/block.c

+++ b/block.c

@@ -1529,7 +1529,8 @@ static int bdrv_fill_options(QDict **options, const char *filename,

     return 0;

 }

-static int bdrv_child_check_perm(BdrvChild *c, uint64_t perm, uint64_t shared,

+static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q,

+                                 uint64_t perm, uint64_t shared,

                                  GSList *ignore_children, Error **errp);

 static void bdrv_child_abort_perm_update(BdrvChild *c);

 static void bdrv_child_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared);

@@ -1560,7 +1561,8 @@ static void bdrv_child_perm(BlockDriverState *bs, BlockDriverState *child_bs,

  * A call to this function must always be followed by a call to bdrv_set_perm()

  * or bdrv_abort_perm_update().

  */

-static int bdrv_check_perm(BlockDriverState *bs, uint64_t cumulative_perms,

+static int bdrv_check_perm(BlockDriverState *bs, BlockReopenQueue *q,

+                           uint64_t cumulative_perms,

                            uint64_t cumulative_shared_perms,

                            GSList *ignore_children, Error **errp)

 {

@@ -1595,11 +1597,11 @@ static int bdrv_check_perm(BlockDriverState *bs, uint64_t cumulative_perms,

     /* Check all children */

     QLIST_FOREACH(c, &bs->children, next) {

         uint64_t cur_perm, cur_shared;

-        bdrv_child_perm(bs, c->bs, c, c->role, NULL,

+        bdrv_child_perm(bs, c->bs, c, c->role, q,

                         cumulative_perms, cumulative_shared_perms,

                         &cur_perm, &cur_shared);

-        ret = bdrv_child_check_perm(c, cur_perm, cur_shared, ignore_children,

-                                    errp);

+        ret = bdrv_child_check_perm(c, q, cur_perm, cur_shared,

+                                    ignore_children, errp);

         if (ret < 0) {

             return ret;

         }

@@ -1725,7 +1727,8 @@ char *bdrv_perm_names(uint64_t perm)

  *

  * Needs to be followed by a call to either bdrv_set_perm() or

  * bdrv_abort_perm_update(). */

-static int bdrv_check_update_perm(BlockDriverState *bs, uint64_t new_used_perm,

+static int bdrv_check_update_perm(BlockDriverState *bs, BlockReopenQueue *q,

+                                  uint64_t new_used_perm,

                                   uint64_t new_shared_perm,

                                   GSList *ignore_children, Error **errp)

 {

@@ -1767,19 +1770,20 @@ static int bdrv_check_update_perm(BlockDriverState *bs, uint64_t new_used_perm,

         cumulative_shared_perms &= c->shared_perm;

     }

-    return bdrv_check_perm(bs, cumulative_perms, cumulative_shared_perms,

+    return bdrv_check_perm(bs, q, cumulative_perms, cumulative_shared_perms,

                            ignore_children, errp);

 }

 /* Needs to be followed by a call to either bdrv_child_set_perm() or

  * bdrv_child_abort_perm_update(). */

-static int bdrv_child_check_perm(BdrvChild *c, uint64_t perm, uint64_t shared,

+static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q,

+                                 uint64_t perm, uint64_t shared,

                                  GSList *ignore_children, Error **errp)

 {

     int ret;

     ignore_children = g_slist_prepend(g_slist_copy(ignore_children), c);

-    ret = bdrv_check_update_perm(c->bs, perm, shared, ignore_children, errp);

+    ret = bdrv_check_update_perm(c->bs, q, perm, shared, ignore_children, errp);

     g_slist_free(ignore_children);

     return ret;

@@ -1807,7 +1811,7 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared,

 {

     int ret;

-    ret = bdrv_child_check_perm(c, perm, shared, NULL, errp);

+    ret = bdrv_child_check_perm(c, NULL, perm, shared, NULL, errp);

     if (ret < 0) {

         bdrv_child_abort_perm_update(c);

         return ret;

@@ -1948,7 +1952,7 @@ static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs)

          * because we're just taking a parent away, so we're loosening

          * restrictions. */

         bdrv_get_cumulative_perm(old_bs, &perm, &shared_perm);

-        bdrv_check_perm(old_bs, perm, shared_perm, NULL, &error_abort);

+        bdrv_check_perm(old_bs, NULL, perm, shared_perm, NULL, &error_abort);

         bdrv_set_perm(old_bs, perm, shared_perm);

     }

@@ -1967,7 +1971,7 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs,

     BdrvChild *child;

     int ret;

-    ret = bdrv_check_update_perm(child_bs, perm, shared_perm, NULL, errp);

+    ret = bdrv_check_update_perm(child_bs, NULL, perm, shared_perm, NULL, errp);

     if (ret < 0) {

         bdrv_abort_perm_update(child_bs);

         return NULL;

@@ -3183,7 +3187,7 @@ void bdrv_replace_node(BlockDriverState *from, BlockDriverState *to,

     /* Check whether the required permissions can be granted on @to, ignoring

      * all BdrvChild in @list so that they can't block themselves. */

-    ret = bdrv_check_update_perm(to, perm, shared, list, errp);

+    ret = bdrv_check_update_perm(to, NULL, perm, shared, list, errp);

     if (ret < 0) {

         bdrv_abort_perm_update(to);

         goto out;

@@ -4040,7 +4044,7 @@ void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp)

     /* Update permissions, they may differ for inactive nodes */

     bdrv_get_cumulative_perm(bs, &perm, &shared_perm);

-    ret = bdrv_check_perm(bs, perm, shared_perm, NULL, &local_err);

+    ret = bdrv_check_perm(bs, NULL, perm, shared_perm, NULL, &local_err);

     if (ret < 0) {

         bs->open_flags |= BDRV_O_INACTIVE;

         error_propagate(errp, local_err);

@@ -4107,7 +4111,7 @@ static int bdrv_inactivate_recurse(BlockDriverState *bs,

         /* Update permissions, they may differ for inactive nodes */

         bdrv_get_cumulative_perm(bs, &perm, &shared_perm);

-        bdrv_check_perm(bs, perm, shared_perm, NULL, &error_abort);

+        bdrv_check_perm(bs, NULL, perm, shared_perm, NULL, &error_abort);

         bdrv_set_perm(bs, perm, shared_perm);

     }

-- 

1.8.3.1