Patchwork linux-aio: Allow reads beyond the end of growable images

login
register
mail settings
Submitter Kevin Wolf
Date Oct. 13, 2011, 1:49 p.m.
Message ID <1318513779-8555-1-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/119529/
State New
Headers show

Comments

Kevin Wolf - Oct. 13, 2011, 1:49 p.m.
This is the linux-aio version of commits 22afa7b5 (raw-posix, synchronous) and
ba1d1afd (posix-aio-compat). Reads now produce zeros after the end of file
instead of failing or resulting in short reads, making linux-aio compatible
with the behaviour of synchronous raw-posix requests and posix-aio-compat.

The problem can be reproduced like this:

dd if=/dev/zero of=/tmp/test.raw bs=1 count=1234
./qemu-io -k -n -g -c 'read -p 1024 512' /tmp/test.raw

Previously, the result of this was 'read failed: Invalid argument', now the
read completes successfully.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 linux-aio.c |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)
Stefan Hajnoczi - Oct. 13, 2011, 2:55 p.m.
On Thu, Oct 13, 2011 at 2:49 PM, Kevin Wolf <kwolf@redhat.com> wrote:
> This is the linux-aio version of commits 22afa7b5 (raw-posix, synchronous) and
> ba1d1afd (posix-aio-compat). Reads now produce zeros after the end of file
> instead of failing or resulting in short reads, making linux-aio compatible
> with the behaviour of synchronous raw-posix requests and posix-aio-compat.
>
> The problem can be reproduced like this:
>
> dd if=/dev/zero of=/tmp/test.raw bs=1 count=1234
> ./qemu-io -k -n -g -c 'read -p 1024 512' /tmp/test.raw
>
> Previously, the result of this was 'read failed: Invalid argument', now the
> read completes successfully.
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  linux-aio.c |   17 ++++++++++++++---
>  1 files changed, 14 insertions(+), 3 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Christoph Hellwig - Oct. 14, 2011, 7:51 a.m.
On Thu, Oct 13, 2011 at 03:49:39PM +0200, Kevin Wolf wrote:
> This is the linux-aio version of commits 22afa7b5 (raw-posix, synchronous) and
> ba1d1afd (posix-aio-compat). Reads now produce zeros after the end of file
> instead of failing or resulting in short reads, making linux-aio compatible
> with the behaviour of synchronous raw-posix requests and posix-aio-compat.
> 
> The problem can be reproduced like this:
> 
> dd if=/dev/zero of=/tmp/test.raw bs=1 count=1234
> ./qemu-io -k -n -g -c 'read -p 1024 512' /tmp/test.raw

Can you send a patch doing this for qemu-iotests?

Patch

diff --git a/linux-aio.c b/linux-aio.c
index 50da75d..1c635ef 100644
--- a/linux-aio.c
+++ b/linux-aio.c
@@ -31,6 +31,8 @@  struct qemu_laiocb {
     struct iocb iocb;
     ssize_t ret;
     size_t nbytes;
+    QEMUIOVector *qiov;
+    bool is_read;
     QLIST_ENTRY(qemu_laiocb) node;
 };
 
@@ -57,10 +59,17 @@  static void qemu_laio_process_completion(struct qemu_laio_state *s,
 
     ret = laiocb->ret;
     if (ret != -ECANCELED) {
-        if (ret == laiocb->nbytes)
+        if (ret == laiocb->nbytes) {
             ret = 0;
-        else if (ret >= 0)
-            ret = -EINVAL;
+        } else if (ret >= 0) {
+            /* Short reads mean EOF, pad with zeros. */
+            if (laiocb->is_read) {
+                qemu_iovec_memset_skip(laiocb->qiov, 0,
+                    laiocb->qiov->size - ret, ret);
+            } else {
+                ret = -EINVAL;
+            }
+        }
 
         laiocb->common.cb(laiocb->common.opaque, ret);
     }
@@ -162,6 +171,8 @@  BlockDriverAIOCB *laio_submit(BlockDriverState *bs, void *aio_ctx, int fd,
     laiocb->nbytes = nb_sectors * 512;
     laiocb->ctx = s;
     laiocb->ret = -EINPROGRESS;
+    laiocb->is_read = (type == QEMU_AIO_READ);
+    laiocb->qiov = qiov;
 
     iocbs = &laiocb->iocb;