{"id":814198,"url":"http://patchwork.ozlabs.org/api/1.2/patches/814198/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170915101008.16646-7-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-7-kwolf@redhat.com>","list_archive_url":null,"date":"2017-09-15T10:10:08","name":"[6/6] block: Fix permissions after bdrv_reopen()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"0a0cd87d1f26da82951a66b346136721879fa050","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-7-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/814198/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814198/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-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.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 3xtrr54ZXPz9sxR\n\tfor ;\n\tFri, 15 Sep 2017 20:15:17 +1000 (AEST)","from localhost ([::1]:52357 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsneV-0006gI-NW\n\tfor incoming@patchwork.ozlabs.org; Fri, 15 Sep 2017 06:15:15 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37377)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsna0-0002GE-UV\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 06:10:38 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsnZz-0004Uq-Ji\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 06:10:36 -0400","from mx1.redhat.com ([209.132.183.28]:38690)\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 1dsnZs-0004Nq-UD; Fri, 15 Sep 2017 06:10:29 -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 11D3DC047B70;\n\tFri, 15 Sep 2017 10:10:28 +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 B472C66D5F;\n\tFri, 15 Sep 2017 10:10:26 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 11D3DC047B70","From":"Kevin Wolf ","To":"qemu-block@nongnu.org","Date":"Fri, 15 Sep 2017 12:10:08 +0200","Message-Id":"<20170915101008.16646-7-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.31]);\n\tFri, 15 Sep 2017 10:10:28 +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 6/6] block: Fix permissions after bdrv_reopen()","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":"If we switch between read-only and read-write, the permissions that\nimage format drivers need on bs->file change, too. Make sure to update\nthe permissions during bdrv_reopen().\n\nSigned-off-by: Kevin Wolf \n---\n include/block/block.h | 1 +\n block.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++\n 2 files changed, 65 insertions(+)","diff":"diff --git a/include/block/block.h b/include/block/block.h\nindex 082eb2cd9c..3c3af462e4 100644\n--- a/include/block/block.h\n+++ b/include/block/block.h\n@@ -166,6 +166,7 @@ typedef QSIMPLEQ_HEAD(BlockReopenQueue, BlockReopenQueueEntry) BlockReopenQueue;\n typedef struct BDRVReopenState {\n BlockDriverState *bs;\n int flags;\n+ uint64_t perm, shared_perm;\n QDict *options;\n QDict *explicit_options;\n void *opaque;\ndiff --git a/block.c b/block.c\nindex 204cbb46c7..5c65fac672 100644\n--- a/block.c\n+++ b/block.c\n@@ -2781,6 +2781,10 @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue,\n bs_entry->state.explicit_options = explicit_options;\n bs_entry->state.flags = flags;\n \n+ /* This needs to be overwritten in bdrv_reopen_prepare() */\n+ bs_entry->state.perm = UINT64_MAX;\n+ bs_entry->state.shared_perm = 0;\n+\n QLIST_FOREACH(child, &bs->children, next) {\n QDict *new_child_options;\n char *child_key_dot;\n@@ -2887,6 +2891,52 @@ int bdrv_reopen(BlockDriverState *bs, int bdrv_flags, Error **errp)\n return ret;\n }\n \n+static BlockReopenQueueEntry *find_parent_in_reopen_queue(BlockReopenQueue *q,\n+ BdrvChild *c)\n+{\n+ BlockReopenQueueEntry *entry;\n+\n+ QSIMPLEQ_FOREACH(entry, q, entry) {\n+ BlockDriverState *bs = entry->state.bs;\n+ BdrvChild *child;\n+\n+ QLIST_FOREACH(child, &bs->children, next) {\n+ if (child == c) {\n+ return entry;\n+ }\n+ }\n+ }\n+\n+ return NULL;\n+}\n+\n+static void bdrv_reopen_perm(BlockReopenQueue *q, BlockDriverState *bs,\n+ uint64_t *perm, uint64_t *shared)\n+{\n+ BdrvChild *c;\n+ BlockReopenQueueEntry *parent;\n+ uint64_t cumulative_perms = 0;\n+ uint64_t cumulative_shared_perms = BLK_PERM_ALL;\n+\n+ QLIST_FOREACH(c, &bs->parents, next_parent) {\n+ parent = find_parent_in_reopen_queue(q, c);\n+ if (!parent) {\n+ cumulative_perms |= c->perm;\n+ cumulative_shared_perms &= c->shared_perm;\n+ } else {\n+ uint64_t nperm, nshared;\n+\n+ bdrv_child_perm(parent->state.bs, bs, c, c->role, q,\n+ parent->state.perm, parent->state.shared_perm,\n+ &nperm, &nshared);\n+\n+ cumulative_perms |= nperm;\n+ cumulative_shared_perms &= nshared;\n+ }\n+ }\n+ *perm = cumulative_perms;\n+ *shared = cumulative_shared_perms;\n+}\n \n /*\n * Prepares a BlockDriverState for reopen. All changes are staged in the\n@@ -2952,6 +3002,9 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,\n goto error;\n }\n \n+ /* Calculate required permissions after reopening */\n+ bdrv_reopen_perm(queue, reopen_state->bs,\n+ &reopen_state->perm, &reopen_state->shared_perm);\n \n ret = bdrv_flush(reopen_state->bs);\n if (ret) {\n@@ -3007,6 +3060,12 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,\n } while ((entry = qdict_next(reopen_state->options, entry)));\n }\n \n+ ret = bdrv_check_perm(reopen_state->bs, queue, reopen_state->perm,\n+ reopen_state->shared_perm, NULL, errp);\n+ if (ret < 0) {\n+ goto error;\n+ }\n+\n ret = 0;\n \n error:\n@@ -3047,6 +3106,9 @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state)\n \n bdrv_refresh_limits(bs, NULL);\n \n+ bdrv_set_perm(reopen_state->bs, reopen_state->perm,\n+ reopen_state->shared_perm);\n+\n new_can_write =\n !bdrv_is_read_only(bs) && !(bdrv_get_flags(bs) & BDRV_O_INACTIVE);\n if (!old_can_write && new_can_write && drv->bdrv_reopen_bitmaps_rw) {\n@@ -3080,6 +3142,8 @@ void bdrv_reopen_abort(BDRVReopenState *reopen_state)\n }\n \n QDECREF(reopen_state->explicit_options);\n+\n+ bdrv_abort_perm_update(reopen_state->bs);\n }\n \n \n","prefixes":["6/6"]}