| Message ID | bd3547b670b8d0af11480c760991a22bcae5b48c.1517840877.git.berto@igalia.com |
|---|---|
| State | New |
| Headers | show |
| Series | Allow configuring the qcow2 L2 cache entry size | expand |
Am 05.02.2018 um 15:33 hat Alberto Garcia geschrieben: > The l2-cache-entry-size setting can only contain values that are > powers of two between 512 and the cluster size. > > Signed-off-by: Alberto Garcia <berto@igalia.com> > Reviewed-by: Eric Blake <eblake@redhat.com> > Reviewed-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/103 | 17 +++++++++++++++++ > tests/qemu-iotests/103.out | 3 +++ > 2 files changed, 20 insertions(+) > > diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103 > index d0cfab8844..7a2ca22803 100755 > --- a/tests/qemu-iotests/103 > +++ b/tests/qemu-iotests/103 > @@ -66,6 +66,14 @@ $QEMU_IO -c "open -o cache-size=1M,refcount-cache-size=2M $TEST_IMG" 2>&1 \ > $QEMU_IO -c "open -o cache-size=0,l2-cache-size=0,refcount-cache-size=0 $TEST_IMG" \ > 2>&1 | _filter_testdir | _filter_imgfmt > > +# Invalid cache entry sizes > +$QEMU_IO -c "open -o l2-cache-entry-size=256 $TEST_IMG" \ > + 2>&1 | _filter_testdir | _filter_imgfmt > +$QEMU_IO -c "open -o l2-cache-entry-size=300 $TEST_IMG" \ > + 2>&1 | _filter_testdir | _filter_imgfmt If you wanted to test non-power-of-two values here, it would be better to use a value that isn't < 512 at the same time. > +$QEMU_IO -c "open -o l2-cache-entry-size=128k $TEST_IMG" \ > + 2>&1 | _filter_testdir | _filter_imgfmt Kevin
On Tue 13 Feb 2018 01:32:17 PM CET, Kevin Wolf wrote: >> +# Invalid cache entry sizes >> +$QEMU_IO -c "open -o l2-cache-entry-size=256 $TEST_IMG" \ >> + 2>&1 | _filter_testdir | _filter_imgfmt >> +$QEMU_IO -c "open -o l2-cache-entry-size=300 $TEST_IMG" \ >> + 2>&1 | _filter_testdir | _filter_imgfmt > > If you wanted to test non-power-of-two values here, it would be better > to use a value that isn't < 512 at the same time. Good idea, if there's no new version of the series whoever applies this can feel free to change this value to 3000 or something like that. Berto
diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103 index d0cfab8844..7a2ca22803 100755 --- a/tests/qemu-iotests/103 +++ b/tests/qemu-iotests/103 @@ -66,6 +66,14 @@ $QEMU_IO -c "open -o cache-size=1M,refcount-cache-size=2M $TEST_IMG" 2>&1 \ $QEMU_IO -c "open -o cache-size=0,l2-cache-size=0,refcount-cache-size=0 $TEST_IMG" \ 2>&1 | _filter_testdir | _filter_imgfmt +# Invalid cache entry sizes +$QEMU_IO -c "open -o l2-cache-entry-size=256 $TEST_IMG" \ + 2>&1 | _filter_testdir | _filter_imgfmt +$QEMU_IO -c "open -o l2-cache-entry-size=300 $TEST_IMG" \ + 2>&1 | _filter_testdir | _filter_imgfmt +$QEMU_IO -c "open -o l2-cache-entry-size=128k $TEST_IMG" \ + 2>&1 | _filter_testdir | _filter_imgfmt + echo echo '=== Testing valid option combinations ===' echo @@ -94,6 +102,15 @@ $QEMU_IO -c "open -o l2-cache-size=1M,refcount-cache-size=0.25M $TEST_IMG" \ -c 'read -P 42 0 64k' \ | _filter_qemu_io +# Valid cache entry sizes +$QEMU_IO -c "open -o l2-cache-entry-size=512 $TEST_IMG" \ + 2>&1 | _filter_testdir | _filter_imgfmt +$QEMU_IO -c "open -o l2-cache-entry-size=16k $TEST_IMG" \ + 2>&1 | _filter_testdir | _filter_imgfmt +$QEMU_IO -c "open -o l2-cache-entry-size=64k $TEST_IMG" \ + 2>&1 | _filter_testdir | _filter_imgfmt + + echo echo '=== Testing minimal L2 cache and COW ===' echo diff --git a/tests/qemu-iotests/103.out b/tests/qemu-iotests/103.out index b7aaadf89a..bd45d3875a 100644 --- a/tests/qemu-iotests/103.out +++ b/tests/qemu-iotests/103.out @@ -9,6 +9,9 @@ can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cach can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set the same time +can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536) +can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536) +can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536) === Testing valid option combinations ===