[Qemu-devel] [PATCH v2] virtio-blk: Check return value of blk_aio_ioctl

[Qemu-devel] [PATCH v2] virtio-blk: Check return value of blk_aio_ioctl

[Fam Zheng]

Since commit 1dc936aa84 (virtio-blk: Use blk_aio_ioctl) we silently lose
the request if blk_aio_ioctl returns NULL (not implemented).

Fix it by directly returning VIRTIO_BLK_S_UNSUPP as we used to do.

Signed-off-by: Fam Zheng <famz@redhat.com>

---
v2: Fix the leak of ioctl_req. (Kevin)
---
 hw/block/virtio-blk.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 1a8a176..91aceaa 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -197,6 +197,7 @@ static int virtio_blk_handle_scsi_req(VirtIOBlockReq *req)
     VirtIODevice *vdev = VIRTIO_DEVICE(req->dev);
     VirtQueueElement *elem = &req->elem;
     VirtIOBlock *blk = req->dev;
+    BlockAIOCB *acb;
 
 #ifdef __linux__
     int i;
@@ -278,8 +279,13 @@ static int virtio_blk_handle_scsi_req(VirtIOBlockReq *req)
     ioctl_req->hdr.sbp = elem->in_sg[elem->in_num - 3].iov_base;
     ioctl_req->hdr.mx_sb_len = elem->in_sg[elem->in_num - 3].iov_len;
 
-    blk_aio_ioctl(blk->blk, SG_IO, &ioctl_req->hdr,
-                  virtio_blk_ioctl_complete, ioctl_req);
+    acb = blk_aio_ioctl(blk->blk, SG_IO, &ioctl_req->hdr,
+                        virtio_blk_ioctl_complete, ioctl_req);
+    if (!acb) {
+        g_free(ioctl_req);
+        status = VIRTIO_BLK_S_UNSUPP;
+        goto fail;
+    }
     return -EINPROGRESS;
 #else
     abort();
-- 
2.1.0

Re: [Qemu-devel] [PATCH v2] virtio-blk: Check return value of blk_aio_ioctl

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 532 bytes --]

On Tue, Feb 17, 2015 at 05:55:53PM +0800, Fam Zheng wrote:
> Since commit 1dc936aa84 (virtio-blk: Use blk_aio_ioctl) we silently lose
> the request if blk_aio_ioctl returns NULL (not implemented).
> 
> Fix it by directly returning VIRTIO_BLK_S_UNSUPP as we used to do.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> 
> ---
> v2: Fix the leak of ioctl_req. (Kevin)
> ---
>  hw/block/virtio-blk.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]

Re: [Qemu-devel] [PATCH v2] virtio-blk: Check return value of blk_aio_ioctl

[Kevin Wolf]

[-- Attachment #1: Type: text/plain, Size: 668 bytes --]

Am 17.02.2015 um 16:40 hat Stefan Hajnoczi geschrieben:
> On Tue, Feb 17, 2015 at 05:55:53PM +0800, Fam Zheng wrote:
> > Since commit 1dc936aa84 (virtio-blk: Use blk_aio_ioctl) we silently lose
> > the request if blk_aio_ioctl returns NULL (not implemented).
> > 
> > Fix it by directly returning VIRTIO_BLK_S_UNSUPP as we used to do.
> > 
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > 
> > ---
> > v2: Fix the leak of ioctl_req. (Kevin)
> > ---
> >  hw/block/virtio-blk.c | 10 ++++++++--
> >  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Thanks, applied to the block branch.

Kevin

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]