Commit f519fbbc authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvmf: fix SCT for fabrics command-specific errors 



Some of the uses of SPDK_NVMF_FABRIC_SC_* were neglecting to set SCT to
indicate that these status codes are from the command-specific set.

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


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 9661d8db

lib/nvmf/ctrlr.c

+5 −0
Original line number Diff line number Diff line
@@ -570,6 +570,7 @@ spdk_nvmf_property_get(struct spdk_nvmf_request *req) 
	if (cmd->attrib.size != SPDK_NVMF_PROP_SIZE_4 &&

	    cmd->attrib.size != SPDK_NVMF_PROP_SIZE_8) {

		SPDK_ERRLOG("Invalid size value %d\n", cmd->attrib.size);

		response->status.sct = SPDK_NVME_SCT_COMMAND_SPECIFIC;

		response->status.sc = SPDK_NVMF_FABRIC_SC_INVALID_PARAM;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}
@@ -584,6 +585,7 @@ spdk_nvmf_property_get(struct spdk_nvmf_request *req) 
	if (cmd->attrib.size != prop->size) {

		SPDK_ERRLOG("offset 0x%x size mismatch: cmd %u, prop %u\n",

			    cmd->ofst, cmd->attrib.size, prop->size);

		response->status.sct = SPDK_NVME_SCT_COMMAND_SPECIFIC;

		response->status.sc = SPDK_NVMF_FABRIC_SC_INVALID_PARAM;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}
@@ -609,6 +611,7 @@ spdk_nvmf_property_set(struct spdk_nvmf_request *req) 
	prop = find_prop(cmd->ofst);

	if (prop == NULL || prop->set_cb == NULL) {

		SPDK_ERRLOG("Invalid offset 0x%x\n", cmd->ofst);

		response->status.sct = SPDK_NVME_SCT_COMMAND_SPECIFIC;

		response->status.sc = SPDK_NVMF_FABRIC_SC_INVALID_PARAM;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}
@@ -617,6 +620,7 @@ spdk_nvmf_property_set(struct spdk_nvmf_request *req) 
	if (cmd->attrib.size != prop->size) {

		SPDK_ERRLOG("offset 0x%x size mismatch: cmd %u, prop %u\n",

			    cmd->ofst, cmd->attrib.size, prop->size);

		response->status.sct = SPDK_NVME_SCT_COMMAND_SPECIFIC;

		response->status.sc = SPDK_NVMF_FABRIC_SC_INVALID_PARAM;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}
@@ -628,6 +632,7 @@ spdk_nvmf_property_set(struct spdk_nvmf_request *req) 


	if (!prop->set_cb(ctrlr, value)) {

		SPDK_ERRLOG("prop set_cb failed\n");

		response->status.sct = SPDK_NVME_SCT_COMMAND_SPECIFIC;

		response->status.sc = SPDK_NVMF_FABRIC_SC_INVALID_PARAM;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}