From 4233c105ab4dc42ea8252717a0b68ee387ef8ed8 Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

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

Subject: [PATCH 30/36] block: Add reopen_queue to bdrv_child_perm()

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

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

Patchwork-id: 78105

O-Subject: [RHV-7.5 qemu-kvm-rhev PATCH v2 2/8] block: Add reopen_queue to bdrv_child_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 e0995dc3da0894d0a8260bddaa200a4cd7809ba4)

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

---

 block.c                   | 19 ++++++++++++-------

 block/commit.c            |  1 +

 block/mirror.c            |  1 +

 block/replication.c       |  1 +

 block/vvfat.c             |  1 +

 include/block/block_int.h |  7 +++++++

 6 files changed, 23 insertions(+), 7 deletions(-)

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

index 6fb4e98..ab67062 100644

--- a/block.c

+++ b/block.c

@@ -1535,16 +1535,17 @@ static void bdrv_child_abort_perm_update(BdrvChild *c);

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

 static void bdrv_child_perm(BlockDriverState *bs, BlockDriverState *child_bs,

-                            BdrvChild *c,

-                            const BdrvChildRole *role,

+                            BdrvChild *c, const BdrvChildRole *role,

+                            BlockReopenQueue *reopen_queue,

                             uint64_t parent_perm, uint64_t parent_shared,

                             uint64_t *nperm, uint64_t *nshared)

 {

     if (bs->drv && bs->drv->bdrv_child_perm) {

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

+        bs->drv->bdrv_child_perm(bs, c, role, reopen_queue,

                                  parent_perm, parent_shared,

                                  nperm, nshared);

     }

+    /* TODO Take force_share from reopen_queue */

     if (child_bs && child_bs->force_share) {

         *nshared = BLK_PERM_ALL;

     }

@@ -1594,7 +1595,7 @@ 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,

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

                         cumulative_perms, cumulative_shared_perms,

                         &cur_perm, &cur_shared);

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

@@ -1656,7 +1657,7 @@ static void bdrv_set_perm(BlockDriverState *bs, uint64_t cumulative_perms,

     /* Update all children */

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

         uint64_t cur_perm, cur_shared;

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

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

                         cumulative_perms, cumulative_shared_perms,

                         &cur_perm, &cur_shared);

         bdrv_child_set_perm(c, cur_perm, cur_shared);

@@ -1825,6 +1826,7 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared,

 void bdrv_filter_default_perms(BlockDriverState *bs, BdrvChild *c,

                                const BdrvChildRole *role,

+                               BlockReopenQueue *reopen_queue,

                                uint64_t perm, uint64_t shared,

                                uint64_t *nperm, uint64_t *nshared)

 {

@@ -1842,6 +1844,7 @@ void bdrv_filter_default_perms(BlockDriverState *bs, BdrvChild *c,

 void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c,

                                const BdrvChildRole *role,

+                               BlockReopenQueue *reopen_queue,

                                uint64_t perm, uint64_t shared,

                                uint64_t *nperm, uint64_t *nshared)

 {

@@ -1851,9 +1854,11 @@ void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c,

     if (!backing) {

         /* Apart from the modifications below, the same permissions are

          * forwarded and left alone as for filters */

-        bdrv_filter_default_perms(bs, c, role, perm, shared, &perm, &shared);

+        bdrv_filter_default_perms(bs, c, role, reopen_queue, perm, shared,

+                                  &perm, &shared);

         /* Format drivers may touch metadata even if the guest doesn't write */

+        /* TODO Take flags from reopen_queue */

         if (bdrv_is_writable(bs)) {

             perm |= BLK_PERM_WRITE | BLK_PERM_RESIZE;

         }

@@ -1997,7 +2002,7 @@ BdrvChild *bdrv_attach_child(BlockDriverState *parent_bs,

     assert(parent_bs->drv);

     assert(bdrv_get_aio_context(parent_bs) == bdrv_get_aio_context(child_bs));

-    bdrv_child_perm(parent_bs, child_bs, NULL, child_role,

+    bdrv_child_perm(parent_bs, child_bs, NULL, child_role, NULL,

                     perm, shared_perm, &perm, &shared_perm);

     child = bdrv_root_attach_child(child_bs, child_name, child_role,

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

index c7857c3..834084b 100644

--- a/block/commit.c

+++ b/block/commit.c

@@ -267,6 +267,7 @@ static void bdrv_commit_top_close(BlockDriverState *bs)

 static void bdrv_commit_top_child_perm(BlockDriverState *bs, BdrvChild *c,

                                        const BdrvChildRole *role,

+                                       BlockReopenQueue *reopen_queue,

                                        uint64_t perm, uint64_t shared,

                                        uint64_t *nperm, uint64_t *nshared)

 {

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

index 429751b..17278db 100644

--- a/block/mirror.c

+++ b/block/mirror.c

@@ -1094,6 +1094,7 @@ static void bdrv_mirror_top_close(BlockDriverState *bs)

 static void bdrv_mirror_top_child_perm(BlockDriverState *bs, BdrvChild *c,

                                        const BdrvChildRole *role,

+                                       BlockReopenQueue *reopen_queue,

                                        uint64_t perm, uint64_t shared,

                                        uint64_t *nperm, uint64_t *nshared)

 {

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

index bf4462c..3a4e682 100644

--- a/block/replication.c

+++ b/block/replication.c

@@ -157,6 +157,7 @@ static void replication_close(BlockDriverState *bs)

 static void replication_child_perm(BlockDriverState *bs, BdrvChild *c,

                                    const BdrvChildRole *role,

+                                   BlockReopenQueue *reopen_queue,

                                    uint64_t perm, uint64_t shared,

                                    uint64_t *nperm, uint64_t *nshared)

 {

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

index a9e207f..e9110a9 100644

--- a/block/vvfat.c

+++ b/block/vvfat.c

@@ -3210,6 +3210,7 @@ err:

 static void vvfat_child_perm(BlockDriverState *bs, BdrvChild *c,

                              const BdrvChildRole *role,

+                             BlockReopenQueue *reopen_queue,

                              uint64_t perm, uint64_t shared,

                              uint64_t *nperm, uint64_t *nshared)

 {

diff --git a/include/block/block_int.h b/include/block/block_int.h

index 7571c0a..a6faf1b 100644

--- a/include/block/block_int.h

+++ b/include/block/block_int.h

@@ -377,9 +377,14 @@ struct BlockDriver {

      *

      * If @c is NULL, return the permissions for attaching a new child for the

      * given @role.

+     *

+     * If @reopen_queue is non-NULL, don't return the currently needed

+     * permissions, but those that will be needed after applying the

+     * @reopen_queue.

      */

      void (*bdrv_child_perm)(BlockDriverState *bs, BdrvChild *c,

                              const BdrvChildRole *role,

+                             BlockReopenQueue *reopen_queue,

                              uint64_t parent_perm, uint64_t parent_shared,

                              uint64_t *nperm, uint64_t *nshared);

@@ -949,6 +954,7 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared,

  * all children */

 void bdrv_filter_default_perms(BlockDriverState *bs, BdrvChild *c,

                                const BdrvChildRole *role,

+                               BlockReopenQueue *reopen_queue,

                                uint64_t perm, uint64_t shared,

                                uint64_t *nperm, uint64_t *nshared);

@@ -958,6 +964,7 @@ void bdrv_filter_default_perms(BlockDriverState *bs, BdrvChild *c,

  * CONSISTENT_READ and doesn't share WRITE. */

 void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c,

                                const BdrvChildRole *role,

+                               BlockReopenQueue *reopen_queue,

                                uint64_t perm, uint64_t shared,

                                uint64_t *nperm, uint64_t *nshared);

-- 

1.8.3.1