| Message ID | 20190610134905.22294-13-mehta.aaru20@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add support for io_uring | expand |
On Mon, Jun 10, 2019 at 07:19:05PM +0530, Aarushi Mehta wrote: > Signed-off-by: Aarushi Mehta <mehta.aaru20@gmail.com> > --- > tests/qemu-iotests/087 | 26 ++++++++++++++++++++++++++ > tests/qemu-iotests/087.out | 10 ++++++++++ > 2 files changed, 36 insertions(+) > > diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 > index d6c8613419..0cc7283ad8 100755 > --- a/tests/qemu-iotests/087 > +++ b/tests/qemu-iotests/087 > @@ -124,6 +124,32 @@ run_qemu_filter_aio <<EOF > { "execute": "quit" } > EOF > > +echo > +echo === aio=io_uring without O_DIRECT === > +echo > + > +# Skip this test if io_uring is not enabled in this build Is this comment a todo? I see nothing that skips the test.
On Mon, 2019-06-10 at 19:19 +0530, Aarushi Mehta wrote: > Signed-off-by: Aarushi Mehta <mehta.aaru20@gmail.com> > --- > tests/qemu-iotests/087 | 26 ++++++++++++++++++++++++++ > tests/qemu-iotests/087.out | 10 ++++++++++ > 2 files changed, 36 insertions(+) > > diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 > index d6c8613419..0cc7283ad8 100755 > --- a/tests/qemu-iotests/087 > +++ b/tests/qemu-iotests/087 > @@ -124,6 +124,32 @@ run_qemu_filter_aio <<EOF > { "execute": "quit" } > EOF > > +echo > +echo === aio=io_uring without O_DIRECT === > +echo > + > +# Skip this test if io_uring is not enabled in this build > +run_qemu_filter_io_uring() > +{ > + run_qemu "$@" > +} > + > +run_qemu_filter_io_uring <<EOF > +{ "execute": "qmp_capabilities" } > +{ "execute": "blockdev-add", > + "arguments": { > + "driver": "$IMGFMT", > + "node-name": "disk", > + "file": { > + "driver": "file", > + "filename": "$TEST_IMG", > + "aio": "io_uring" > + } > + } > + } > +{ "execute": "quit" } > +EOF > + > echo > echo === Encrypted image QCow === > echo > diff --git a/tests/qemu-iotests/087.out b/tests/qemu-iotests/087.out > index 2d92ea847b..f0557d425f 100644 > --- a/tests/qemu-iotests/087.out > +++ b/tests/qemu-iotests/087.out > @@ -32,6 +32,16 @@ QMP_VERSION > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} > > > +=== aio=io_uring without O_DIRECT === > + > +Testing: > +QMP_VERSION > +{"return": {}} > +{"return": {}} > +{"return": {}} > +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} > + > + This is kind of wrong copy&paste happened here: The "aio=native without O_DIRECT" test is a negative test trying to enable libaio support without O_DIRECT, which qemu check and fails on. The io_uring can be enabled without O_DIRECT, thus negative test doesn't make sense, but rather a positive test which not only enables this but actually does some IO in this mode to see that it works is needed IMHO. > === Encrypted image QCow === > > Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on encrypt.key-secret=sec0 Best regards, Maxim Levitsky
diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 index d6c8613419..0cc7283ad8 100755 --- a/tests/qemu-iotests/087 +++ b/tests/qemu-iotests/087 @@ -124,6 +124,32 @@ run_qemu_filter_aio <<EOF { "execute": "quit" } EOF +echo +echo === aio=io_uring without O_DIRECT === +echo + +# Skip this test if io_uring is not enabled in this build +run_qemu_filter_io_uring() +{ + run_qemu "$@" +} + +run_qemu_filter_io_uring <<EOF +{ "execute": "qmp_capabilities" } +{ "execute": "blockdev-add", + "arguments": { + "driver": "$IMGFMT", + "node-name": "disk", + "file": { + "driver": "file", + "filename": "$TEST_IMG", + "aio": "io_uring" + } + } + } +{ "execute": "quit" } +EOF + echo echo === Encrypted image QCow === echo diff --git a/tests/qemu-iotests/087.out b/tests/qemu-iotests/087.out index 2d92ea847b..f0557d425f 100644 --- a/tests/qemu-iotests/087.out +++ b/tests/qemu-iotests/087.out @@ -32,6 +32,16 @@ QMP_VERSION {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +=== aio=io_uring without O_DIRECT === + +Testing: +QMP_VERSION +{"return": {}} +{"return": {}} +{"return": {}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} + + === Encrypted image QCow === Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on encrypt.key-secret=sec0
Signed-off-by: Aarushi Mehta <mehta.aaru20@gmail.com> --- tests/qemu-iotests/087 | 26 ++++++++++++++++++++++++++ tests/qemu-iotests/087.out | 10 ++++++++++ 2 files changed, 36 insertions(+)