[v6,11/14] qemu-io: adds option to use aio engine

Commit Message

Aarushi Mehta July 19, 2019, 1:35 p.m. UTC

Use -i AIOMODE instead of -k.

Signed-off-by: Aarushi Mehta <[e-mail]>
---
 qemu-io.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

Comments

Stefan Hajnoczi July 19, 2019, 3:41 p.m. UTC | #1

On Fri, Jul 19, 2019 at 07:05:27PM +0530, Aarushi Mehta wrote:
> Use -i AIOMODE instead of -k.
> 
> Signed-off-by: Aarushi Mehta <[e-mail]>
> ---
>  qemu-io.c | 25 ++++++++++++++++---------
>  1 file changed, 16 insertions(+), 9 deletions(-)
> 
> diff --git a/qemu-io.c b/qemu-io.c
> index f64eca6940..3cee06248e 100644
> --- a/qemu-io.c
> +++ b/qemu-io.c
> @@ -130,7 +130,7 @@ 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"
> +" -i, -- use AIO mode (threads, native or io_uring)"

Please keep the existing option for backwards compatibility.  Existing
command-lines must continue to work so we don't inconvenience users.

Daniel P. Berrangé July 19, 2019, 3:44 p.m. UTC | #2

On Fri, Jul 19, 2019 at 04:41:15PM +0100, Stefan Hajnoczi wrote:
> On Fri, Jul 19, 2019 at 07:05:27PM +0530, Aarushi Mehta wrote:
> > Use -i AIOMODE instead of -k.
> > 
> > Signed-off-by: Aarushi Mehta <[e-mail]>
> > ---
> >  qemu-io.c | 25 ++++++++++++++++---------
> >  1 file changed, 16 insertions(+), 9 deletions(-)
> > 
> > diff --git a/qemu-io.c b/qemu-io.c
> > index f64eca6940..3cee06248e 100644
> > --- a/qemu-io.c
> > +++ b/qemu-io.c
> > @@ -130,7 +130,7 @@ 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"
> > +" -i, -- use AIO mode (threads, native or io_uring)"
> 
> Please keep the existing option for backwards compatibility.  Existing
> command-lines must continue to work so we don't inconvenience users.

We could deprecate the -k option though, so it can be deleted a couple
of releases later.

Regards,
Daniel

Julia Suvorova July 24, 2019, 4:42 p.m. UTC | #3

On 7/19/19 3:35 PM, Aarushi Mehta wrote:
> @@ -489,7 +493,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:rsnCmit:T:U";

Add ':' after 'i' to pass an argument after -i option, as it currently
works with a long variant.

Best regards, Julia Suvorova.

Patch

diff --git a/qemu-io.c b/qemu-io.c
index f64eca6940..3cee06248e 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -130,7 +130,7 @@  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"
+" -i, -- use AIO mode (threads, native or io_uring)"
 " -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"
@@ -187,9 +187,6 @@  static int open_f(BlockBackend *blk, int argc, char **argv)
         case 'r':
             readonly = 1;
             break;
-        case 'k':
-            flags |= BDRV_O_NATIVE_AIO;
-            break;
         case 't':
             if (bdrv_parse_cache_mode(optarg, &flags, &writethrough) < 0) {
                 error_report("Invalid cache option: %s", optarg);
@@ -204,6 +201,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 +295,7 @@  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"
+"  -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"
@@ -489,7 +493,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:rsnCmit:T:U";
     const struct option lopt[] = {
         { "help", no_argument, NULL, 'h' },
         { "version", no_argument, NULL, 'V' },
@@ -500,7 +504,7 @@  int main(int argc, char **argv)
         { "nocache", no_argument, NULL, 'n' },
         { "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' },
@@ -565,8 +569,11 @@  int main(int argc, char **argv)
         case 'm':
             qemuio_misalign = true;
             break;
-        case 'k':
-            flags |= BDRV_O_NATIVE_AIO;
+        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) {