{"id":814195,"url":"http://patchwork.ozlabs.org/api/1.2/patches/814195/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170915101008.16646-4-kwolf@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170915101008.16646-4-kwolf@redhat.com>","list_archive_url":null,"date":"2017-09-15T10:10:05","name":"[3/6] block: Add reopen queue to bdrv_check_perm()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"eb714662aa86181909d1c389e5d51869074105e3","submitter":{"id":2714,"url":"http://patchwork.ozlabs.org/api/1.2/people/2714/?format=json","name":"Kevin Wolf","email":"kwolf@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170915101008.16646-4-kwolf@redhat.com/mbox/","series":[{"id":3264,"url":"http://patchwork.ozlabs.org/api/1.2/series/3264/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3264","date":"2017-09-15T10:10:02","name":"block: Fix permissions after ro/rw reopen","version":1,"mbox":"http://patchwork.ozlabs.org/series/3264/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814195/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814195/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=kwolf@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xtrlg58PQz9sxR\n\tfor ;\n\tFri, 15 Sep 2017 20:11:27 +1000 (AEST)","from localhost ([::1]:52342 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsnan-0002R1-Pe\n\tfor incoming@patchwork.ozlabs.org; Fri, 15 Sep 2017 06:11:25 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37276)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsnZq-00027u-9Q\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 06:10:30 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsnZo-0004Jo-Nu\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 06:10:26 -0400","from mx1.redhat.com ([209.132.183.28]:43012)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dsnZl-0004F4-GP; Fri, 15 Sep 2017 06:10:21 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 9489AC058EA9;\n\tFri, 15 Sep 2017 10:10:20 +0000 (UTC)","from localhost.localdomain.com (ovpn-117-157.ams2.redhat.com\n\t[10.36.117.157])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 303D066D5F;\n\tFri, 15 Sep 2017 10:10:19 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 9489AC058EA9","From":"Kevin Wolf ","To":"qemu-block@nongnu.org","Date":"Fri, 15 Sep 2017 12:10:05 +0200","Message-Id":"<20170915101008.16646-4-kwolf@redhat.com>","In-Reply-To":"<20170915101008.16646-1-kwolf@redhat.com>","References":"<20170915101008.16646-1-kwolf@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.32]);\n\tFri, 15 Sep 2017 10:10:20 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH 3/6] block: Add reopen queue to\n\tbdrv_check_perm()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"kwolf@redhat.com, famz@redhat.com, qemu-devel@nongnu.org,\n\tmreitz@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"In the context of bdrv_reopen(), we'll have to look at the state of the\ngraph as it will be after the reopen. This interface addition is in\npreparation for the change.\n\nSigned-off-by: Kevin Wolf \n---\n block.c | 34 +++++++++++++++++++---------------\n 1 file changed, 19 insertions(+), 15 deletions(-)","diff":"diff --git a/block.c b/block.c\nindex c7724c85e3..0b499fda4c 100644\n--- a/block.c\n+++ b/block.c\n@@ -1531,7 +1531,8 @@ static int bdrv_fill_options(QDict **options, const char *filename,\n return 0;\n }\n \n-static int bdrv_child_check_perm(BdrvChild *c, uint64_t perm, uint64_t shared,\n+static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q,\n+ uint64_t perm, uint64_t shared,\n GSList *ignore_children, Error **errp);\n static void bdrv_child_abort_perm_update(BdrvChild *c);\n static void bdrv_child_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared);\n@@ -1562,7 +1563,8 @@ static void bdrv_child_perm(BlockDriverState *bs, BlockDriverState *child_bs,\n * A call to this function must always be followed by a call to bdrv_set_perm()\n * or bdrv_abort_perm_update().\n */\n-static int bdrv_check_perm(BlockDriverState *bs, uint64_t cumulative_perms,\n+static int bdrv_check_perm(BlockDriverState *bs, BlockReopenQueue *q,\n+ uint64_t cumulative_perms,\n uint64_t cumulative_shared_perms,\n GSList *ignore_children, Error **errp)\n {\n@@ -1597,11 +1599,11 @@ static int bdrv_check_perm(BlockDriverState *bs, uint64_t cumulative_perms,\n /* Check all children */\n QLIST_FOREACH(c, &bs->children, next) {\n uint64_t cur_perm, cur_shared;\n- bdrv_child_perm(bs, c->bs, c, c->role, NULL,\n+ bdrv_child_perm(bs, c->bs, c, c->role, q,\n cumulative_perms, cumulative_shared_perms,\n &cur_perm, &cur_shared);\n- ret = bdrv_child_check_perm(c, cur_perm, cur_shared, ignore_children,\n- errp);\n+ ret = bdrv_child_check_perm(c, q, cur_perm, cur_shared,\n+ ignore_children, errp);\n if (ret < 0) {\n return ret;\n }\n@@ -1727,7 +1729,8 @@ char *bdrv_perm_names(uint64_t perm)\n *\n * Needs to be followed by a call to either bdrv_set_perm() or\n * bdrv_abort_perm_update(). */\n-static int bdrv_check_update_perm(BlockDriverState *bs, uint64_t new_used_perm,\n+static int bdrv_check_update_perm(BlockDriverState *bs, BlockReopenQueue *q,\n+ uint64_t new_used_perm,\n uint64_t new_shared_perm,\n GSList *ignore_children, Error **errp)\n {\n@@ -1769,19 +1772,20 @@ static int bdrv_check_update_perm(BlockDriverState *bs, uint64_t new_used_perm,\n cumulative_shared_perms &= c->shared_perm;\n }\n \n- return bdrv_check_perm(bs, cumulative_perms, cumulative_shared_perms,\n+ return bdrv_check_perm(bs, q, cumulative_perms, cumulative_shared_perms,\n ignore_children, errp);\n }\n \n /* Needs to be followed by a call to either bdrv_child_set_perm() or\n * bdrv_child_abort_perm_update(). */\n-static int bdrv_child_check_perm(BdrvChild *c, uint64_t perm, uint64_t shared,\n+static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q,\n+ uint64_t perm, uint64_t shared,\n GSList *ignore_children, Error **errp)\n {\n int ret;\n \n ignore_children = g_slist_prepend(g_slist_copy(ignore_children), c);\n- ret = bdrv_check_update_perm(c->bs, perm, shared, ignore_children, errp);\n+ ret = bdrv_check_update_perm(c->bs, q, perm, shared, ignore_children, errp);\n g_slist_free(ignore_children);\n \n return ret;\n@@ -1809,7 +1813,7 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared,\n {\n int ret;\n \n- ret = bdrv_child_check_perm(c, perm, shared, NULL, errp);\n+ ret = bdrv_child_check_perm(c, NULL, perm, shared, NULL, errp);\n if (ret < 0) {\n bdrv_child_abort_perm_update(c);\n return ret;\n@@ -1950,7 +1954,7 @@ static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs)\n * because we're just taking a parent away, so we're loosening\n * restrictions. */\n bdrv_get_cumulative_perm(old_bs, &perm, &shared_perm);\n- bdrv_check_perm(old_bs, perm, shared_perm, NULL, &error_abort);\n+ bdrv_check_perm(old_bs, NULL, perm, shared_perm, NULL, &error_abort);\n bdrv_set_perm(old_bs, perm, shared_perm);\n }\n \n@@ -1969,7 +1973,7 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs,\n BdrvChild *child;\n int ret;\n \n- ret = bdrv_check_update_perm(child_bs, perm, shared_perm, NULL, errp);\n+ ret = bdrv_check_update_perm(child_bs, NULL, perm, shared_perm, NULL, errp);\n if (ret < 0) {\n bdrv_abort_perm_update(child_bs);\n return NULL;\n@@ -3184,7 +3188,7 @@ void bdrv_replace_node(BlockDriverState *from, BlockDriverState *to,\n \n /* Check whether the required permissions can be granted on @to, ignoring\n * all BdrvChild in @list so that they can't block themselves. */\n- ret = bdrv_check_update_perm(to, perm, shared, list, errp);\n+ ret = bdrv_check_update_perm(to, NULL, perm, shared, list, errp);\n if (ret < 0) {\n bdrv_abort_perm_update(to);\n goto out;\n@@ -4054,7 +4058,7 @@ void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp)\n \n /* Update permissions, they may differ for inactive nodes */\n bdrv_get_cumulative_perm(bs, &perm, &shared_perm);\n- ret = bdrv_check_perm(bs, perm, shared_perm, NULL, &local_err);\n+ ret = bdrv_check_perm(bs, NULL, perm, shared_perm, NULL, &local_err);\n if (ret < 0) {\n bs->open_flags |= BDRV_O_INACTIVE;\n error_propagate(errp, local_err);\n@@ -4121,7 +4125,7 @@ static int bdrv_inactivate_recurse(BlockDriverState *bs,\n \n /* Update permissions, they may differ for inactive nodes */\n bdrv_get_cumulative_perm(bs, &perm, &shared_perm);\n- bdrv_check_perm(bs, perm, shared_perm, NULL, &error_abort);\n+ bdrv_check_perm(bs, NULL, perm, shared_perm, NULL, &error_abort);\n bdrv_set_perm(bs, perm, shared_perm);\n }\n \n","prefixes":["3/6"]}