quorum: Implement bdrv_co_block_status()
v4 cover quorum: Implement bdrv_co_block_status()
Following Max's suggestion, this version sets supported_zero_flags.
Berto
v4:
- Set supported_zero_flags in quorum [Max]
- Update test to verify the data written before doing 'write -z' [Max]
v3: https://lists.gnu.org/archive/html/qemu-block/2020-11/msg00371.html
- Fall back to BDRV_BLOCK_DATA if a child returns an error.
v2: https://lists.gnu.org/archive/html/qemu-block/2020-11/msg00259.html
- Implement bdrv_co_pwrite_zeroes() for quorum
v1: https://lists.gnu.org/archive/html/qemu-block/2020-11/msg00163.html
Alberto Garcia (2):
quorum: Implement bdrv_co_block_status()
quorum: Implement bdrv_co_pwrite_zeroes()
block/quorum.c | 88 +++++++++++++++++++- tests/qemu-iotests/312 | 159 +++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/312.out | 75 +++++++++++++++++ tests/qemu-iotests/group | 1 + 4 files changed, 321 insertions(+), 2 deletions(-) create mode 100755 tests/qemu-iotests/312 create mode 100644 tests/qemu-iotests/312.out
Signature · 1 line
2.20.1
PATCH v4 1/2 quorum: Implement bdrv_co_block_status()
The quorum driver does not implement bdrv_co_block_status() and because of that it always reports to contain data even if all its children are known to be empty.
One consequence of this is that if we for example create a quorum with a size of 10GB and we mirror it to a new image the operation will write 10GB of actual zeroes to the destination image wasting a lot of time and disk space.
Since a quorum has an arbitrary number of children of potentially different formats there is no way to report all possible allocation status flags in a way that makes sense, so this implementation only reports when a given region is known to contain zeroes (BDRV_BLOCK_ZERO) or not (BDRV_BLOCK_DATA).
If all children agree that a region contains zeroes then we can return BDRV_BLOCK_ZERO using the smallest size reported by the children (because all agree that a region of at least that size contains zeroes).
If at least one child disagrees we have to return BDRV_BLOCK_DATA. In this case we use the largest of the sizes reported by the children that didn't return BDRV_BLOCK_ZERO (because we know that there won't be an agreement for at least that size).
--- block/quorum.c | 52 +++++++++++++ tests/qemu-iotests/312 | 148 +++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/312.out | 67 +++++++++++++++++ tests/qemu-iotests/group | 1 + 4 files changed, 268 insertions(+) create mode 100755 tests/qemu-iotests/312 create mode 100644 tests/qemu-iotests/312.out
block/quorum.c +52 -0
@@ -18,6 +18,7 @@#include "qemu/module.h" #include "qemu/option.h" #include "block/block_int.h" +#include "block/coroutines.h" #include "block/qdict.h" #include "qapi/error.h" #include "qapi/qapi-events-block.h"
@@ -1174,6 +1175,56 @@ static void quorum_child_perm(BlockDriverState *bs, BdrvChild *c, | DEFAULT_PERM_UNCHANGED; } +/* +* Each one of the children can report different status flags even +* when they contain the same data, so what this function does is +* return BDRV_BLOCK_ZERO if *all* children agree that a certain +* region contains zeroes, and BDRV_BLOCK_DATA otherwise. +*/ +static int coroutine_fn quorum_co_block_status(BlockDriverState *bs, +bool want_zero, +int64_t offset,int64_t count, +int64_t *pnum,int64_t *map, +BlockDriverState **file) +{ +BDRVQuorumState *s = bs->opaque; +int i, ret; +int64_t pnum_zero = count; +int64_t pnum_data =0 ; + +for (i =0 ; i < s->num_children; i++) { +int64_t bytes; + ret =bdrv_co_common_block_status_above (s->children[i]->bs,NULL , false, + want_zero, offset, count, + &bytes,NULL ,NULL ,NULL ); +if (ret <0 ) { +quorum_report_bad (QUORUM_OP_TYPE_READ , offset, count, + s->children[i]->bs->node_name, ret); + pnum_data = count; +break ; + } +/* +* Even if all children agree about whether there are zeroes +* or not at @offset they might disagree on the size, so use +* the smallest when reporting BDRV_BLOCK_ZERO and the largest +* when reporting BDRV_BLOCK_DATA. +*/ +if (ret &BDRV_BLOCK_ZERO ) { + pnum_zero =MIN (pnum_zero, bytes); + }else { + pnum_data =MAX (pnum_data, bytes); + } + } + +if (pnum_data) { + *pnum = pnum_data; +return BDRV_BLOCK_DATA ; + }else { + *pnum = pnum_zero; +return BDRV_BLOCK_ZERO ; + } +} +static const char *const quorum_strong_runtime_opts[] = {QUORUM_OPT_VOTE_THRESHOLD ,QUORUM_OPT_BLKVERIFY ,
@@ -1192,6 +1243,7 @@ static BlockDriver bdrv_quorum = { .bdrv_close = quorum_close, .bdrv_gather_child_options = quorum_gather_child_options, .bdrv_dirname = quorum_dirname, + .bdrv_co_block_status = quorum_co_block_status, .bdrv_co_flush_to_disk = quorum_co_flush,
tests/qemu-iotests/312 new file +148 -0
148 lines not on this page · raw message
tests/qemu-iotests/312.out new file +67 -0
67 lines not on this page · raw message
tests/qemu-iotests/group +1 -0
@@ -316,3 +316,4 @@ 305 rw quick 307 rw quick export 309 rw auto quick +312 rw auto quick
Signature · 1 line
2.20.1
PATCH v4 2/2 quorum: Implement bdrv_co_pwrite_zeroes()
In reply to Alberto GarciaThis simply calls bdrv_co_pwrite_zeroes() in all children.
bs->supported_zero_flags is also set to the flags that are supported by all children.
--- block/quorum.c | 36 ++++++++++++++++++++++++++++++++++-- tests/qemu-iotests/312 | 11 +++++++++++ tests/qemu-iotests/312.out | 8 ++++++++ 3 files changed, 53 insertions(+), 2 deletions(-)
block/quorum.c +34 -2
@@ -692,8 +692,13 @@ static void write_quorum_entry(void *opaque)QuorumChildRequest *sacb = &acb->qcrs[i]; sacb->bs = s->children[i]->bs; - sacb->ret =bdrv_co_pwritev (s->children[i], acb->offset, acb->bytes, - acb->qiov, acb->flags); +if (acb->flags &BDRV_REQ_ZERO_WRITE ) { + sacb->ret =bdrv_co_pwrite_zeroes (s->children[i], acb->offset, + acb->bytes, acb->flags); + }else { + sacb->ret =bdrv_co_pwritev (s->children[i], acb->offset, acb->bytes, + acb->qiov, acb->flags); + }if (sacb->ret ==0 ) { acb->success_count++; }else {
@@ -739,6 +744,14 @@ static int quorum_co_pwritev(BlockDriverState *bs, uint64_t offset,return ret; } +static int quorum_co_pwrite_zeroes (BlockDriverState *bs,int64_t offset, +int bytes,BdrvRequestFlags flags) + +{ +return quorum_co_pwritev (bs, offset, bytes,NULL , + flags |BDRV_REQ_ZERO_WRITE ); +} +static int64_t quorum_getlength (BlockDriverState *bs) {BDRVQuorumState *s = bs->opaque;
@@ -897,6 +910,21 @@ static QemuOptsList quorum_runtime_opts = { }, }; +static void quorum_refresh_flags (BlockDriverState *bs) +{ +BDRVQuorumState *s = bs->opaque; +int i; + + bs->supported_zero_flags = +BDRV_REQ_FUA |BDRV_REQ_MAY_UNMAP |BDRV_REQ_NO_FALLBACK ; + +for (i =0 ; i < s->num_children; i++) { + bs->supported_zero_flags &= s->children[i]->bs->supported_zero_flags; + } + + bs->supported_zero_flags |=BDRV_REQ_WRITE_UNCHANGED ; +} +static int quorum_open (BlockDriverState *bs,QDict *options,int flags,Error **errp) {
@@ -991,6 +1019,7 @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags, s->next_child_index = s->num_children; bs->supported_write_flags =BDRV_REQ_WRITE_UNCHANGED ; +quorum_refresh_flags (bs);g_free (opened); goto exit;
@@ -1062,6 +1091,7 @@ static void quorum_add_child(BlockDriverState *bs, BlockDriverState *child_bs, } s->children = g_renew(BdrvChild *, s->children, s->num_children + 1); s->children[s->num_children++] = child; +quorum_refresh_flags (bs); out:bdrv_drained_end (bs);
@@ -1106,6 +1136,7 @@ static void quorum_del_child(BlockDriverState *bs, BdrvChild *child, s->children = g_renew(BdrvChild *, s->children, --s->num_children);bdrv_unref_child (bs, child); +quorum_refresh_flags (bs);bdrv_drained_end (bs); }
@@ -1251,6 +1282,7 @@ static BlockDriver bdrv_quorum = { .bdrv_co_preadv = quorum_co_preadv, .bdrv_co_pwritev = quorum_co_pwritev, + .bdrv_co_pwrite_zeroes = quorum_co_pwrite_zeroes, .bdrv_add_child = quorum_add_child, .bdrv_del_child = quorum_del_child,
tests/qemu-iotests/312 +11 -0
@@ -114,6 +114,17 @@ $QEMU_IO -c "write -P 0 $((0x200000)) $((0x10000))" "$TEST_IMG.0" | _filter_qemu $QEMU_IO -c "write -z $((0x200000)) $((0x30000))" "$TEST_IMG.1" | _filter_qemu_io $QEMU_IO -c "write -P 0 $((0x200000)) $((0x20000))" "$TEST_IMG.2" | _filter_qemu_io +# Test 5: write data to a region and then zeroize it, doing it +# directly on the quorum device instead of the individual images. +# This has no effect on the end result but proves that the quorum driver +# supports 'write -z'. +$QEMU_IO -c "open -o $quorum" -c "write -P 1 $((0x250000)) $((0x10000))" | _filter_qemu_io +# Verify the data that we just wrote +$QEMU_IO -c "open -o $quorum" -c "read -P 1 $((0x250000)) $((0x10000))" | _filter_qemu_io +$QEMU_IO -c "open -o $quorum" -c "write -z $((0x250000)) $((0x10000))" | _filter_qemu_io +# Now it should read back as zeroes +$QEMU_IO -c "open -o $quorum" -c "read -P 0 $((0x250000)) $((0x10000))" | _filter_qemu_io + echo echo '### Launch the drive-mirror job' echo
tests/qemu-iotests/312.out +8 -0
@@ -39,6 +39,14 @@ wrote 196608/196608 bytes at offset 2097152 192 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 131072/131072 bytes at offset 2097152 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 65536/65536 bytes at offset 2424832 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 65536/65536 bytes at offset 2424832 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 65536/65536 bytes at offset 2424832 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 65536/65536 bytes at offset 2424832 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) ### Launch the drive-mirror job
Signature · 1 line
2.20.1
Re: [PATCH v4 2/2] quorum: Implement bdrv_co_pwrite_zeroes()
Quoted 11 lines · Alberto Garcia
This simply calls
bdrv_co_pwrite_zeroes()in all children.
bs->supported_zero_flagsis also set to the flags that are supported by all children.Signed-off-by Alberto Garcia <[email protected]>--- block/quorum.c | 36 ++++++++++++++++++++++++++++++++++-- tests/qemu-iotests/312 | 11 +++++++++++ tests/qemu-iotests/312.out | 8 ++++++++ 3 files changed, 53 insertions(+), 2 deletions(-)
Quoted 7 lines
block/quorum.c +3
-0@@ -897,6 +910,21 @@ static QemuOptsList quorum_runtime_opts = { }, }; +static void quorum_refresh_flags (BlockDriverState *bs) +{ +BDRVQuorumState *s = bs->opaque;
block/quorum.c static QemuOptsList quorum_runtime_opts = { · line 925
Quoted 10 lines
block/quorum.c +10
-0+int i; + + bs->supported_zero_flags = +BDRV_REQ_FUA |BDRV_REQ_MAY_UNMAP |BDRV_REQ_NO_FALLBACK ; + +for (i =0 ; i < s->num_children; i++) { + bs->supported_zero_flags &= s->children[i]->bs->supported_zero_flags; + } + + bs->supported_zero_flags |=BDRV_REQ_WRITE_UNCHANGED ;
This made me wonder whether it’s true when rewrite_corrupted is set. I think it is, because that only does something when reading from the children (i.e. not for write requests from parents, where this flag might be set).
Looking into quorum_child_perm(), quorum doesn’t take the WRITE permission on its children even if rewrite_corrupted is true. Hm... Something to look into.
Max
Quoted 5 lines
block/quorum.c +2
-0+} +static int quorum_open (BlockDriverState *bs,QDict *options,int flags,Error **errp) {
Max Reitz
AppliedQuoted 14 lines · Alberto Garcia
Following Max's suggestion, this version sets
supported_zero_flags.Berto
v4:
- Setsupported_zero_flagsin quorum [Max]
- Update test to verify the data written before doing 'write -z' [Max]v3: https://lists.gnu.org/archive/html/qemu-block/2020-11/msg00371.html
- Fall back toBDRV_BLOCK_DATAif a child returns an error.v2: https://lists.gnu.org/archive/html/qemu-block/2020-11/msg00259.html
- Implementbdrv_co_pwrite_zeroes()for quorum
Quoted 6 lines
v1: https://lists.gnu.org/archive/html/qemu-block/2020-11/msg00163.html
Alberto Garcia (2):
quorum: Implementbdrv_co_block_status()
quorum: Implementbdrv_co_pwrite_zeroes()
Thanks, applied to my block-next branch (for 6.0):
https://git.xanclic.moe/XanClic/qemu/commits/branch/block-next
Max