* [PATCH v2 0/2] qemu-img convert: Fix sparseness detection
@ 2021-12-17 16:46 Vladimir Sementsov-Ogievskiy
2021-12-17 16:46 ` [PATCH v2 1/2] iotests: Test qemu-img convert of zeroed data cluster Vladimir Sementsov-Ogievskiy
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Vladimir Sementsov-Ogievskiy @ 2021-12-17 16:46 UTC (permalink / raw)
To: qemu-block; +Cc: qemu-devel, hreitz, kwolf, vsementsov, pl
Hi all!
01: only update test output rebasing on master
02: replaced with my proposed solution.
Kevin Wolf (1):
iotests: Test qemu-img convert of zeroed data cluster
Vladimir Sementsov-Ogievskiy (1):
qemu-img: make is_allocated_sectors() more efficient
qemu-img.c | 23 +++++++++++++++++++----
tests/qemu-iotests/122 | 1 +
tests/qemu-iotests/122.out | 2 ++
3 files changed, 22 insertions(+), 4 deletions(-)
--
2.31.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/2] iotests: Test qemu-img convert of zeroed data cluster
2021-12-17 16:46 [PATCH v2 0/2] qemu-img convert: Fix sparseness detection Vladimir Sementsov-Ogievskiy
@ 2021-12-17 16:46 ` Vladimir Sementsov-Ogievskiy
2021-12-17 16:46 ` [PATCH v2 2/2] qemu-img: make is_allocated_sectors() more efficient Vladimir Sementsov-Ogievskiy
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Vladimir Sementsov-Ogievskiy @ 2021-12-17 16:46 UTC (permalink / raw)
To: qemu-block; +Cc: qemu-devel, hreitz, kwolf, vsementsov, pl
From: Kevin Wolf <kwolf@redhat.com>
This demonstrates what happens when the block status changes in
sub-min_sparse granularity, but all of the parts are zeroed out. The
alignment logic in is_allocated_sectors() prevents that the target image
remains fully sparse as expected, but turns it into a data cluster of
explicit zeros.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
tests/qemu-iotests/122 | 1 +
tests/qemu-iotests/122.out | 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122
index efb260d822..be0f6b79e5 100755
--- a/tests/qemu-iotests/122
+++ b/tests/qemu-iotests/122
@@ -251,6 +251,7 @@ $QEMU_IO -c "write -P 0 0 64k" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_test
$QEMU_IO -c "write 0 1k" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
$QEMU_IO -c "write 8k 1k" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
$QEMU_IO -c "write 17k 1k" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
+$QEMU_IO -c "write -P 0 65k 1k" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
for min_sparse in 4k 8k; do
echo
diff --git a/tests/qemu-iotests/122.out b/tests/qemu-iotests/122.out
index 8fbdac2b39..69b8e8b803 100644
--- a/tests/qemu-iotests/122.out
+++ b/tests/qemu-iotests/122.out
@@ -192,6 +192,8 @@ wrote 1024/1024 bytes at offset 8192
1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
wrote 1024/1024 bytes at offset 17408
1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 1024/1024 bytes at offset 66560
+1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
convert -S 4k
[{ "start": 0, "length": 4096, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET},
@@ -199,7 +201,9 @@ convert -S 4k
{ "start": 8192, "length": 4096, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET},
{ "start": 12288, "length": 4096, "depth": 0, "present": false, "zero": true, "data": false},
{ "start": 16384, "length": 4096, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET},
-{ "start": 20480, "length": 67088384, "depth": 0, "present": false, "zero": true, "data": false}]
+{ "start": 20480, "length": 46080, "depth": 0, "present": false, "zero": true, "data": false},
+{ "start": 66560, "length": 1024, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 67584, "length": 67041280, "depth": 0, "present": false, "zero": true, "data": false}]
convert -c -S 4k
[{ "start": 0, "length": 1024, "depth": 0, "present": true, "zero": false, "data": true},
@@ -211,7 +215,9 @@ convert -c -S 4k
convert -S 8k
[{ "start": 0, "length": 24576, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET},
-{ "start": 24576, "length": 67084288, "depth": 0, "present": false, "zero": true, "data": false}]
+{ "start": 24576, "length": 41984, "depth": 0, "present": false, "zero": true, "data": false},
+{ "start": 66560, "length": 1024, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 67584, "length": 67041280, "depth": 0, "present": false, "zero": true, "data": false}]
convert -c -S 8k
[{ "start": 0, "length": 1024, "depth": 0, "present": true, "zero": false, "data": true},
--
2.31.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] qemu-img: make is_allocated_sectors() more efficient
2021-12-17 16:46 [PATCH v2 0/2] qemu-img convert: Fix sparseness detection Vladimir Sementsov-Ogievskiy
2021-12-17 16:46 ` [PATCH v2 1/2] iotests: Test qemu-img convert of zeroed data cluster Vladimir Sementsov-Ogievskiy
@ 2021-12-17 16:46 ` Vladimir Sementsov-Ogievskiy
2021-12-21 12:11 ` [PATCH v2 0/2] qemu-img convert: Fix sparseness detection Peter Lieven
2022-01-12 12:28 ` Kevin Wolf
3 siblings, 0 replies; 5+ messages in thread
From: Vladimir Sementsov-Ogievskiy @ 2021-12-17 16:46 UTC (permalink / raw)
To: qemu-block; +Cc: qemu-devel, hreitz, kwolf, vsementsov, pl
Consider the case when the whole buffer is zero and end is unaligned.
If i <= tail, we return 1 and do one unaligned WRITE, RMW happens.
If i > tail, we do on aligned WRITE_ZERO (or skip if target is zeroed)
and again one unaligned WRITE, RMW happens.
Let's do better: don't fragment the whole-zero buffer and report it as
ZERO: in case of zeroed target we just do nothing and avoid RMW. If
target is not zeroes, one unaligned WRITE_ZERO should not be much worse
than one unaligned WRITE.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
qemu-img.c | 23 +++++++++++++++++++----
tests/qemu-iotests/122.out | 8 ++------
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index f036a1d428..d7ddfcc528 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1171,19 +1171,34 @@ static int is_allocated_sectors(const uint8_t *buf, int n, int *pnum,
}
}
+ if (i == n) {
+ /*
+ * The whole buf is the same.
+ * No reason to split it into chunks, so return now.
+ */
+ *pnum = i;
+ return !is_zero;
+ }
+
tail = (sector_num + i) & (alignment - 1);
if (tail) {
if (is_zero && i <= tail) {
- /* treat unallocated areas which only consist
- * of a small tail as allocated. */
+ /*
+ * For sure next sector after i is data, and it will rewrite this
+ * tail anyway due to RMW. So, let's just write data now.
+ */
is_zero = false;
}
if (!is_zero) {
- /* align up end offset of allocated areas. */
+ /* If possible, align up end offset of allocated areas. */
i += alignment - tail;
i = MIN(i, n);
} else {
- /* align down end offset of zero areas. */
+ /*
+ * For sure next sector after i is data, and it will rewrite this
+ * tail anyway due to RMW. Better is avoid RMW and write zeroes up
+ * to aligned bound.
+ */
i -= tail;
}
}
diff --git a/tests/qemu-iotests/122.out b/tests/qemu-iotests/122.out
index 69b8e8b803..e18766e167 100644
--- a/tests/qemu-iotests/122.out
+++ b/tests/qemu-iotests/122.out
@@ -201,9 +201,7 @@ convert -S 4k
{ "start": 8192, "length": 4096, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET},
{ "start": 12288, "length": 4096, "depth": 0, "present": false, "zero": true, "data": false},
{ "start": 16384, "length": 4096, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET},
-{ "start": 20480, "length": 46080, "depth": 0, "present": false, "zero": true, "data": false},
-{ "start": 66560, "length": 1024, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET},
-{ "start": 67584, "length": 67041280, "depth": 0, "present": false, "zero": true, "data": false}]
+{ "start": 20480, "length": 67088384, "depth": 0, "present": false, "zero": true, "data": false}]
convert -c -S 4k
[{ "start": 0, "length": 1024, "depth": 0, "present": true, "zero": false, "data": true},
@@ -215,9 +213,7 @@ convert -c -S 4k
convert -S 8k
[{ "start": 0, "length": 24576, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET},
-{ "start": 24576, "length": 41984, "depth": 0, "present": false, "zero": true, "data": false},
-{ "start": 66560, "length": 1024, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET},
-{ "start": 67584, "length": 67041280, "depth": 0, "present": false, "zero": true, "data": false}]
+{ "start": 24576, "length": 67084288, "depth": 0, "present": false, "zero": true, "data": false}]
convert -c -S 8k
[{ "start": 0, "length": 1024, "depth": 0, "present": true, "zero": false, "data": true},
--
2.31.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 0/2] qemu-img convert: Fix sparseness detection
2021-12-17 16:46 [PATCH v2 0/2] qemu-img convert: Fix sparseness detection Vladimir Sementsov-Ogievskiy
2021-12-17 16:46 ` [PATCH v2 1/2] iotests: Test qemu-img convert of zeroed data cluster Vladimir Sementsov-Ogievskiy
2021-12-17 16:46 ` [PATCH v2 2/2] qemu-img: make is_allocated_sectors() more efficient Vladimir Sementsov-Ogievskiy
@ 2021-12-21 12:11 ` Peter Lieven
2022-01-12 12:28 ` Kevin Wolf
3 siblings, 0 replies; 5+ messages in thread
From: Peter Lieven @ 2021-12-21 12:11 UTC (permalink / raw)
To: Vladimir Sementsov-Ogievskiy, qemu-block; +Cc: kwolf, hreitz, qemu-devel
Am 17.12.21 um 17:46 schrieb Vladimir Sementsov-Ogievskiy:
> Hi all!
>
> 01: only update test output rebasing on master
> 02: replaced with my proposed solution.
>
> Kevin Wolf (1):
> iotests: Test qemu-img convert of zeroed data cluster
>
> Vladimir Sementsov-Ogievskiy (1):
> qemu-img: make is_allocated_sectors() more efficient
>
> qemu-img.c | 23 +++++++++++++++++++----
> tests/qemu-iotests/122 | 1 +
> tests/qemu-iotests/122.out | 2 ++
> 3 files changed, 22 insertions(+), 4 deletions(-)
>
Tested-by: Peter Lieven <pl@kamp.de>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 0/2] qemu-img convert: Fix sparseness detection
2021-12-17 16:46 [PATCH v2 0/2] qemu-img convert: Fix sparseness detection Vladimir Sementsov-Ogievskiy
` (2 preceding siblings ...)
2021-12-21 12:11 ` [PATCH v2 0/2] qemu-img convert: Fix sparseness detection Peter Lieven
@ 2022-01-12 12:28 ` Kevin Wolf
3 siblings, 0 replies; 5+ messages in thread
From: Kevin Wolf @ 2022-01-12 12:28 UTC (permalink / raw)
To: Vladimir Sementsov-Ogievskiy; +Cc: hreitz, pl, qemu-devel, qemu-block
Am 17.12.2021 um 17:46 hat Vladimir Sementsov-Ogievskiy geschrieben:
> Hi all!
>
> 01: only update test output rebasing on master
> 02: replaced with my proposed solution.
Thanks, applied to the block branch.
Kevin
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-01-12 13:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-17 16:46 [PATCH v2 0/2] qemu-img convert: Fix sparseness detection Vladimir Sementsov-Ogievskiy
2021-12-17 16:46 ` [PATCH v2 1/2] iotests: Test qemu-img convert of zeroed data cluster Vladimir Sementsov-Ogievskiy
2021-12-17 16:46 ` [PATCH v2 2/2] qemu-img: make is_allocated_sectors() more efficient Vladimir Sementsov-Ogievskiy
2021-12-21 12:11 ` [PATCH v2 0/2] qemu-img convert: Fix sparseness detection Peter Lieven
2022-01-12 12:28 ` Kevin Wolf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).