[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 12/16] qemu-img: adds option to use aio engine for benchmarking
From: |
Stefan Hajnoczi |
Subject: |
[PATCH 12/16] qemu-img: adds option to use aio engine for benchmarking |
Date: |
Mon, 7 Oct 2019 13:09:33 +0100 |
From: Aarushi Mehta <address@hidden>
Signed-off-by: Aarushi Mehta <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
v10:
* Add missing space to qemu-img command-line documentation
---
qemu-img.c | 11 ++++++++++-
qemu-img-cmds.hx | 4 ++--
qemu-img.texi | 5 ++++-
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 384c6f38bc..77084c127b 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -4202,7 +4202,8 @@ static int img_bench(int argc, char **argv)
{"force-share", no_argument, 0, 'U'},
{0, 0, 0, 0}
};
- c = getopt_long(argc, argv, ":hc:d:f:no:qs:S:t:wU", long_options,
NULL);
+ c = getopt_long(argc, argv, ":hc:d:f:ni:o:qs:S:t:wU", long_options,
+ NULL);
if (c == -1) {
break;
}
@@ -4245,6 +4246,14 @@ static int img_bench(int argc, char **argv)
case 'n':
flags |= BDRV_O_NATIVE_AIO;
break;
+ case 'i':
+ ret = bdrv_parse_aio(optarg, &flags);
+ if (ret < 0) {
+ error_report("Invalid aio option: %s", optarg);
+ ret = -1;
+ goto out;
+ }
+ break;
case 'o':
{
offset = cvtnum(optarg);
diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
index 1c93e6d185..77b5a8dda8 100644
--- a/qemu-img-cmds.hx
+++ b/qemu-img-cmds.hx
@@ -20,9 +20,9 @@ STEXI
ETEXI
DEF("bench", img_bench,
- "bench [-c count] [-d depth] [-f fmt] [--flush-interval=flush_interval]
[-n] [--no-drain] [-o offset] [--pattern=pattern] [-q] [-s buffer_size] [-S
step_size] [-t cache] [-w] [-U] filename")
+ "bench [-c count] [-d depth] [-f fmt] [--flush-interval=flush_interval]
[-n] [--no-drain] [-o offset] [--pattern=pattern] [-q] [-s buffer_size] [-S
step_size] [-t cache] [-i aio] [-w] [-U] filename")
STEXI
-@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}]
[--flush-interval=@var{flush_interval}] [-n] [--no-drain] [-o @var{offset}]
[--pattern=@var{pattern}] [-q] [-s @var{buffer_size}] [-S @var{step_size}] [-t
@var{cache}] [-w] [-U] @var{filename}
+@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}]
[--flush-interval=@var{flush_interval}] [-n] [--no-drain] [-o @var{offset}]
[--pattern=@var{pattern}] [-q] [-s @var{buffer_size}] [-S @var{step_size}] [-t
@var{cache}] [-i @var{aio}] [-w] [-U] @var{filename}
ETEXI
DEF("check", img_check,
diff --git a/qemu-img.texi b/qemu-img.texi
index b5156d6316..20136fcb94 100644
--- a/qemu-img.texi
+++ b/qemu-img.texi
@@ -206,7 +206,7 @@ Command description:
Amends the image format specific @var{options} for the image file
@var{filename}. Not all file formats support this operation.
-@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}]
[--flush-interval=@var{flush_interval}] [-n] [--no-drain] [-o @var{offset}]
[--pattern=@var{pattern}] [-q] [-s @var{buffer_size}] [-S @var{step_size}] [-t
@var{cache}] [-w] [-U] @var{filename}
+@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}]
[--flush-interval=@var{flush_interval}] [-n] [-i @var{aio}] [--no-drain] [-o
@var{offset}] [--pattern=@var{pattern}] [-q] [-s @var{buffer_size}] [-S
@var{step_size}] [-t @var{cache}] [-w] [-U] @var{filename}
Run a simple sequential I/O benchmark on the specified image. If @code{-w} is
specified, a write test is performed, otherwise a read test is performed.
@@ -227,6 +227,9 @@ If @code{-n} is specified, the native AIO backend is used
if possible. On
Linux, this option only works if @code{-t none} or @code{-t directsync} is
specified as well.
+If @code{-i} is specified, aio option can be used to specify different AIO
+backends: @var{threads}, @var{native} or @var{io_uring}.
+
For write tests, by default a buffer filled with zeros is written. This can be
overridden with a pattern byte specified by @var{pattern}.
--
2.21.0
- [PATCH 02/16] qapi/block-core: add option for io_uring, (continued)
- [PATCH 02/16] qapi/block-core: add option for io_uring, Stefan Hajnoczi, 2019/10/07
- [PATCH 03/16] block/block: add BDRV flag for io_uring, Stefan Hajnoczi, 2019/10/07
- [PATCH 05/16] stubs: add stubs for io_uring interface, Stefan Hajnoczi, 2019/10/07
- [PATCH 04/16] block/io_uring: implements interfaces for io_uring, Stefan Hajnoczi, 2019/10/07
- [PATCH 06/16] util/async: add aio interfaces for io_uring, Stefan Hajnoczi, 2019/10/07
- [PATCH 07/16] blockdev: adds bdrv_parse_aio to use io_uring, Stefan Hajnoczi, 2019/10/07
- [PATCH 08/16] block/file-posix.c: extend to use io_uring, Stefan Hajnoczi, 2019/10/07
- [PATCH 09/16] block: add trace events for io_uring, Stefan Hajnoczi, 2019/10/07
- [PATCH 10/16] block/io_uring: adds userspace completion polling, Stefan Hajnoczi, 2019/10/07
- [PATCH 11/16] qemu-io: adds option to use aio engine, Stefan Hajnoczi, 2019/10/07
- [PATCH 12/16] qemu-img: adds option to use aio engine for benchmarking,
Stefan Hajnoczi <=
- [PATCH 13/16] qemu-nbd: adds option for aio engines, Stefan Hajnoczi, 2019/10/07
- [PATCH 14/16] tests/qemu-iotests: enable testing with aio options, Stefan Hajnoczi, 2019/10/07
- [PATCH 15/16] tests/qemu-iotests: use AIOMODE with various tests, Stefan Hajnoczi, 2019/10/07
- [PATCH 16/16] block/io_uring: adds fd registration, Stefan Hajnoczi, 2019/10/07