Commit efb2ed87 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

nvme/fabric: extract prop set/get to separate sync/async functions 



It will make it easier to support asynchronous register set/get
functions.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I9915609ff940596ae4d67388238cc685dfa426fa
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8608


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 1bea8805

lib/nvme/nvme_fabric.c

+44 −28
Original line number Diff line number Diff line
@@ -43,28 +43,37 @@ 


static int

nvme_fabric_prop_set_cmd(struct spdk_nvme_ctrlr *ctrlr,

			 uint32_t offset, uint8_t size, uint64_t value)

			 uint32_t offset, uint8_t size, uint64_t value,

			 spdk_nvme_cmd_cb cb_fn, void *cb_arg)

{

	struct spdk_nvmf_fabric_prop_set_cmd cmd = {};

	struct nvme_completion_poll_status *status;

	int rc;



	assert(size == SPDK_NVMF_PROP_SIZE_4 || size == SPDK_NVMF_PROP_SIZE_8);



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

	if (!status) {

		SPDK_ERRLOG("Failed to allocate status tracker\n");

		return -ENOMEM;

	}



	cmd.opcode = SPDK_NVME_OPC_FABRIC;

	cmd.fctype = SPDK_NVMF_FABRIC_COMMAND_PROPERTY_SET;

	cmd.ofst = offset;

	cmd.attrib.size = size;

	cmd.value.u64 = value;



	rc = spdk_nvme_ctrlr_cmd_admin_raw(ctrlr, (struct spdk_nvme_cmd *)&cmd,

					   NULL, 0,

	return spdk_nvme_ctrlr_cmd_admin_raw(ctrlr, (struct spdk_nvme_cmd *)&cmd,

					     NULL, 0, cb_fn, cb_arg);

}



static int

nvme_fabric_prop_set_cmd_sync(struct spdk_nvme_ctrlr *ctrlr,

			      uint32_t offset, uint8_t size, uint64_t value)

{

	struct nvme_completion_poll_status *status;

	int rc;



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

	if (!status) {

		SPDK_ERRLOG("Failed to allocate status tracker\n");

		return -ENOMEM;

	}



	rc = nvme_fabric_prop_set_cmd(ctrlr, offset, size, value,

				      nvme_completion_poll_cb, status);

	if (rc < 0) {

		free(status);
@@ -84,30 +93,37 @@ nvme_fabric_prop_set_cmd(struct spdk_nvme_ctrlr *ctrlr, 
}



static int

nvme_fabric_prop_get_cmd(struct spdk_nvme_ctrlr *ctrlr,

			 uint32_t offset, uint8_t size, uint64_t *value)

nvme_fabric_prop_get_cmd(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint8_t size,

			 spdk_nvme_cmd_cb cb_fn, void *cb_arg)

{

	struct spdk_nvmf_fabric_prop_set_cmd cmd = {};



	assert(size == SPDK_NVMF_PROP_SIZE_4 || size == SPDK_NVMF_PROP_SIZE_8);



	cmd.opcode = SPDK_NVME_OPC_FABRIC;

	cmd.fctype = SPDK_NVMF_FABRIC_COMMAND_PROPERTY_GET;

	cmd.ofst = offset;

	cmd.attrib.size = size;



	return spdk_nvme_ctrlr_cmd_admin_raw(ctrlr, (struct spdk_nvme_cmd *)&cmd,

					     NULL, 0, cb_fn, cb_arg);

}



static int

nvme_fabric_prop_get_cmd_sync(struct spdk_nvme_ctrlr *ctrlr,

			      uint32_t offset, uint8_t size, uint64_t *value)

{

	struct nvme_completion_poll_status *status;

	struct spdk_nvmf_fabric_prop_get_rsp *response;

	int rc;



	assert(size == SPDK_NVMF_PROP_SIZE_4 || size == SPDK_NVMF_PROP_SIZE_8);



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

	if (!status) {

		SPDK_ERRLOG("Failed to allocate status tracker\n");

		return -ENOMEM;

	}



	cmd.opcode = SPDK_NVME_OPC_FABRIC;

	cmd.fctype = SPDK_NVMF_FABRIC_COMMAND_PROPERTY_GET;

	cmd.ofst = offset;

	cmd.attrib.size = size;



	rc = spdk_nvme_ctrlr_cmd_admin_raw(ctrlr, (struct spdk_nvme_cmd *)&cmd,

					   NULL, 0, nvme_completion_poll_cb,

					   status);

	rc = nvme_fabric_prop_get_cmd(ctrlr, offset, size, nvme_completion_poll_cb, status);

	if (rc < 0) {

		free(status);

		return rc;
@@ -137,13 +153,13 @@ nvme_fabric_prop_get_cmd(struct spdk_nvme_ctrlr *ctrlr, 
int

nvme_fabric_ctrlr_set_reg_4(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint32_t value)

{

	return nvme_fabric_prop_set_cmd(ctrlr, offset, SPDK_NVMF_PROP_SIZE_4, value);

	return nvme_fabric_prop_set_cmd_sync(ctrlr, offset, SPDK_NVMF_PROP_SIZE_4, value);

}



int

nvme_fabric_ctrlr_set_reg_8(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint64_t value)

{

	return nvme_fabric_prop_set_cmd(ctrlr, offset, SPDK_NVMF_PROP_SIZE_8, value);

	return nvme_fabric_prop_set_cmd_sync(ctrlr, offset, SPDK_NVMF_PROP_SIZE_8, value);

}



int
@@ -151,7 +167,7 @@ nvme_fabric_ctrlr_get_reg_4(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint 
{

	uint64_t tmp_value;

	int rc;

	rc = nvme_fabric_prop_get_cmd(ctrlr, offset, SPDK_NVMF_PROP_SIZE_4, &tmp_value);

	rc = nvme_fabric_prop_get_cmd_sync(ctrlr, offset, SPDK_NVMF_PROP_SIZE_4, &tmp_value);



	if (!rc) {

		*value = (uint32_t)tmp_value;
@@ -162,7 +178,7 @@ nvme_fabric_ctrlr_get_reg_4(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint 
int

nvme_fabric_ctrlr_get_reg_8(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint64_t *value)

{

	return nvme_fabric_prop_get_cmd(ctrlr, offset, SPDK_NVMF_PROP_SIZE_8, value);

	return nvme_fabric_prop_get_cmd_sync(ctrlr, offset, SPDK_NVMF_PROP_SIZE_8, value);

}



static void

test/unit/lib/nvme/nvme_fabric.c/nvme_fabric_ut.c

+3 −3
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ test_nvme_fabric_prop_set_cmd(void) 


	memset(&g_ut_cmd, 0, sizeof(g_ut_cmd));



	rc = nvme_fabric_prop_set_cmd(&ctrlr, 1024, SPDK_NVMF_PROP_SIZE_8, 4096);

	rc = nvme_fabric_prop_set_cmd_sync(&ctrlr, 1024, SPDK_NVMF_PROP_SIZE_8, 4096);

	CU_ASSERT(rc == 0);

	CU_ASSERT(g_ut_cmd.opcode == SPDK_NVME_OPC_FABRIC);

	CU_ASSERT(g_ut_cmd.fctype == SPDK_NVMF_FABRIC_COMMAND_PROPERTY_SET);
@@ -273,7 +273,7 @@ test_nvme_fabric_prop_get_cmd(void) 
	value = 0xFFDEADBEEF;



	/* Case 1: size is SPDK_NVMF_PROP_SIZE_4 */

	rc = nvme_fabric_prop_get_cmd(&ctrlr, 1024, SPDK_NVMF_PROP_SIZE_4, &value);

	rc = nvme_fabric_prop_get_cmd_sync(&ctrlr, 1024, SPDK_NVMF_PROP_SIZE_4, &value);

	CU_ASSERT(rc == 0);

	CU_ASSERT(g_ut_cmd.opcode == SPDK_NVME_OPC_FABRIC);

	CU_ASSERT(g_ut_cmd.fctype == SPDK_NVMF_FABRIC_COMMAND_PROPERTY_GET);
@@ -285,7 +285,7 @@ test_nvme_fabric_prop_get_cmd(void) 
	memset(&g_ut_cmd, 0, sizeof(g_ut_cmd));

	memset(&g_ut_response, 0, sizeof(g_ut_response));



	rc = nvme_fabric_prop_get_cmd(&ctrlr, 1024, SPDK_NVMF_PROP_SIZE_8, &value);

	rc = nvme_fabric_prop_get_cmd_sync(&ctrlr, 1024, SPDK_NVMF_PROP_SIZE_8, &value);

	CU_ASSERT(rc == 0);

	CU_ASSERT(g_ut_cmd.opcode == SPDK_NVME_OPC_FABRIC);

	CU_ASSERT(g_ut_cmd.fctype == SPDK_NVMF_FABRIC_COMMAND_PROPERTY_GET);