[v7,12/15] qemu-img: adds option to use aio engine for benchmarking

Commit Message

Aarushi Mehta July 29, 2019, 3:16 p.m. UTC

Signed-off-by: Aarushi Mehta <[e-mail]>
---
 qemu-img.c    | 10 +++++++++-
 qemu-img.texi |  5 ++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

Comments

Stefan Hajnoczi July 30, 2019, 7:37 a.m. UTC | #1

On Mon, Jul 29, 2019 at 08:46:48PM +0530, Aarushi Mehta wrote:
> Signed-off-by: Aarushi Mehta <[e-mail]>
> ---
>  qemu-img.c    | 10 +++++++++-
>  qemu-img.texi |  5 ++++-
>  2 files changed, 13 insertions(+), 2 deletions(-)
> 
> diff --git a/qemu-img.c b/qemu-img.c
> index 79983772de..3fc8dac0b1 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -4192,7 +4192,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);

Please update help() with documentation for -i.

>          if (c == -1) {
>              break;
>          }
> @@ -4234,6 +4235,13 @@ static int img_bench(int argc, char **argv)
>              break;
>          case 'n':
>              flags |= BDRV_O_NATIVE_AIO;

Missing break statement.

Patch

diff --git a/qemu-img.c b/qemu-img.c
index 79983772de..3fc8dac0b1 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -4192,7 +4192,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;
         }
@@ -4234,6 +4235,13 @@  static int img_bench(int argc, char **argv)
             break;
         case 'n':
             flags |= BDRV_O_NATIVE_AIO;
+        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':
         {
diff --git a/qemu-img.texi b/qemu-img.texi
index c8e9bba515..0a2eccea85 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}.