| Message ID | 1422025185-25229-1-git-send-email-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Jan 23, 2015 at 09:59:45AM -0500, Max Reitz wrote: > Test 064 reads a lot of data at once which currently results in qemu-io > having to allocate up to about 1 GB of memory (958 MB, to be exact). > This patch lowers that amount to 128 MB by making the test read smaller > chunks. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/064 | 19 +++++++++++++++++-- > tests/qemu-iotests/064.out | 34 ++++++++++++++++++++++++++++++---- > 2 files changed, 47 insertions(+), 6 deletions(-) > > diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064 > index 1c74c31..7564563 100755 > --- a/tests/qemu-iotests/064 > +++ b/tests/qemu-iotests/064 > @@ -54,7 +54,15 @@ $QEMU_IO -r -c "read -pP 0x96 33M 33M" "$TEST_IMG" | _filter_qemu_io > > echo > echo "=== Verify pattern 0x00, 66M - 1024M ===" > -$QEMU_IO -r -c "read -pP 0x00 66M 958M" "$TEST_IMG" | _filter_qemu_io > +$QEMU_IO -r -c "read -pP 0x00 66M 62M" \ > + -c "read -pP 0x00 128M 128M" \ > + -c "read -pP 0x00 256M 128M" \ > + -c "read -pP 0x00 384M 128M" \ > + -c "read -pP 0x00 512M 128M" \ > + -c "read -pP 0x00 640M 128M" \ > + -c "read -pP 0x00 768M 128M" \ > + -c "read -pP 0x00 896M 128M" \ > + "$TEST_IMG" | _filter_qemu_io > > echo > echo "=== Verify pattern write, 0xc3 99M-157M ===" > @@ -63,7 +71,14 @@ $QEMU_IO -c "write -pP 0xc3 99M 58M" "$TEST_IMG" | _filter_qemu_io > $QEMU_IO -c "read -pP 0xa5 0 33M" "$TEST_IMG" | _filter_qemu_io > $QEMU_IO -c "read -pP 0x96 33M 33M" "$TEST_IMG" | _filter_qemu_io > $QEMU_IO -c "read -pP 0x00 66M 33M" "$TEST_IMG" | _filter_qemu_io > -$QEMU_IO -c "read -pP 0x00 157MM 867MM" "$TEST_IMG" | _filter_qemu_io > +$QEMU_IO -c "read -pP 0x00 157M 99M" \ > + -c "read -pP 0x00 256M 128M" \ > + -c "read -pP 0x00 384M 128M" \ > + -c "read -pP 0x00 512M 128M" \ > + -c "read -pP 0x00 640M 128M" \ > + -c "read -pP 0x00 768M 128M" \ > + -c "read -pP 0x00 896M 128M" \ > + "$TEST_IMG" | _filter_qemu_io > # now verify what we should have actually written > $QEMU_IO -c "read -pP 0xc3 99M 58M" "$TEST_IMG" | _filter_qemu_io > > diff --git a/tests/qemu-iotests/064.out b/tests/qemu-iotests/064.out > index 5346a4e..1a5b9e2 100644 > --- a/tests/qemu-iotests/064.out > +++ b/tests/qemu-iotests/064.out > @@ -9,8 +9,22 @@ read 34603008/34603008 bytes at offset 34603008 > 33 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > > === Verify pattern 0x00, 66M - 1024M === > -read 1004535808/1004535808 bytes at offset 69206016 > -958 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 65011712/65011712 bytes at offset 69206016 > +62 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 134217728/134217728 bytes at offset 134217728 > +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 134217728/134217728 bytes at offset 268435456 > +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 134217728/134217728 bytes at offset 402653184 > +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 134217728/134217728 bytes at offset 536870912 > +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 134217728/134217728 bytes at offset 671088640 > +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 134217728/134217728 bytes at offset 805306368 > +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 134217728/134217728 bytes at offset 939524096 > +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > > === Verify pattern write, 0xc3 99M-157M === > wrote 60817408/60817408 bytes at offset 103809024 > @@ -21,8 +35,20 @@ read 34603008/34603008 bytes at offset 34603008 > 33 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > read 34603008/34603008 bytes at offset 69206016 > 33 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > -read 909115392/909115392 bytes at offset 164626432 > -867 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 103809024/103809024 bytes at offset 164626432 > +99 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 134217728/134217728 bytes at offset 268435456 > +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 134217728/134217728 bytes at offset 402653184 > +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 134217728/134217728 bytes at offset 536870912 > +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 134217728/134217728 bytes at offset 671088640 > +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 134217728/134217728 bytes at offset 805306368 > +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 134217728/134217728 bytes at offset 939524096 > +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > read 60817408/60817408 bytes at offset 103809024 > 58 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > *** done > -- > 2.1.0 > Reviewed-by: Jeff Cody <jcody@redhat.com>
On 2015-01-23 at 09:59, Max Reitz wrote: > Test 064 reads a lot of data at once which currently results in qemu-io > having to allocate up to about 1 GB of memory (958 MB, to be exact). > This patch lowers that amount to 128 MB by making the test read smaller > chunks. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/064 | 19 +++++++++++++++++-- > tests/qemu-iotests/064.out | 34 ++++++++++++++++++++++++++++++---- > 2 files changed, 47 insertions(+), 6 deletions(-) Applied to my block tree: https://github.com/XanClic/qemu/commits/block
diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064 index 1c74c31..7564563 100755 --- a/tests/qemu-iotests/064 +++ b/tests/qemu-iotests/064 @@ -54,7 +54,15 @@ $QEMU_IO -r -c "read -pP 0x96 33M 33M" "$TEST_IMG" | _filter_qemu_io echo echo "=== Verify pattern 0x00, 66M - 1024M ===" -$QEMU_IO -r -c "read -pP 0x00 66M 958M" "$TEST_IMG" | _filter_qemu_io +$QEMU_IO -r -c "read -pP 0x00 66M 62M" \ + -c "read -pP 0x00 128M 128M" \ + -c "read -pP 0x00 256M 128M" \ + -c "read -pP 0x00 384M 128M" \ + -c "read -pP 0x00 512M 128M" \ + -c "read -pP 0x00 640M 128M" \ + -c "read -pP 0x00 768M 128M" \ + -c "read -pP 0x00 896M 128M" \ + "$TEST_IMG" | _filter_qemu_io echo echo "=== Verify pattern write, 0xc3 99M-157M ===" @@ -63,7 +71,14 @@ $QEMU_IO -c "write -pP 0xc3 99M 58M" "$TEST_IMG" | _filter_qemu_io $QEMU_IO -c "read -pP 0xa5 0 33M" "$TEST_IMG" | _filter_qemu_io $QEMU_IO -c "read -pP 0x96 33M 33M" "$TEST_IMG" | _filter_qemu_io $QEMU_IO -c "read -pP 0x00 66M 33M" "$TEST_IMG" | _filter_qemu_io -$QEMU_IO -c "read -pP 0x00 157MM 867MM" "$TEST_IMG" | _filter_qemu_io +$QEMU_IO -c "read -pP 0x00 157M 99M" \ + -c "read -pP 0x00 256M 128M" \ + -c "read -pP 0x00 384M 128M" \ + -c "read -pP 0x00 512M 128M" \ + -c "read -pP 0x00 640M 128M" \ + -c "read -pP 0x00 768M 128M" \ + -c "read -pP 0x00 896M 128M" \ + "$TEST_IMG" | _filter_qemu_io # now verify what we should have actually written $QEMU_IO -c "read -pP 0xc3 99M 58M" "$TEST_IMG" | _filter_qemu_io diff --git a/tests/qemu-iotests/064.out b/tests/qemu-iotests/064.out index 5346a4e..1a5b9e2 100644 --- a/tests/qemu-iotests/064.out +++ b/tests/qemu-iotests/064.out @@ -9,8 +9,22 @@ read 34603008/34603008 bytes at offset 34603008 33 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) === Verify pattern 0x00, 66M - 1024M === -read 1004535808/1004535808 bytes at offset 69206016 -958 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 65011712/65011712 bytes at offset 69206016 +62 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 134217728/134217728 bytes at offset 134217728 +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 134217728/134217728 bytes at offset 268435456 +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 134217728/134217728 bytes at offset 402653184 +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 134217728/134217728 bytes at offset 536870912 +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 134217728/134217728 bytes at offset 671088640 +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 134217728/134217728 bytes at offset 805306368 +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 134217728/134217728 bytes at offset 939524096 +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) === Verify pattern write, 0xc3 99M-157M === wrote 60817408/60817408 bytes at offset 103809024 @@ -21,8 +35,20 @@ read 34603008/34603008 bytes at offset 34603008 33 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) read 34603008/34603008 bytes at offset 69206016 33 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -read 909115392/909115392 bytes at offset 164626432 -867 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 103809024/103809024 bytes at offset 164626432 +99 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 134217728/134217728 bytes at offset 268435456 +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 134217728/134217728 bytes at offset 402653184 +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 134217728/134217728 bytes at offset 536870912 +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 134217728/134217728 bytes at offset 671088640 +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 134217728/134217728 bytes at offset 805306368 +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 134217728/134217728 bytes at offset 939524096 +128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) read 60817408/60817408 bytes at offset 103809024 58 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) *** done
Test 064 reads a lot of data at once which currently results in qemu-io having to allocate up to about 1 GB of memory (958 MB, to be exact). This patch lowers that amount to 128 MB by making the test read smaller chunks. Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/064 | 19 +++++++++++++++++-- tests/qemu-iotests/064.out | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 47 insertions(+), 6 deletions(-)