Commit ce6e223b authored by Changpeng Liu's avatar Changpeng Liu Committed by Jim Harris
Browse files

vhost-blk: add flush command support 



For the backend block device which can support flush command,
vhost-blk should report such feature to Guest, and leave such
decision to Guest.

Change-Id: I6cd6fd94ed80256ffe268bc1bf2c1dd57a164825
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/439605


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarZiye Yang <optimistyzy@gmail.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarGangCao <gang.cao@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent edb6e5b4

lib/vhost/vhost_blk.c

+24 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ process_blk_request(struct spdk_vhost_blk_task *task, 
	struct iovec *iov;

	uint32_t type;

	uint32_t payload_len;

	uint64_t flush_bytes;

	int rc;



	if (blk_iovs_setup(bvsession, vq, task->req_idx, task->iovs, &task->iovcnt, &payload_len)) {
@@ -365,6 +366,26 @@ process_blk_request(struct spdk_vhost_blk_task *task, 
			}

		}

		break;

	case VIRTIO_BLK_T_FLUSH:

		flush_bytes = spdk_bdev_get_num_blocks(bvdev->bdev) * spdk_bdev_get_block_size(bvdev->bdev);

		if (req->sector != 0) {

			SPDK_NOTICELOG("sector must be zero for flush command\n");

			invalid_blk_request(task, VIRTIO_BLK_S_IOERR);

			return -1;

		}

		rc = spdk_bdev_flush(bvdev->bdev_desc, bvsession->io_channel,

				     0, flush_bytes,

				     blk_request_complete_cb, task);

		if (rc) {

			if (rc == -ENOMEM) {

				SPDK_DEBUGLOG(SPDK_LOG_VHOST_BLK, "No memory, start to queue io.\n");

				blk_request_queue_io(task);

			} else {

				invalid_blk_request(task, VIRTIO_BLK_S_IOERR);

				return -1;

			}

		}

		break;

	case VIRTIO_BLK_T_GET_ID:

		if (!task->iovcnt || !payload_len) {

			invalid_blk_request(task, VIRTIO_BLK_S_UNSUPP);
@@ -986,6 +1007,9 @@ spdk_vhost_blk_construct(const char *name, const char *cpumask, const char *dev_ 
	if (readonly) {

		features |= (1ULL << VIRTIO_BLK_F_RO);

	}

	if (spdk_bdev_io_type_supported(bdev, SPDK_BDEV_IO_TYPE_FLUSH)) {

		features |= (1ULL << VIRTIO_BLK_F_FLUSH);

	}



	if (features && rte_vhost_driver_enable_features(bvdev->vdev.path, features)) {

		SPDK_ERRLOG("Controller %s: failed to enable features 0x%"PRIx64"\n", name, features);