| Message ID | 20200130213114.325157-16-stefanha@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [PULL,01/18] block: eliminate BDRV_REQ_NO_SERIALISING | expand |
On Thu, 30 Jan 2020 at 21:32, Stefan Hajnoczi <stefanha@redhat.com> wrote: > > From: Aarushi Mehta <mehta.aaru20@gmail.com> > > Signed-off-by: Aarushi Mehta <mehta.aaru20@gmail.com> > Acked-by: Stefano Garzarella <sgarzare@redhat.com> > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > Message-id: 20200120141858.587874-13-stefanha@redhat.com > Message-Id: <20200120141858.587874-13-stefanha@redhat.com> > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- 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 > 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} Is there a reason why the new '-i aio' option is added to the synopsis line after '-t cache' in the DEF() line and the STEXI/ETEXI fragment, but after '-n' in the line in the qemu-img.texi file ? All the other options here are in alphabetical order, so logically '-i aio' should go in neither of those two places but after '--flush-interval'... (This change is a conflict with the in-flight qemu-img conversion to rST; to fix that up I'm going to just change the rST conversion to exactly follow the texi here; we can fix the option ordering as a followup patch.) thanks -- PMM
On Mon, Feb 3, 2020 at 11:56 AM Peter Maydell <peter.maydell@linaro.org> wrote: > > On Thu, 30 Jan 2020 at 21:32, Stefan Hajnoczi <stefanha@redhat.com> wrote: > > > > From: Aarushi Mehta <mehta.aaru20@gmail.com> > > > > Signed-off-by: Aarushi Mehta <mehta.aaru20@gmail.com> > > Acked-by: Stefano Garzarella <sgarzare@redhat.com> > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > > Message-id: 20200120141858.587874-13-stefanha@redhat.com > > Message-Id: <20200120141858.587874-13-stefanha@redhat.com> > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > > > --- 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 > > > 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} > > Is there a reason why the new '-i aio' option is added to the synopsis > line after '-t cache' in the DEF() line and the STEXI/ETEXI fragment, > but after '-n' in the line in the qemu-img.texi file ? No reason, just an accident. > All the other options here are in alphabetical order, so logically > '-i aio' should go in neither of those two places but after > '--flush-interval'... > > (This change is a conflict with the in-flight qemu-img conversion > to rST; to fix that up I'm going to just change the rST conversion > to exactly follow the texi here; we can fix the option ordering > as a followup patch.) Ok. I'll send a follow-up patch. Best regards, Julia Suvorova.
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.c b/qemu-img.c index 6233b8ca56..2b4562b9d9 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -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); 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}.