d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vhost_blk: fix error code in IO path and simplify process_blk_request

Browse Source 
Failures in IO path should return VIRTIO_BLK_S_IOERR instead
VIRTIO_BLK_S_UNSUPP.

Change-Id: Ic0a36ae95b16e15c1e0c67e9e5c848b14ad0ba75
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/368788
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Pawel Wodkowski 2017-07-10 21:19:56 +02:00 committed by Jim Harris
parent ac4398a31d
commit 1eaba102ed
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lib/vhost/vhost_blk.c
View File

@ -191,20 +191,16 @@ blk_request_complete_cb(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg
blk_request_finish(success, task); blk_request_finish(success, task);
} }
static void static int
process_blk_request(struct spdk_vhost_blk_task *task, struct spdk_vhost_blk_dev *bvdev, process_blk_request(struct spdk_vhost_blk_task *task, struct spdk_vhost_blk_dev *bvdev,
uint16_t req_idx) uint16_t req_idx)
{ {
struct rte_vhost_vring *vq = &bvdev->vdev.virtqueue[0]; struct rte_vhost_vring *vq = &bvdev->vdev.virtqueue[0];
const struct virtio_blk_outhdr *req; const struct virtio_blk_outhdr *req;
struct iovec *iov; struct iovec *iov;
uint64_t offset;
uint32_t type; uint32_t type;
int rc; int rc;
SPDK_TRACELOG(SPDK_TRACE_VHOST_BLK, "====== Starting processing request idx %"PRIu16"======\n",
req_idx);
assert(task->bvdev == bvdev); assert(task->bvdev == bvdev);
task->req_idx = req_idx; task->req_idx = req_idx;
task->iovcnt = SPDK_COUNTOF(task->iovs); task->iovcnt = SPDK_COUNTOF(task->iovs);
@ -212,7 +208,8 @@ process_blk_request(struct spdk_vhost_blk_task *task, struct spdk_vhost_blk_dev
if (blk_iovs_setup(&bvdev->vdev, vq, req_idx, task->iovs, &task->iovcnt, &task->length)) { if (blk_iovs_setup(&bvdev->vdev, vq, req_idx, task->iovs, &task->iovcnt, &task->length)) {
SPDK_TRACELOG(SPDK_TRACE_VHOST_BLK, "Invalid request (req_idx = %"PRIu16").\n", req_idx); SPDK_TRACELOG(SPDK_TRACE_VHOST_BLK, "Invalid request (req_idx = %"PRIu16").\n", req_idx);
/* Only READ and WRITE are supported for now. */ /* Only READ and WRITE are supported for now. */
goto err; invalid_blk_request(task, VIRTIO_BLK_S_UNSUPP);
return -1;
} }
iov = &task->iovs[0]; iov = &task->iovs[0];
@ -220,7 +217,8 @@ process_blk_request(struct spdk_vhost_blk_task *task, struct spdk_vhost_blk_dev
SPDK_TRACELOG(SPDK_TRACE_VHOST_BLK, SPDK_TRACELOG(SPDK_TRACE_VHOST_BLK,
"First descriptor size is %zu but expected %zu (req_idx = %"PRIu16").\n", "First descriptor size is %zu but expected %zu (req_idx = %"PRIu16").\n",
iov->iov_len, sizeof(*req), req_idx); iov->iov_len, sizeof(*req), req_idx);
goto err; invalid_blk_request(task, VIRTIO_BLK_S_UNSUPP);
return -1;
} }
req = iov->iov_base; req = iov->iov_base;
@ -230,7 +228,8 @@ process_blk_request(struct spdk_vhost_blk_task *task, struct spdk_vhost_blk_dev
SPDK_TRACELOG(SPDK_TRACE_VHOST_BLK, SPDK_TRACELOG(SPDK_TRACE_VHOST_BLK,
"Last descriptor size is %zu but expected %d (req_idx = %"PRIu16").\n", "Last descriptor size is %zu but expected %d (req_idx = %"PRIu16").\n",
iov->iov_len, 1, req_idx); iov->iov_len, 1, req_idx);
goto err; invalid_blk_request(task, VIRTIO_BLK_S_UNSUPP);
return -1;
} }
task->status = iov->iov_base; task->status = iov->iov_base;
@ -246,20 +245,20 @@ process_blk_request(struct spdk_vhost_blk_task *task, struct spdk_vhost_blk_dev
switch (type) { switch (type) {
case VIRTIO_BLK_T_IN: case VIRTIO_BLK_T_IN:
case VIRTIO_BLK_T_OUT: case VIRTIO_BLK_T_OUT:
offset = req->sector * 512;
if (spdk_unlikely((task->length & (512 - 1)) != 0)) { if (spdk_unlikely((task->length & (512 - 1)) != 0)) {
SPDK_ERRLOG("%s - passed IO buffer is not multiple of 512b (req_idx = %"PRIu16").\n", SPDK_ERRLOG("%s - passed IO buffer is not multiple of 512b (req_idx = %"PRIu16").\n",
type ? "WRITE" : "READ", req_idx); type ? "WRITE" : "READ", req_idx);
goto err; invalid_blk_request(task, VIRTIO_BLK_S_UNSUPP);
return -1;
} }
if (type == VIRTIO_BLK_T_IN) { if (type == VIRTIO_BLK_T_IN) {
rc = spdk_bdev_readv(bvdev->bdev, bvdev->bdev_io_channel, rc = spdk_bdev_readv(bvdev->bdev, bvdev->bdev_io_channel,
&task->iovs[1], task->iovcnt, offset, &task->iovs[1], task->iovcnt, req->sector * 512,
task->length, blk_request_complete_cb, task); task->length, blk_request_complete_cb, task);
} else if (!bvdev->readonly) { } else if (!bvdev->readonly) {
rc = spdk_bdev_writev(bvdev->bdev, bvdev->bdev_io_channel, rc = spdk_bdev_writev(bvdev->bdev, bvdev->bdev_io_channel,
&task->iovs[1], task->iovcnt, offset, &task->iovs[1], task->iovcnt, req->sector * 512,
task->length, blk_request_complete_cb, task); task->length, blk_request_complete_cb, task);
} else { } else {
SPDK_TRACELOG(SPDK_TRACE_VHOST_BLK, "Device is in read-only mode!\n"); SPDK_TRACELOG(SPDK_TRACE_VHOST_BLK, "Device is in read-only mode!\n");
@ -267,12 +266,14 @@ process_blk_request(struct spdk_vhost_blk_task *task, struct spdk_vhost_blk_dev
} }
if (rc) { if (rc) {
goto err; invalid_blk_request(task, VIRTIO_BLK_S_IOERR);
return -1;
} }
break; break;
case VIRTIO_BLK_T_GET_ID: case VIRTIO_BLK_T_GET_ID:
if (!task->iovcnt || !task->length) { if (!task->iovcnt || !task->length) {
goto err; invalid_blk_request(task, VIRTIO_BLK_S_UNSUPP);
return -1;
} }
task->length = spdk_min((size_t)VIRTIO_BLK_ID_BYTES, task->iovs[1].iov_len); task->length = spdk_min((size_t)VIRTIO_BLK_ID_BYTES, task->iovs[1].iov_len);
spdk_strcpy_pad(task->iovs[1].iov_base, spdk_bdev_get_product_name(bvdev->bdev), task->length, ' '); spdk_strcpy_pad(task->iovs[1].iov_base, spdk_bdev_get_product_name(bvdev->bdev), task->length, ' ');
@ -280,16 +281,11 @@ process_blk_request(struct spdk_vhost_blk_task *task, struct spdk_vhost_blk_dev
break; break;
default: default:
SPDK_TRACELOG(SPDK_TRACE_VHOST_BLK, "Not supported request type '%"PRIu32"'.\n", type); SPDK_TRACELOG(SPDK_TRACE_VHOST_BLK, "Not supported request type '%"PRIu32"'.\n", type);
goto err; invalid_blk_request(task, VIRTIO_BLK_S_UNSUPP);
return -1;
} }
SPDK_TRACELOG(SPDK_TRACE_VHOST_BLK, "====== Task %p req_idx %d submitted ======\n", task, return 0;
req_idx);
return;
err:
invalid_blk_request(task, VIRTIO_BLK_S_UNSUPP);
SPDK_TRACELOG(SPDK_TRACE_VHOST_BLK, "====== Task %p req_idx %d failed ======\n", task, req_idx);
} }
static void static void
@ -298,6 +294,7 @@ vdev_worker(void *arg)
struct spdk_vhost_blk_dev *bvdev = arg; struct spdk_vhost_blk_dev *bvdev = arg;
struct rte_vhost_vring *vq = &bvdev->vdev.virtqueue[0]; struct rte_vhost_vring *vq = &bvdev->vdev.virtqueue[0];
struct spdk_vhost_blk_task *tasks[32] = {0}; struct spdk_vhost_blk_task *tasks[32] = {0};
int rc;
uint16_t reqs[32]; uint16_t reqs[32];
uint16_t reqs_cnt, i; uint16_t reqs_cnt, i;
@ -308,7 +305,15 @@ vdev_worker(void *arg)
spdk_vhost_blk_get_tasks(bvdev, tasks, reqs_cnt); spdk_vhost_blk_get_tasks(bvdev, tasks, reqs_cnt);
for (i = 0; i < reqs_cnt; i++) { for (i = 0; i < reqs_cnt; i++) {
process_blk_request(tasks[i], bvdev, reqs[i]); SPDK_TRACELOG(SPDK_TRACE_VHOST_BLK, "====== Starting processing request idx %"PRIu16"======\n",
reqs[i]);
rc = process_blk_request(tasks[i], bvdev, reqs[i]);
if (rc == 0) {
SPDK_TRACELOG(SPDK_TRACE_VHOST_BLK, "====== Task %p req_idx %d submitted ======\n", tasks[i],
reqs[i]);
} else {
SPDK_TRACELOG(SPDK_TRACE_VHOST_BLK, "====== Task %p req_idx %d failed ======\n", tasks[i], reqs[i]);
}
} }
} }