Commit 3dbaa93c authored by Ankit Kumar's avatar Ankit Kumar Committed by Tomasz Zawadzki
Browse files

nvmf: pass command dword 12 and 13 for write 



For write requests extract and add command dword 12 and 13 to
spdk_bdev_ext_io_opts.
Add a unit test to verify the same.

Change-Id: I2f63387dccd144dc4a725986887e652ad7d103d7
Signed-off-by: default avatarAnkit Kumar <ankit.kumar@samsung.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22791


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 19327fc3

lib/nvmf/ctrlr_bdev.c

+13 −1
Original line number Diff line number Diff line
@@ -208,6 +208,17 @@ nvmf_bdev_ctrlr_get_rw_params(const struct spdk_nvme_cmd *cmd, uint64_t *start_l 
	*num_blocks = (from_le32(&cmd->cdw12) & 0xFFFFu) + 1;

}



static void

nvmf_bdev_ctrlr_get_rw_ext_params(const struct spdk_nvme_cmd *cmd,

				  struct spdk_bdev_ext_io_opts *opts)

{

	/* Get CDW12 values */

	opts->nvme_cdw12.raw = from_le32(&cmd->cdw12);



	/* Get CDW13 values */

	opts->nvme_cdw13.raw = from_le32(&cmd->cdw13);

}



static bool

nvmf_bdev_ctrlr_lba_in_range(uint64_t bdev_num_blocks, uint64_t io_start_lba,

			     uint64_t io_num_blocks)
@@ -324,7 +335,7 @@ nvmf_bdev_ctrlr_write_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, 
			  struct spdk_io_channel *ch, struct spdk_nvmf_request *req)

{

	struct spdk_bdev_ext_io_opts opts = {

		.size = SPDK_SIZEOF(&opts, accel_sequence),

		.size = SPDK_SIZEOF(&opts, nvme_cdw13),

		.memory_domain = req->memory_domain,

		.memory_domain_ctx = req->memory_domain_ctx,

		.accel_sequence = req->accel_sequence,
@@ -338,6 +349,7 @@ nvmf_bdev_ctrlr_write_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, 
	int rc;



	nvmf_bdev_ctrlr_get_rw_params(cmd, &start_lba, &num_blocks);

	nvmf_bdev_ctrlr_get_rw_ext_params(cmd, &opts);



	if (spdk_unlikely(!nvmf_bdev_ctrlr_lba_in_range(bdev_num_blocks, start_lba, num_blocks))) {

		SPDK_ERRLOG("end of media\n");

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

+14 −0
Original line number Diff line number Diff line
@@ -303,6 +303,19 @@ test_get_rw_params(void) 
	CU_ASSERT(count == 0x9875 + 1); /* NOTE: this field is 0's based, hence the +1 */

}



static void

test_get_rw_ext_params(void)

{

	struct spdk_nvme_cmd cmd = {0};

	struct spdk_bdev_ext_io_opts opts = {0};



	to_le32(&cmd.cdw12, 0x9875 | SPDK_NVME_IO_FLAGS_DATA_PLACEMENT_DIRECTIVE);

	to_le32(&cmd.cdw13, 0x2 << 16);

	nvmf_bdev_ctrlr_get_rw_ext_params(&cmd, &opts);

	CU_ASSERT(opts.nvme_cdw12.raw == 0x209875);

	CU_ASSERT(opts.nvme_cdw13.raw == 0x20000);

}



static void

test_lba_in_range(void)

{
@@ -960,6 +973,7 @@ main(int argc, char **argv) 
	suite = CU_add_suite("nvmf", NULL, NULL);



	CU_ADD_TEST(suite, test_get_rw_params);

	CU_ADD_TEST(suite, test_get_rw_ext_params);

	CU_ADD_TEST(suite, test_lba_in_range);

	CU_ADD_TEST(suite, test_get_dif_ctx);

	CU_ADD_TEST(suite, test_nvmf_bdev_ctrlr_identify_ns);