[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/18] block/export: Fix incorrect length passed to vu_queue_push(
From: |
Kevin Wolf |
Subject: |
[PULL 07/18] block/export: Fix incorrect length passed to vu_queue_push() |
Date: |
Thu, 9 Jun 2022 19:21:38 +0200 |
From: Xie Yongji <xieyongji@bytedance.com>
Now the req->size is set to the correct value only
when handling VIRTIO_BLK_T_GET_ID request. This patch
fixes it.
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Message-Id: <20220523084611.91-3-xieyongji@bytedance.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/export/vhost-user-blk-server.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/block/export/vhost-user-blk-server.c
b/block/export/vhost-user-blk-server.c
index b2e458ade3..19c6ee51d3 100644
--- a/block/export/vhost-user-blk-server.c
+++ b/block/export/vhost-user-blk-server.c
@@ -60,8 +60,7 @@ static void vu_blk_req_complete(VuBlkReq *req)
{
VuDev *vu_dev = &req->server->vu_dev;
- /* IO size with 1 extra status byte */
- vu_queue_push(vu_dev, req->vq, &req->elem, req->size + 1);
+ vu_queue_push(vu_dev, req->vq, &req->elem, req->size);
vu_queue_notify(vu_dev, req->vq);
free(req);
@@ -207,6 +206,7 @@ static void coroutine_fn vu_blk_virtio_process_req(void
*opaque)
goto err;
}
+ req->size = iov_size(in_iov, in_num);
/* We always touch the last byte, so just see how big in_iov is. */
req->in = (void *)in_iov[in_num - 1].iov_base
+ in_iov[in_num - 1].iov_len
@@ -267,7 +267,6 @@ static void coroutine_fn vu_blk_virtio_process_req(void
*opaque)
VIRTIO_BLK_ID_BYTES);
snprintf(elem->in_sg[0].iov_base, size, "%s", "vhost_user_blk");
req->in->status = VIRTIO_BLK_S_OK;
- req->size = elem->in_sg[0].iov_len;
break;
}
case VIRTIO_BLK_T_DISCARD:
--
2.35.3
- [PULL 08/18] block/export: Abstract out the logic of virtio-blk I/O process, (continued)
- [PULL 08/18] block/export: Abstract out the logic of virtio-blk I/O process, Kevin Wolf, 2022/06/09
- [PULL 18/18] nbd: Drop dead code spotted by Coverity, Kevin Wolf, 2022/06/09
- [PULL 03/18] block: block_dirty_bitmap_merge(): fix error path, Kevin Wolf, 2022/06/09
- [PULL 13/18] libvduse: Add support for reconnecting, Kevin Wolf, 2022/06/09
- [PULL 11/18] vduse-blk: Implement vduse-blk export, Kevin Wolf, 2022/06/09
- [PULL 16/18] block/gluster: correctly set max_pdiscard, Kevin Wolf, 2022/06/09
- [PULL 17/18] aio_wait_kick: add missing memory barrier, Kevin Wolf, 2022/06/09
- [PULL 09/18] linux-headers: Add vduse.h, Kevin Wolf, 2022/06/09
- [PULL 06/18] block: Support passing NULL ops to blk_set_dev_ops(), Kevin Wolf, 2022/06/09
- [PULL 04/18] block: improve block_dirty_bitmap_merge(): don't allocate extra bitmap, Kevin Wolf, 2022/06/09
- [PULL 07/18] block/export: Fix incorrect length passed to vu_queue_push(),
Kevin Wolf <=
- [PULL 10/18] libvduse: Add VDUSE (vDPA Device in Userspace) library, Kevin Wolf, 2022/06/09
- [PULL 02/18] block: get rid of blk->guest_block_size, Kevin Wolf, 2022/06/09
- [PULL 05/18] block: simplify handling of try to merge different sized bitmaps, Kevin Wolf, 2022/06/09
- [PULL 14/18] qsd: document vduse-blk exports, Kevin Wolf, 2022/06/09
- [PULL 15/18] block/rbd: report a better error when namespace does not exist, Kevin Wolf, 2022/06/09
- [PULL 01/18] block: drop unused bdrv_co_drain() API, Kevin Wolf, 2022/06/09
- Re: [PULL 00/18] Block layer patches, Richard Henderson, 2022/06/09