fix & merge block_status_above and is_allocated_above
v3 cover fix & merge block_status_above and is_allocated_above
Hi all!
v3: fix regression in 01 [Eric]
These series are here to address the following problem:
block-status-above functions may consider space after EOF of intermediate backing files as unallocated, which is wrong, as these backing files are the reason of producing zeroes, we never go further by backing chain after a short backing file. So, if such short-backing file is _inside_ requested sub-chain of the backing chain, we should never report space after its EOF as unallocated.
See patches 01,04,05 for details.
Note, that this series leaves for another day the general problem around block-status: misuse of BDRV_BLOCK_ALLOCATED as is-fs-allocated vs go-to-backing.
Audit for this problem is done here:
"backing chain & block status & filters"
https://lists.gnu.org/archive/html/qemu-devel/2020-04/msg04706.html
And I'm going to prepare series to address this problem.
Also, get_block_status func have same disease, but remains unfixed here:
I want to make separate series for it, as it need some more refactoring, which should be based on patch
"[PATCH v2] block: Factor out bdrv_run_co()"
Vladimir Sementsov-Ogievskiy (5):
block/io: fix bdrv_co_block_status_above
block/io: bdrv_common_block_status_above: support include_base block/io: bdrv_common_block_status_above: support bs == base block/io: fix bdrv_is_allocated_above
iotests: add commit top->base cases to 274
block/io.c | 105 +++++++++++++++++++------------------ block/qcow2.c | 16 +++++- tests/qemu-iotests/274 | 20 +++++++ tests/qemu-iotests/274.out | 65 +++++++++++++++++++++++ 4 files changed, 152 insertions(+), 54 deletions(-)
Signature · 1 line
2.21.0
PATCH v3 1/5 block/io: fix bdrv_co_block_status_above
bdrv_co_block_status_above has several design problems with handling short backing files:
1. With want_zeros=true, it may return ret with BDRV_BLOCK_ZERO but without BDRV_BLOCK_ALLOCATED flag, when actually short backing file which produces these after-EOF zeros is inside requested backing sequence.
2. With want_zero=false, it may return pnum=0 prior to actual EOF, because of EOF of short backing file.
Fix these things, making logic about short backing files clearer.
With fixed bdrv_block_status_above we also have to improve is_zero in qcow2 code, otherwise iotest 154 will fail, because with this patch we stop to merge zeros of different types (produced by fully unallocated in the whole backing chain regions vs produced by short backing files).
Note also, that this patch leaves for another day the general problem around block-status: misuse of BDRV_BLOCK_ALLOCATED as is-fs-allocated vs go-to-backing.
--- block/io.c | 39 ++++++++++++++++++++++++++++++--------- block/qcow2.c | 16 ++++++++++++++-- 2 files changed, 44 insertions(+), 11 deletions(-)
block/io.c +30 -9
@@ -2461,25 +2461,46 @@ static int coroutine_fn bdrv_co_block_status_above(BlockDriverState *bs, ret =bdrv_co_block_status (p, want_zero, offset, bytes, pnum, map, file);if (ret <0 ) { -break ; +return ret; } -if (ret &BDRV_BLOCK_ZERO && ret &BDRV_BLOCK_EOF && !first) { +if (*pnum ==0 ) { +if (first) { +return ret; + } +/* -* Reading beyond the end of the file continues to read -* zeroes, but we can only widen the result to the -* unallocated length we learned from an earlier -* iteration. +* The top layer deferred to this layer, and because this layer is +* short, any zeroes that we synthesize beyond EOF behave as if they +* were allocated at this layer */ +assert (ret &BDRV_BLOCK_EOF ); *pnum = bytes; +if (file) { + *file = p; + } +return BDRV_BLOCK_ZERO |BDRV_BLOCK_ALLOCATED ; } -if (ret & (BDRV_BLOCK_ZERO |BDRV_BLOCK_DATA )) { -break ; +if (ret &BDRV_BLOCK_ALLOCATED ) { +/* We've found the node and the status, we must return. */ + +if (ret &BDRV_BLOCK_ZERO && ret &BDRV_BLOCK_EOF && !first) { +/* +* This level is also responsible for reads after EOF inside +* the unallocated region in the previous level. +*/ + *pnum = bytes; + } + +return ret; } +/* [offset, pnum] unallocated on this layer, which could be only * the first part of [offset, bytes]. */ - bytes =MIN (bytes, *pnum); +assert (*pnum <= bytes); + bytes = *pnum; first = false; } +return ret; }
block/qcow2.c +14 -2
@@ -3827,8 +3827,20 @@ static bool is_zero(BlockDriverState *bs, int64_t offset, int64_t bytes)if (!bytes) {return true; } - res =bdrv_block_status_above (bs,NULL , offset, bytes, &nr,NULL ,NULL ); -return res >=0 && (res &BDRV_BLOCK_ZERO ) && nr == bytes; + +/* +* bdrv_block_status_above doesn't merge different types of zeros, for +* example, zeros which comes from the region which is unallocated in +* the whole backing chain, and zeros which comes because of short backing +* file. So, we need a loop. +*/ +do { + res =bdrv_block_status_above (bs,NULL , offset, bytes, &nr,NULL ,NULL ); + offset += nr; + bytes -= nr; + }while (res >=0 && (res &BDRV_BLOCK_ZERO ) && nr && bytes); + +return res >=0 && (res &BDRV_BLOCK_ZERO ) && bytes ==0 ; } static coroutine_fn int qcow2_co_pwrite_zeroes(BlockDriverState *bs,
Signature · 1 line
2.21.0
Re: [PATCH v3 1/5] block/io: fix bdrv_co_block_status_above
Quoted 22 lines · Vladimir Sementsov-Ogievskiy
bdrv_co_block_status_abovehas several design problems with handling short backing files:1. With want_zeros=true, it may return ret with
BDRV_BLOCK_ZERObut withoutBDRV_BLOCK_ALLOCATEDflag, when actually short backing file which produces these after-EOF zeros is inside requested backing sequence.2. With want_zero=false, it may return pnum=0 prior to actual EOF, because of EOF of short backing file.
Fix these things, making logic about short backing files clearer.
With fixed
bdrv_block_status_abovewe also have to improveis_zeroin qcow2 code, otherwise iotest 154 will fail, because with this patch we stop to merge zeros of different types (produced by fully unallocated in the whole backing chain regions vs produced by short backing files).Note also, that this patch leaves for another day the general problem around block-status: misuse of
BDRV_BLOCK_ALLOCATEDas is-fs-allocated vs go-to-backing.
Quoted 5 lines
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/io.c | 39 ++++++++++++++++++++++++++++++--------- block/qcow2.c | 16 ++++++++++++++-- 2 files changed, 44 insertions(+), 11 deletions(-)
block/qcow2.c static bool is_zero(BlockDriverState *bs, int64_t offset, int64_t bytes) · line 3833
Quoted 11 lines
+++
b/block/qcow2.cblock/qcow2.c +4
-2@@ -3827,8 +3827,20 @@ static bool is_zero(BlockDriverState *bs, int64_t offset, int64_t bytes)if (!bytes) {return true; } - res =bdrv_block_status_above (bs,NULL , offset, bytes, &nr,NULL ,NULL ); -return res >=0 && (res &BDRV_BLOCK_ZERO ) && nr == bytes; + +/* +* bdrv_block_status_above doesn't merge different types of zeros, for +* example, zeros which comes from the region which is unallocated in
s/comes/come/
block/qcow2.c static bool is_zero(BlockDriverState *bs, int64_t offset, int64_t bytes) · line 3834
Quoted 1 line
block/qcow2.c +1
-0+* the whole backing chain, and zeros which comes because of short backing
and again, also s/of/of a/
Quoted 13 lines
block/qcow2.c +9
-0+* file. So, we need a loop. +*/ +do { + res =bdrv_block_status_above (bs,NULL , offset, bytes, &nr,NULL ,NULL ); + offset += nr; + bytes -= nr; + }while (res >=0 && (res &BDRV_BLOCK_ZERO ) && nr && bytes); + +return res >=0 && (res &BDRV_BLOCK_ZERO ) && bytes ==0 ; } static coroutine_fn int qcow2_co_pwrite_zeroes(BlockDriverState *bs,
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH v3 2/5 block/io: bdrv_common_block_status_above: support include_base
In reply to Vladimir Sementsov-OgievskiyIn order to reuse bdrv_common_block_status_above in bdrv_is_allocated_above, let's support include_base parameter.
--- block/io.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
block/io.c +14 -5
@@ -2223,6 +2223,7 @@ int bdrv_flush_all(void) typedef struct BdrvCoBlockStatusData { BlockDriverState *bs; BlockDriverState *base; + bool include_base; bool want_zero; int64_t offset; int64_t bytes;
@@ -2445,6 +2446,7 @@ early_out: static int coroutine_fn bdrv_co_block_status_above(BlockDriverState *bs, BlockDriverState *base, + bool include_base, bool want_zero, int64_t offset, int64_t bytes,
@@ -2456,8 +2458,8 @@ static int coroutine_fn bdrv_co_block_status_above(BlockDriverState *bs,int ret =0 ;bool first = true; -assert (bs != base); -for (p = bs; p != base; p =backing_bs (p)) { +assert (include_base || bs != base); +for (p = bs; include_base || p != base; p =backing_bs (p)) { ret =bdrv_co_block_status (p, want_zero, offset, bytes, pnum, map, file);if (ret <0 ) {
@@ -2496,6 +2498,11 @@ static int coroutine_fn bdrv_co_block_status_above(BlockDriverState *bs,/* [offset, pnum] unallocated on this layer, which could be only * the first part of [offset, bytes]. */ + +if (p == base) { +break ; + } +assert (*pnum <= bytes); bytes = *pnum; first = false;
@@ -2510,7 +2517,7 @@ static void coroutine_fn bdrv_block_status_above_co_entry(void *opaque)BdrvCoBlockStatusData *data = opaque; data->ret =bdrv_co_block_status_above (data->bs, data->base, - data->want_zero, + data->include_base, data->want_zero, data->offset, data->bytes, data->pnum, data->map, data->file); data->done = true;
@@ -2524,6 +2531,7 @@ static void coroutine_fn bdrv_block_status_above_co_entry(void *opaque)*/ static int bdrv_common_block_status_above(BlockDriverState *bs, BlockDriverState *base, + bool include_base, bool want_zero, int64_t offset, int64_t bytes, int64_t *pnum, int64_t *map,
@@ -2533,6 +2541,7 @@ static int bdrv_common_block_status_above(BlockDriverState *bs,BdrvCoBlockStatusData data = { .bs = bs, .base = base, + .include_base = include_base, .want_zero = want_zero, .offset = offset, .bytes = bytes,
@@ -2557,7 +2566,7 @@ int bdrv_block_status_above(BlockDriverState *bs, BlockDriverState *base, int64_t offset, int64_t bytes, int64_t *pnum, int64_t *map, BlockDriverState **file) { - return bdrv_common_block_status_above(bs, base, true, offset, bytes, + return bdrv_common_block_status_above(bs, base, false, true, offset, bytes,pnum ,map ,file ); }
@@ -2574,7 +2583,7 @@ int coroutine_fn bdrv_is_allocated(BlockDriverState *bs, int64_t offset,int ret;int64_t dummy; - ret =bdrv_common_block_status_above (bs,backing_bs (bs), false, offset, + ret =bdrv_common_block_status_above (bs, bs, true, false, offset, bytes, pnum ? pnum : &dummy,NULL ,NULL );if (ret <0 ) {
Signature · 1 line
2.21.0
Re: [PATCH v3 2/5] block/io: bdrv_common_block_status_above: support include_base
Quoted 8 lines · Vladimir Sementsov-Ogievskiy
In order to reuse
bdrv_common_block_status_aboveinbdrv_is_allocated_above, let's supportinclude_baseparameter.Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>Reviewed-by Kevin Wolf <[email protected]>--- block/io.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH v3 3/5 block/io: bdrv_common_block_status_above: support bs == base
In reply to Vladimir Sementsov-OgievskiyWe are going to reuse bdrv_common_block_status_above in bdrv_is_allocated_above. bdrv_is_allocated_above may be called with include_base == false and still bs == base (for ex. from img_rebase()).
So, support this corner case.
--- block/io.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
block/io.c +5 -1
@@ -2458,7 +2458,11 @@ static int coroutine_fn bdrv_co_block_status_above(BlockDriverState *bs,int ret =0 ;bool first = true; -assert (include_base || bs != base); +if (!include_base && bs == base) { + *pnum = bytes; +return 0 ; + } +for (p = bs; include_base || p != base; p =backing_bs (p)) { ret =bdrv_co_block_status (p, want_zero, offset, bytes, pnum, map, file);
Signature · 1 line
2.21.0
Re: [PATCH v3 3/5] block/io: bdrv_common_block_status_above: support bs == base
Quoted 4 lines · Vladimir Sementsov-Ogievskiy
We are going to reuse
bdrv_common_block_status_aboveinbdrv_is_allocated_above.bdrv_is_allocated_abovemay be called withinclude_base== false and still bs == base (for ex. fromimg_rebase()).
Quoted 8 lines
So, support this corner case.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>Reviewed-by Kevin Wolf <[email protected]>--- block/io.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Quoted 18 lines
block/io.c +5
-1@@ -2458,7 +2458,11 @@ static int coroutine_fn bdrv_co_block_status_above(BlockDriverState *bs,int ret =0 ;bool first = true; -assert (include_base || bs != base); +if (!include_base && bs == base) { + *pnum = bytes; +return 0 ; + } +for (p = bs; include_base || p != base; p =backing_bs (p)) { ret =bdrv_co_block_status (p, want_zero, offset, bytes, pnum, map, file);
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH v3 4/5 block/io: fix bdrv_is_allocated_above
In reply to Vladimir Sementsov-Ogievskiybdrv_is_allocated_above wrongly handles short backing files: it reports after-EOF space as UNALLOCATED which is wrong, as on read the data is generated on the level of short backing file (if all overlays has unallocated area at that place).
Reusing bdrv_common_block_status_above fixes the issue and unifies code path.
--- block/io.c | 43 +++++-------------------------------------- 1 file changed, 5 insertions(+), 38 deletions(-)
block/io.c +5 -38
@@ -2611,52 +2611,19 @@ int coroutine_fn bdrv_is_allocated(BlockDriverState *bs, int64_t offset,* at 'offset + *pnum' may return the same allocation status (in other * words, the result is not necessarily the maximum possible range); * but 'pnum' will only be 0 when end of file is reached. -* */ int bdrv_is_allocated_above (BlockDriverState *top,BlockDriverState *base,bool include_base,int64_t offset,int64_t bytes,int64_t *pnum) { -BlockDriverState *intermediate; -int ret; -int64_t n = bytes; - -assert (base || !include_base); - - intermediate = top; -while (include_base || intermediate != base) { -int64_t pnum_inter; -int64_t size_inter; - -assert (intermediate); - ret =bdrv_is_allocated (intermediate, offset, bytes, &pnum_inter); -if (ret <0 ) { -return ret; - } -if (ret) { - *pnum = pnum_inter; -return 1 ; - } - - size_inter =bdrv_getlength (intermediate); -if (size_inter <0 ) { -return size_inter; - } -if (n > pnum_inter && - (intermediate == top || offset + pnum_inter < size_inter)) { - n = pnum_inter; - } - -if (intermediate == base) { -break ; - } - - intermediate =backing_bs (intermediate); +int ret =bdrv_common_block_status_above (top, base, include_base, false, + offset, bytes, pnum,NULL ,NULL ); +if (ret <0 ) { +return ret; } - *pnum = n; -return 0 ; +return !!(ret &BDRV_BLOCK_ALLOCATED ); } typedef struct BdrvVmstateCo {
Signature · 1 line
2.21.0
Re: [PATCH v3 4/5] block/io: fix bdrv_is_allocated_above
Quoted 5 lines · Vladimir Sementsov-Ogievskiy
bdrv_is_allocated_abovewrongly handles short backing files: it reports after-EOF space as UNALLOCATED which is wrong, as on read the data is generated on the level of short backing file (if all overlays has unallocated area at that place).
Quoted 8 lines
Reusing
bdrv_common_block_status_abovefixes the issue and unifies code path.Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/io.c | 43 +++++-------------------------------------- 1 file changed, 5 insertions(+), 38 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH v3 5/5 iotests: add commit top->base cases to 274
In reply to Vladimir Sementsov-OgievskiyThese cases are fixed by previous patches around block_status and is_allocated.
--- tests/qemu-iotests/274 | 20 ++++++++++++ tests/qemu-iotests/274.out | 65 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+)
tests/qemu-iotests/274 +20 -0
@@ -115,6 +115,26 @@ with iotests.FilePath('base') as base, \ iotests.qemu_io_log('-c', 'read -P 1 0 %d' % size_short, mid) iotests.qemu_io_log('-c', 'read -P 0 %d %d' % (size_short, size_diff), mid) + iotests.log('=== Testing qemu-img commit (top -> base) ===') + + create_chain() + iotests.qemu_img_log('commit', '-b', base, top) + iotests.img_info_log(base) + iotests.qemu_io_log('-c', 'read -P 1 0 %d' % size_short, base) + iotests.qemu_io_log('-c', 'read -P 0 %d %d' % (size_short, size_diff), base) + + iotests.log('=== Testing QMP active commit (top -> base) ===') + + create_chain() + with create_vm() as vm: + vm.launch() + vm.qmp_log('block-commit', device='top', base_node='base', + job_id='job0', auto_dismiss=False) + vm.run_job('job0', wait=5) + + iotests.img_info_log(mid) + iotests.qemu_io_log('-c', 'read -P 1 0 %d' % size_short, base) + iotests.qemu_io_log('-c', 'read -P 0 %d %d' % (size_short, size_diff), base) iotests.log('== Resize tests ==')
tests/qemu-iotests/274.out +65 -0
71 lines not on this page · raw message
Signature · 1 line
2.21.0
Re: [PATCH v3 5/5] iotests: add commit top->base cases to 274
Quoted 9 lines · Vladimir Sementsov-Ogievskiy
These cases are fixed by previous patches around
block_statusandis_allocated.Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/274 | 20 ++++++++++++ tests/qemu-iotests/274.out | 65 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH v3 5/5] iotests: add commit top->base cases to 274
Quoted 4 lines · Eric Blake
Quoted 3 lines · Vladimir Sementsov-Ogievskiy
These cases are fixed by previous patches around
block_statusandis_allocated.
Quoted 8 lines
Quoted 6 lines
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>---
tests/qemu-iotests/274 | 20 ++++++++++++ tests/qemu-iotests/274.out | 65 ++++++++++++++++++++++++++++++++++++++2 files changed, 85 insertions(+)Reviewed-by Eric Blake <[email protected]>
Thanks a lot!
Signature · 2 lines
Best regards, Vladimir