* [Qemu-devel] [PATCH] virtio-blk: Check return value of blk_aio_ioctl
@ 2015-02-17 3:29 Fam Zheng
2015-02-17 6:48 ` Paolo Bonzini
2015-02-17 9:34 ` Kevin Wolf
0 siblings, 2 replies; 4+ messages in thread
From: Fam Zheng @ 2015-02-17 3:29 UTC (permalink / raw)
To: qemu-devel; +Cc: Kevin Wolf, Paolo Bonzini, Stefan Hajnoczi
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>
---
hw/block/virtio-blk.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 1a8a176..c7c8f20 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,12 @@ 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) {
+ status = VIRTIO_BLK_S_UNSUPP;
+ goto fail;
+ }
return -EINPROGRESS;
#else
abort();
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] virtio-blk: Check return value of blk_aio_ioctl
2015-02-17 3:29 [Qemu-devel] [PATCH] virtio-blk: Check return value of blk_aio_ioctl Fam Zheng
@ 2015-02-17 6:48 ` Paolo Bonzini
2015-02-17 9:34 ` Kevin Wolf
1 sibling, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2015-02-17 6:48 UTC (permalink / raw)
To: Fam Zheng, qemu-devel; +Cc: Kevin Wolf, Stefan Hajnoczi
On 17/02/2015 04:29, 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>
> ---
> hw/block/virtio-blk.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
> index 1a8a176..c7c8f20 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,12 @@ 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) {
> + status = VIRTIO_BLK_S_UNSUPP;
> + goto fail;
> + }
> return -EINPROGRESS;
> #else
> abort();
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] virtio-blk: Check return value of blk_aio_ioctl
2015-02-17 3:29 [Qemu-devel] [PATCH] virtio-blk: Check return value of blk_aio_ioctl Fam Zheng
2015-02-17 6:48 ` Paolo Bonzini
@ 2015-02-17 9:34 ` Kevin Wolf
2015-02-17 9:51 ` Fam Zheng
1 sibling, 1 reply; 4+ messages in thread
From: Kevin Wolf @ 2015-02-17 9:34 UTC (permalink / raw)
To: Fam Zheng; +Cc: Paolo Bonzini, qemu-devel, Stefan Hajnoczi
Am 17.02.2015 um 04:29 hat Fam Zheng geschrieben:
> 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>
> ---
> hw/block/virtio-blk.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
> index 1a8a176..c7c8f20 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,12 @@ 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) {
> + status = VIRTIO_BLK_S_UNSUPP;
> + goto fail;
> + }
> return -EINPROGRESS;
> #else
> abort();
This leaks ioctl_req.
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] virtio-blk: Check return value of blk_aio_ioctl
2015-02-17 9:34 ` Kevin Wolf
@ 2015-02-17 9:51 ` Fam Zheng
0 siblings, 0 replies; 4+ messages in thread
From: Fam Zheng @ 2015-02-17 9:51 UTC (permalink / raw)
To: Kevin Wolf; +Cc: Paolo Bonzini, qemu-devel, Stefan Hajnoczi
On Tue, 02/17 10:34, Kevin Wolf wrote:
> Am 17.02.2015 um 04:29 hat Fam Zheng geschrieben:
> > 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>
> > ---
> > hw/block/virtio-blk.c | 9 +++++++--
> > 1 file changed, 7 insertions(+), 2 deletions(-)
> >
> > diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
> > index 1a8a176..c7c8f20 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,12 @@ 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) {
> > + status = VIRTIO_BLK_S_UNSUPP;
> > + goto fail;
> > + }
> > return -EINPROGRESS;
> > #else
> > abort();
>
> This leaks ioctl_req.
>
Yes, will fix in v2. Thanks,
Fam
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-02-17 9:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-17 3:29 [Qemu-devel] [PATCH] virtio-blk: Check return value of blk_aio_ioctl Fam Zheng
2015-02-17 6:48 ` Paolo Bonzini
2015-02-17 9:34 ` Kevin Wolf
2015-02-17 9:51 ` Fam Zheng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).