Commit cdd26774 authored by Aarushi Mehta's avatar Aarushi Mehta Committed by Stefan Hajnoczi
Browse files

qemu-img: adds option to use aio engine for benchmarking 



Signed-off-by: default avatarAarushi Mehta <mehta.aaru20@gmail.com>
Acked-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 20200120141858.587874-13-stefanha@redhat.com
Message-Id: <20200120141858.587874-13-stefanha@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 1c5a2aec

qemu-img-cmds.hx

+2 −2
Original line number Diff line number Diff line
@@ -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,

qemu-img.c

+10 −1
Original line number Diff line number Diff line
@@ -4187,7 +4187,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;

        }
@@ -4230,6 +4231,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);

qemu-img.texi

+4 −1
Original line number Diff line number Diff line
@@ -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}.