Commit ddb17216 authored by Piotr Pelplinski's avatar Piotr Pelplinski Committed by Jim Harris
Browse files

nvmf: provide ctrlr to spdk_nvmf_ctrlr_identify_ns 



Signed-off-by: default avatarPiotr Pelplinski <piotr.pelplinski@intel.com>
Change-Id: I90f68e9dbe00854f569f6574b9c89508f89caa43
Reviewed-on: https://review.gerrithub.io/428876


Reviewed-by: default avatarMaciej Szwed <maciej.szwed@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent 1250a416

lib/nvmf/ctrlr.c

+3 −2
Original line number Diff line number Diff line
@@ -1136,11 +1136,12 @@ invalid_log_page: 
}



static int

spdk_nvmf_ctrlr_identify_ns(struct spdk_nvmf_subsystem *subsystem,

spdk_nvmf_ctrlr_identify_ns(struct spdk_nvmf_ctrlr *ctrlr,

			    struct spdk_nvme_cmd *cmd,

			    struct spdk_nvme_cpl *rsp,

			    struct spdk_nvme_ns_data *nsdata)

{

	struct spdk_nvmf_subsystem *subsystem = ctrlr->subsys;

	struct spdk_nvmf_ns *ns;



	if (cmd->nsid == 0 || cmd->nsid > subsystem->max_nsid) {
@@ -1368,7 +1369,7 @@ spdk_nvmf_ctrlr_identify(struct spdk_nvmf_request *req) 


	switch (cns) {

	case SPDK_NVME_IDENTIFY_NS:

		return spdk_nvmf_ctrlr_identify_ns(subsystem, cmd, rsp, req->data);

		return spdk_nvmf_ctrlr_identify_ns(ctrlr, cmd, rsp, req->data);

	case SPDK_NVME_IDENTIFY_CTRLR:

		return spdk_nvmf_ctrlr_identify_ctrlr(ctrlr, req->data);

	case SPDK_NVME_IDENTIFY_ACTIVE_NS_LIST:

test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c

+7 −6
Original line number Diff line number Diff line
@@ -691,6 +691,7 @@ static void 
test_identify_ns(void)

{

	struct spdk_nvmf_subsystem subsystem = {};

	struct spdk_nvmf_ctrlr ctrlr = { .subsys = &subsystem };

	struct spdk_nvme_cmd cmd = {};

	struct spdk_nvme_cpl rsp = {};

	struct spdk_nvme_ns_data nsdata = {};
@@ -705,7 +706,7 @@ test_identify_ns(void) 
	cmd.nsid = 0;

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

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

	CU_ASSERT(spdk_nvmf_ctrlr_identify_ns(&subsystem, &cmd, &rsp,

	CU_ASSERT(spdk_nvmf_ctrlr_identify_ns(&ctrlr, &cmd, &rsp,

					      &nsdata) == SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE);

	CU_ASSERT(rsp.status.sct == SPDK_NVME_SCT_GENERIC);

	CU_ASSERT(rsp.status.sc == SPDK_NVME_SC_INVALID_NAMESPACE_OR_FORMAT);
@@ -715,7 +716,7 @@ test_identify_ns(void) 
	cmd.nsid = 1;

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

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

	CU_ASSERT(spdk_nvmf_ctrlr_identify_ns(&subsystem, &cmd, &rsp,

	CU_ASSERT(spdk_nvmf_ctrlr_identify_ns(&ctrlr, &cmd, &rsp,

					      &nsdata) == SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE);

	CU_ASSERT(rsp.status.sct == SPDK_NVME_SCT_GENERIC);

	CU_ASSERT(rsp.status.sc == SPDK_NVME_SC_SUCCESS);
@@ -725,7 +726,7 @@ test_identify_ns(void) 
	cmd.nsid = 2;

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

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

	CU_ASSERT(spdk_nvmf_ctrlr_identify_ns(&subsystem, &cmd, &rsp,

	CU_ASSERT(spdk_nvmf_ctrlr_identify_ns(&ctrlr, &cmd, &rsp,

					      &nsdata) == SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE);

	CU_ASSERT(rsp.status.sct == SPDK_NVME_SCT_GENERIC);

	CU_ASSERT(rsp.status.sc == SPDK_NVME_SC_SUCCESS);
@@ -735,7 +736,7 @@ test_identify_ns(void) 
	cmd.nsid = 3;

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

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

	CU_ASSERT(spdk_nvmf_ctrlr_identify_ns(&subsystem, &cmd, &rsp,

	CU_ASSERT(spdk_nvmf_ctrlr_identify_ns(&ctrlr, &cmd, &rsp,

					      &nsdata) == SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE);

	CU_ASSERT(rsp.status.sct == SPDK_NVME_SCT_GENERIC);

	CU_ASSERT(rsp.status.sc == SPDK_NVME_SC_SUCCESS);
@@ -745,7 +746,7 @@ test_identify_ns(void) 
	cmd.nsid = 4;

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

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

	CU_ASSERT(spdk_nvmf_ctrlr_identify_ns(&subsystem, &cmd, &rsp,

	CU_ASSERT(spdk_nvmf_ctrlr_identify_ns(&ctrlr, &cmd, &rsp,

					      &nsdata) == SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE);

	CU_ASSERT(rsp.status.sct == SPDK_NVME_SCT_GENERIC);

	CU_ASSERT(rsp.status.sc == SPDK_NVME_SC_INVALID_NAMESPACE_OR_FORMAT);
@@ -755,7 +756,7 @@ test_identify_ns(void) 
	cmd.nsid = 0xFFFFFFFF;

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

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

	CU_ASSERT(spdk_nvmf_ctrlr_identify_ns(&subsystem, &cmd, &rsp,

	CU_ASSERT(spdk_nvmf_ctrlr_identify_ns(&ctrlr, &cmd, &rsp,

					      &nsdata) == SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE);

	CU_ASSERT(rsp.status.sct == SPDK_NVME_SCT_GENERIC);

	CU_ASSERT(rsp.status.sc == SPDK_NVME_SC_INVALID_NAMESPACE_OR_FORMAT);