Skip to contentSkip to conversation

raw-posix: Make aio=native option binding

PATCH In review Kevin Wolf 3 participants 3 messages Dec 15, 2015 – Dec 16, 2015 Block layer

lore
Share & tools
lore

Kevin Wolf

author
#0 lore raw

PATCH 1/1 raw-posix: Make aio=native option binding

Traditionally, aio=native was treated as an advice that could simply be ignored if an error occurs while initialising Linux AIO or the feature wasn't compiled in. This behaviour was deprecated in commit 96518254 (qemu 2.3; error during init) and commit 1501ecc1 (qemu 2.5; not compiled in).

This patch changes raw-posix to error out in these cases instead of printing a deprecation warning.

---
 block/raw-posix.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)
block/raw-posix.c +8 -12
index d9162fd..cb26dcb 100644
@@ -500,21 +500,17 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
         goto fail;
     }
     if (!s->use_aio && (bdrv_flags & BDRV_O_NATIVE_AIO)) {
-        error_printf("WARNING: aio=native was specified for '%s', but "
-                     "it requires cache.direct=on, which was not "
-                     "specified. Falling back to aio=threads.\n"
-                     "         This will become an error condition in "
-                     "future QEMU versions.\n",
-                     bs->filename);
+        error_setg(errp, "aio=native was specified, but it requires "
+                         "cache.direct=on, which was not specified.");
+        ret = -EINVAL;
+        goto fail;
     }
 #else
     if (bdrv_flags & BDRV_O_NATIVE_AIO) {
-        error_printf("WARNING: aio=native was specified for '%s', but "
-                     "is not supported in this build. Falling back to "
-                     "aio=threads.\n"
-                     "         This will become an error condition in "
-                     "future QEMU versions.\n",
-                     bs->filename);
+        error_setg(errp, "aio=native was specified, but is not supported "
+                         "in this build.");
+        ret = -EINVAL;
+        goto fail;
     }
 #endif /* !defined(CONFIG_LINUX_AIO) */
 
Signature · 1 line
1.8.3.1
Acked-by on v1 1/1
#1 lore raw
Quoted 1 line · Kevin Wolf

Subject: [PATCH] raw-posix: Make aio=native option binding

bike-shedding, but is there a better wording for the subject line, e.g. something like

raw-posix: error out on invalid configurations for aio=native

or something like that

Quoted 22 lines

Traditionally, aio=native was treated as an advice that could simply be ignored if an error occurs while initialising Linux AIO or the feature wasn't compiled in. This behaviour was deprecated in commit 96518254 (qemu 2.3; error during init) and commit 1501ecc1 (qemu 2.5; not compiled in).

This patch changes raw-posix to error out in these cases instead of printing a deprecation warning.

---
 block/raw-posix.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)
block/raw-posix.c +0 -0
index d9162fd..cb26dcb 100644
@@ -500,21 +500,17 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
         goto fail;
     }
     if (!s->use_aio && (bdrv_flags & BDRV_O_NATIVE_AIO)) {

block/raw-posix.c static int raw_open_common(BlockDriverState *bs, QDict *options, · line 506

Quoted 10 lines
block/raw-posix.c +4 -6
-        error_printf("WARNING: aio=native was specified for '%s', but "
-                     "it requires cache.direct=on, which was not "
-                     "specified. Falling back to aio=threads.\n"
-                     "         This will become an error condition in "
-                     "future QEMU versions.\n",
-                     bs->filename);
+        error_setg(errp, "aio=native was specified, but it requires "
+                         "cache.direct=on, which was not specified.");
+        ret = -EINVAL;
+        goto fail;

In the real life this is probably the right thing to do.
On the other hand its a Linux kernel implementation detail that aio does only work with O_DIRECT. But anyway, if Linux aio gets fixed we can change QEMU again.

block/raw-posix.c static int raw_open_common(BlockDriverState *bs, QDict *options, · line 513

Quoted 13 lines
block/raw-posix.c +4 -6
     }
 #else
     if (bdrv_flags & BDRV_O_NATIVE_AIO) {
-        error_printf("WARNING: aio=native was specified for '%s', but "
-                     "is not supported in this build. Falling back to "
-                     "aio=threads.\n"
-                     "         This will become an error condition in "
-                     "future QEMU versions.\n",
-                     bs->filename);
+        error_setg(errp, "aio=native was specified, but is not supported "
+                         "in this build.");
+        ret = -EINVAL;
+        goto fail;

We certainly want to error out in this case.

Reviewed-by on v1 1/1
#2 lore raw
In reply to Kevin Wolf
Quoted 6 lines · Kevin Wolf

Traditionally, aio=native was treated as an advice that could simply be ignored if an error occurs while initialising Linux AIO or the feature wasn't compiled in. This behaviour was deprecated in commit 96518254 (qemu 2.3; error during init) and commit 1501ecc1 (qemu 2.5; not compiled in).

Quoted 7 lines

This patch changes raw-posix to error out in these cases instead of printing a deprecation warning.

---
 block/raw-posix.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)