[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 05/16] block: Propagate BLK_PERM_AIO_CONTEXT_CHAN
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v3 05/16] block: Propagate BLK_PERM_AIO_CONTEXT_CHANGE down the graph |
Date: |
Wed, 24 May 2017 10:52:24 +0800 |
bdrv_set_aio_context can take care of children recursively, so it is
okay to pass down the perm.
Signed-off-by: Fam Zheng <address@hidden>
---
block.c | 10 ++++++----
block/vvfat.c | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/block.c b/block.c
index d98662f..1e5eae7 100644
--- a/block.c
+++ b/block.c
@@ -1772,7 +1772,8 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm,
uint64_t shared,
#define DEFAULT_PERM_PASSTHROUGH (BLK_PERM_CONSISTENT_READ \
| BLK_PERM_WRITE \
| BLK_PERM_WRITE_UNCHANGED \
- | BLK_PERM_RESIZE)
+ | BLK_PERM_RESIZE \
+ | BLK_PERM_AIO_CONTEXT_CHANGE)
#define DEFAULT_PERM_UNCHANGED (BLK_PERM_ALL & ~DEFAULT_PERM_PASSTHROUGH)
void bdrv_filter_default_perms(BlockDriverState *bs, BdrvChild *c,
@@ -1815,9 +1816,10 @@ void bdrv_format_default_perms(BlockDriverState *bs,
BdrvChild *c,
perm |= BLK_PERM_CONSISTENT_READ;
shared &= ~(BLK_PERM_WRITE | BLK_PERM_RESIZE);
} else {
- /* We want consistent read from backing files if the parent needs it.
+ /* We want consistent read and aio context change from backing files if
+ * the parent needs it.
* No other operations are performed on backing files. */
- perm &= BLK_PERM_CONSISTENT_READ;
+ perm &= BLK_PERM_CONSISTENT_READ | BLK_PERM_AIO_CONTEXT_CHANGE;
/* If the parent can deal with changing data, we're okay with a
* writable and resizable backing file. */
@@ -1829,7 +1831,7 @@ void bdrv_format_default_perms(BlockDriverState *bs,
BdrvChild *c,
}
shared |= BLK_PERM_CONSISTENT_READ | BLK_PERM_GRAPH_MOD |
- BLK_PERM_WRITE_UNCHANGED;
+ BLK_PERM_WRITE_UNCHANGED | BLK_PERM_AIO_CONTEXT_CHANGE;
}
if (bs->open_flags & BDRV_O_INACTIVE) {
diff --git a/block/vvfat.c b/block/vvfat.c
index 426ca70..599a370 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -3091,7 +3091,7 @@ static void vvfat_child_perm(BlockDriverState *bs,
BdrvChild *c,
if (c == s->qcow) {
/* This is a private node, nobody should try to attach to it */
*nperm = BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE;
- *nshared = BLK_PERM_WRITE_UNCHANGED;
+ *nshared = BLK_PERM_WRITE_UNCHANGED | BLK_PERM_AIO_CONTEXT_CHANGE;
} else {
/* The backing file is there so 'commit' can use it. vvfat doesn't
* access it in any way. */
--
2.9.4
- [Qemu-devel] [PATCH v3 00/16] block: Protect AIO context change with perm API, Fam Zheng, 2017/05/23
- [Qemu-devel] [PATCH v3 01/16] block: Define BLK_PERM_AIO_CONTEXT_CHANGE, Fam Zheng, 2017/05/23
- [Qemu-devel] [PATCH v3 02/16] block-backend: Add blk_request_perm, Fam Zheng, 2017/05/23
- [Qemu-devel] [PATCH v3 03/16] blockjob: Add BLK_PERM_AIO_CONTEXT_CHANGE shared perm on bs, Fam Zheng, 2017/05/23
- [Qemu-devel] [PATCH v3 04/16] blockjob: Allow aio context change on intermediate nodes, Fam Zheng, 2017/05/23
- [Qemu-devel] [PATCH v3 05/16] block: Propagate BLK_PERM_AIO_CONTEXT_CHANGE down the graph,
Fam Zheng <=
- [Qemu-devel] [PATCH v3 06/16] backup: Request BLK_PERM_AIO_CONTEXT_CHANGE on target, Fam Zheng, 2017/05/23
- [Qemu-devel] [PATCH v3 07/16] backup: Do initial aio context move of target via BB interface, Fam Zheng, 2017/05/23
- [Qemu-devel] [PATCH v3 08/16] mirror: Request aio context change permission on target, Fam Zheng, 2017/05/23
- [Qemu-devel] [PATCH v3 09/16] commit: Allow aio context change on s->base, Fam Zheng, 2017/05/23
- [Qemu-devel] [PATCH v3 11/16] virtio-scsi: Request BLK_PERM_AIO_CONTEXT_CHANGE for dataplane, Fam Zheng, 2017/05/23
- [Qemu-devel] [PATCH v3 10/16] mirror: Do initial aio context move of target via BB interface, Fam Zheng, 2017/05/23
- [Qemu-devel] [PATCH v3 12/16] virtio-blk: Request BLK_PERM_AIO_CONTEXT_CHANGE for dataplane, Fam Zheng, 2017/05/23
- [Qemu-devel] [PATCH v3 13/16] blk: fix aio context loss on media change, Fam Zheng, 2017/05/23
- [Qemu-devel] [PATCH v3 14/16] nbd: Allow BLK_PERM_AIO_CONTEXT_CHANGE on BB, Fam Zheng, 2017/05/23