[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/18] qemu-io: adds option to use aio engine
From: |
Stefan Hajnoczi |
Subject: |
[PULL 14/18] qemu-io: adds option to use aio engine |
Date: |
Thu, 30 Jan 2020 21:31:10 +0000 |
From: Aarushi Mehta <address@hidden>
Signed-off-by: Aarushi Mehta <address@hidden>
Acked-by: Stefano Garzarella <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Message-Id: <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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.24.1
- [PULL 04/18] configure: permit use of io_uring, (continued)
- [PULL 04/18] configure: permit use of io_uring, Stefan Hajnoczi, 2020/01/30
- [PULL 05/18] qapi/block-core: add option for io_uring, Stefan Hajnoczi, 2020/01/30
- [PULL 06/18] block/block: add BDRV flag for io_uring, Stefan Hajnoczi, 2020/01/30
- [PULL 08/18] stubs: add stubs for io_uring interface, Stefan Hajnoczi, 2020/01/30
- [PULL 10/18] blockdev: adds bdrv_parse_aio to use io_uring, Stefan Hajnoczi, 2020/01/30
- [PULL 07/18] block/io_uring: implements interfaces for io_uring, Stefan Hajnoczi, 2020/01/30
- [PULL 11/18] block/file-posix.c: extend to use io_uring, Stefan Hajnoczi, 2020/01/30
- [PULL 09/18] util/async: add aio interfaces for io_uring, Stefan Hajnoczi, 2020/01/30
- [PULL 12/18] block: add trace events for io_uring, Stefan Hajnoczi, 2020/01/30
- [PULL 13/18] block/io_uring: adds userspace completion polling, Stefan Hajnoczi, 2020/01/30
- [PULL 14/18] qemu-io: adds option to use aio engine,
Stefan Hajnoczi <=
- [PULL 15/18] qemu-img: adds option to use aio engine for benchmarking, Stefan Hajnoczi, 2020/01/30
- [PULL 16/18] qemu-nbd: adds option for aio engines, Stefan Hajnoczi, 2020/01/30
- [PULL 17/18] tests/qemu-iotests: enable testing with aio options, Stefan Hajnoczi, 2020/01/30
- [PULL 18/18] tests/qemu-iotests: use AIOMODE with various tests, Stefan Hajnoczi, 2020/01/30
- Re: [PULL 00/18] Block patches, Peter Maydell, 2020/01/31