From: Stefan Hajnoczi <stefanha@redhat.com>
To: <qemu-devel@nongnu.org>
Cc: Fam Zheng <fam@euphon.net>, Kevin Wolf <kwolf@redhat.com>,
qemu-block@nongnu.org, oleksandr@redhat.com,
Julia Suvorova <jusual@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Max Reitz <mreitz@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Aarushi Mehta <mehta.aaru20@gmail.com>
Subject: [PATCH v3 11/15] qemu-io: adds option to use aio engine
Date: Wed, 18 Dec 2019 16:32:24 +0000 [thread overview]
Message-ID: <20191218163228.1613099-12-stefanha@redhat.com> (raw)
In-Reply-To: <20191218163228.1613099-1-stefanha@redhat.com>
From: Aarushi Mehta <mehta.aaru20@gmail.com>
Signed-off-by: Aarushi Mehta <mehta.aaru20@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
qemu-io.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/qemu-io.c b/qemu-io.c
index 91e3276592..3adc5a7d0d 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -130,7 +130,8 @@ static void open_help(void)
" -C, -- use copy-on-read\n"
" -n, -- disable host cache, short for -t none\n"
" -U, -- force shared permissions\n"
-" -k, -- use kernel AIO implementation (on Linux only)\n"
+" -k, -- use kernel AIO implementation (Linux only, prefer use of -i)\n"
+" -i, -- use AIO mode (threads, native or io_uring)\n"
" -t, -- use the given cache mode for the image\n"
" -d, -- use the given discard mode for the image\n"
" -o, -- options to be given to the block driver"
@@ -172,7 +173,7 @@ static int open_f(BlockBackend *blk, int argc, char **argv)
QDict *opts;
bool force_share = false;
- while ((c = getopt(argc, argv, "snCro:kt:d:U")) != -1) {
+ while ((c = getopt(argc, argv, "snCro:ki:t:d:U")) != -1) {
switch (c) {
case 's':
flags |= BDRV_O_SNAPSHOT;
@@ -204,6 +205,13 @@ static int open_f(BlockBackend *blk, int argc, char **argv)
return -EINVAL;
}
break;
+ case 'i':
+ if (bdrv_parse_aio(optarg, &flags) < 0) {
+ error_report("Invalid aio option: %s", optarg);
+ qemu_opts_reset(&empty_opts);
+ return -EINVAL;
+ }
+ break;
case 'o':
if (imageOpts) {
printf("--image-opts and 'open -o' are mutually exclusive\n");
@@ -291,7 +299,9 @@ static void usage(const char *name)
" -n, --nocache disable host cache, short for -t none\n"
" -C, --copy-on-read enable copy-on-read\n"
" -m, --misalign misalign allocations for O_DIRECT\n"
-" -k, --native-aio use kernel AIO implementation (on Linux only)\n"
+" -k, --native-aio use kernel AIO implementation\n"
+" (Linux only, prefer use of -i)\n"
+" -i, --aio=MODE use AIO mode (threads, native or io_uring)\n"
" -t, --cache=MODE use the given cache mode for the image\n"
" -d, --discard=MODE use the given discard mode for the image\n"
" -T, --trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n"
@@ -496,7 +506,7 @@ static QemuOptsList file_opts = {
int main(int argc, char **argv)
{
int readonly = 0;
- const char *sopt = "hVc:d:f:rsnCmkt:T:U";
+ const char *sopt = "hVc:d:f:rsnCmki:t:T:U";
const struct option lopt[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, 'V' },
@@ -508,6 +518,7 @@ int main(int argc, char **argv)
{ "copy-on-read", no_argument, NULL, 'C' },
{ "misalign", no_argument, NULL, 'm' },
{ "native-aio", no_argument, NULL, 'k' },
+ { "aio", required_argument, NULL, 'i' },
{ "discard", required_argument, NULL, 'd' },
{ "cache", required_argument, NULL, 't' },
{ "trace", required_argument, NULL, 'T' },
@@ -575,6 +586,12 @@ int main(int argc, char **argv)
case 'k':
flags |= BDRV_O_NATIVE_AIO;
break;
+ case 'i':
+ if (bdrv_parse_aio(optarg, &flags) < 0) {
+ error_report("Invalid aio option: %s", optarg);
+ exit(1);
+ }
+ break;
case 't':
if (bdrv_parse_cache_mode(optarg, &flags, &writethrough) < 0) {
error_report("Invalid cache option: %s", optarg);
--
2.23.0
next prev parent reply other threads:[~2019-12-18 16:36 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 16:32 [PATCH v3 00/15] io_uring: add Linux io_uring AIO engine Stefan Hajnoczi
2019-12-18 16:32 ` [PATCH v3 01/15] configure: permit use of io_uring Stefan Hajnoczi
2019-12-18 16:32 ` [PATCH v3 02/15] qapi/block-core: add option for io_uring Stefan Hajnoczi
2019-12-18 16:32 ` [PATCH v3 03/15] block/block: add BDRV flag " Stefan Hajnoczi
2019-12-18 16:32 ` [PATCH v3 04/15] block/io_uring: implements interfaces " Stefan Hajnoczi
2020-01-13 11:24 ` Stefano Garzarella
2020-01-14 10:40 ` Stefan Hajnoczi
2019-12-18 16:32 ` [PATCH v3 05/15] stubs: add stubs for io_uring interface Stefan Hajnoczi
2019-12-18 16:32 ` [PATCH v3 06/15] util/async: add aio interfaces for io_uring Stefan Hajnoczi
2019-12-18 16:32 ` [PATCH v3 07/15] blockdev: adds bdrv_parse_aio to use io_uring Stefan Hajnoczi
2019-12-18 16:32 ` [PATCH v3 08/15] block/file-posix.c: extend " Stefan Hajnoczi
2020-01-13 11:49 ` Stefano Garzarella
2020-01-14 10:37 ` Stefan Hajnoczi
2019-12-18 16:32 ` [PATCH v3 09/15] block: add trace events for io_uring Stefan Hajnoczi
2019-12-18 16:32 ` [PATCH v3 10/15] block/io_uring: adds userspace completion polling Stefan Hajnoczi
2019-12-18 16:32 ` Stefan Hajnoczi [this message]
2019-12-18 16:32 ` [PATCH v3 12/15] qemu-img: adds option to use aio engine for benchmarking Stefan Hajnoczi
2019-12-18 16:32 ` [PATCH v3 13/15] qemu-nbd: adds option for aio engines Stefan Hajnoczi
2019-12-18 16:32 ` [PATCH v3 14/15] tests/qemu-iotests: enable testing with aio options Stefan Hajnoczi
2019-12-18 16:32 ` [PATCH v3 15/15] tests/qemu-iotests: use AIOMODE with various tests Stefan Hajnoczi
2020-01-10 9:55 ` [PATCH v3 00/15] io_uring: add Linux io_uring AIO engine Stefan Hajnoczi
2020-01-13 11:58 ` Stefano Garzarella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191218163228.1613099-12-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=armbru@redhat.com \
--cc=fam@euphon.net \
--cc=jusual@redhat.com \
--cc=kwolf@redhat.com \
--cc=mehta.aaru20@gmail.com \
--cc=mreitz@redhat.com \
--cc=oleksandr@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).