Commit 1578b5b5 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvmf: convert to bdev _blocks APIs 



Change-Id: I46dea98bf762967d49867e428f8ce6b3ec881072
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/376257


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 1b46bec7

lib/nvmf/ctrlr_bdev.c

+8 −12
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ nvmf_bdev_ctrlr_rw_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, 
	uint64_t lba_address;

	uint64_t blockcnt;

	uint64_t io_bytes;

	uint64_t offset;

	uint64_t llen;

	uint32_t block_size = spdk_bdev_get_block_size(bdev);

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;
@@ -133,7 +132,6 @@ nvmf_bdev_ctrlr_rw_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, 
	blockcnt = spdk_bdev_get_num_blocks(bdev);

	lba_address = cmd->cdw11;

	lba_address = (lba_address << 32) + cmd->cdw10;

	offset = lba_address * block_size;

	llen = cdw12->nlb + 1;



	if (lba_address >= blockcnt || llen > blockcnt || lba_address > (blockcnt - llen)) {
@@ -151,15 +149,15 @@ nvmf_bdev_ctrlr_rw_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, 


	if (cmd->opc == SPDK_NVME_OPC_READ) {

		spdk_trace_record(TRACE_NVMF_LIB_READ_START, 0, 0, (uint64_t)req, 0);

		if (spdk_bdev_read(desc, ch, req->data, offset, req->length, nvmf_bdev_ctrlr_complete_cmd,

				   req)) {

		if (spdk_bdev_read_blocks(desc, ch, req->data, lba_address, llen,

					  nvmf_bdev_ctrlr_complete_cmd, req)) {

			response->status.sc = SPDK_NVME_SC_INTERNAL_DEVICE_ERROR;

			return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

		}

	} else {

		spdk_trace_record(TRACE_NVMF_LIB_WRITE_START, 0, 0, (uint64_t)req, 0);

		if (spdk_bdev_write(desc, ch, req->data, offset, req->length, nvmf_bdev_ctrlr_complete_cmd,

				    req)) {

		if (spdk_bdev_write_blocks(desc, ch, req->data, lba_address, llen,

					   nvmf_bdev_ctrlr_complete_cmd, req)) {

			response->status.sc = SPDK_NVME_SC_INTERNAL_DEVICE_ERROR;

			return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

		}
@@ -172,11 +170,10 @@ static int 
nvmf_bdev_ctrlr_flush_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

			  struct spdk_io_channel *ch, struct spdk_nvmf_request *req)

{

	uint64_t nbytes;

	struct spdk_nvme_cpl *response = &req->rsp->nvme_cpl;



	nbytes = spdk_bdev_get_num_blocks(bdev) * spdk_bdev_get_block_size(bdev);

	if (spdk_bdev_flush(desc, ch, 0, nbytes, nvmf_bdev_ctrlr_complete_cmd, req)) {

	if (spdk_bdev_flush_blocks(desc, ch, 0, spdk_bdev_get_num_blocks(bdev),

				   nvmf_bdev_ctrlr_complete_cmd, req)) {

		response->status.sc = SPDK_NVME_SC_INTERNAL_DEVICE_ERROR;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}
@@ -235,7 +232,6 @@ nvmf_bdev_ctrlr_dsm_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, 
		struct spdk_nvme_dsm_range *dsm_range;

		uint64_t lba;

		uint32_t lba_count;

		uint32_t block_size = spdk_bdev_get_block_size(bdev);



		unmap_ctx = calloc(1, sizeof(*unmap_ctx));

		if (!unmap_ctx) {
@@ -255,7 +251,7 @@ nvmf_bdev_ctrlr_dsm_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, 


			unmap_ctx->count++;



			if (spdk_bdev_unmap(desc, ch, lba * block_size, lba_count * block_size,

			if (spdk_bdev_unmap_blocks(desc, ch, lba, lba_count,

						   nvmf_virtual_ctrlr_dsm_cpl, unmap_ctx)) {

				response->status.sc = SPDK_NVME_SC_INTERNAL_DEVICE_ERROR;

				unmap_ctx->count--;

test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c

+12 −9
Original line number Diff line number Diff line
@@ -86,16 +86,17 @@ spdk_bdev_get_io_channel(struct spdk_bdev_desc *desc) 
}



int

spdk_bdev_flush(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,

		uint64_t offset, uint64_t length, spdk_bdev_io_completion_cb cb, void *cb_arg)

spdk_bdev_flush_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,

		       uint64_t offset_blocks, uint64_t num_blocks,

		       spdk_bdev_io_completion_cb cb, void *cb_arg)

{

	return 0;

}



int

spdk_bdev_unmap(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,

		uint64_t offset, uint64_t length, spdk_bdev_io_completion_cb cb,

		void *cb_arg)

spdk_bdev_unmap_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,

		       uint64_t offset_blocks, uint64_t num_blocks,

		       spdk_bdev_io_completion_cb cb, void *cb_arg)

{

	return 0;

}
@@ -113,15 +114,17 @@ spdk_bdev_io_type_supported(struct spdk_bdev *bdev, enum spdk_bdev_io_type io_ty 
}



int

spdk_bdev_write(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, void *buf,

		uint64_t offset, uint64_t nbytes, spdk_bdev_io_completion_cb cb, void *cb_arg)

spdk_bdev_write_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, void *buf,

		       uint64_t offset_blocks, uint64_t num_blocks,

		       spdk_bdev_io_completion_cb cb, void *cb_arg)

{

	return 0;

}



int

spdk_bdev_read(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, void *buf,

	       uint64_t offset, uint64_t nbytes, spdk_bdev_io_completion_cb cb, void *cb_arg)

spdk_bdev_read_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, void *buf,

		      uint64_t offset_blocks, uint64_t num_blocks,

		      spdk_bdev_io_completion_cb cb, void *cb_arg)

{

	return 0;

}