Commit 5b4b66ba authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Ben Walker
Browse files

nvmf: move admin processing to ctrlr.c 



Now that the discovery controller is using the common admin command
functions, move all of them into the common ctrlr.c file.

This also eliminates the subsystem ops, which are now just direct calls.

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


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 3c423f40

include/spdk/nvmf.h

+0 −3
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ struct spdk_nvmf_qpair; 
struct spdk_nvmf_request;

struct spdk_bdev;

struct spdk_nvmf_request;

struct spdk_nvmf_ctrlr_ops;



typedef void (*spdk_nvmf_subsystem_connect_fn)(void *cb_ctx, struct spdk_nvmf_request *req);

typedef void (*spdk_nvmf_subsystem_disconnect_fn)(void *cb_ctx, struct spdk_nvmf_qpair *qpair);
@@ -100,8 +99,6 @@ struct spdk_nvmf_subsystem { 
		uint32_t max_nsid;

	} dev;



	const struct spdk_nvmf_ctrlr_ops *ops;



	void					*cb_ctx;

	spdk_nvmf_subsystem_connect_fn		connect_cb;

	spdk_nvmf_subsystem_disconnect_fn	disconnect_cb;

lib/nvmf/ctrlr.c

+186 −12
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ spdk_nvmf_ctrlr_get_qpair(struct spdk_nvmf_ctrlr *ctrlr, uint16_t qid) 
	return NULL;

}



struct spdk_nvmf_request *

static struct spdk_nvmf_request *

spdk_nvmf_qpair_get_request(struct spdk_nvmf_qpair *qpair, uint16_t cid)

{

	/* TODO: track list of outstanding requests in qpair? */
@@ -599,7 +599,7 @@ spdk_nvmf_ctrlr_poll(struct spdk_nvmf_ctrlr *ctrlr) 
	return 0;

}



int

static int

spdk_nvmf_ctrlr_set_features_host_identifier(struct spdk_nvmf_request *req)

{

	struct spdk_nvme_cpl *response = &req->rsp->nvme_cpl;
@@ -609,7 +609,7 @@ spdk_nvmf_ctrlr_set_features_host_identifier(struct spdk_nvmf_request *req) 
	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



int

static int

spdk_nvmf_ctrlr_get_features_host_identifier(struct spdk_nvmf_request *req)

{

	struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr;
@@ -634,7 +634,7 @@ spdk_nvmf_ctrlr_get_features_host_identifier(struct spdk_nvmf_request *req) 
	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



int

static int

spdk_nvmf_ctrlr_set_features_keep_alive_timer(struct spdk_nvmf_request *req)

{

	struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr;
@@ -656,7 +656,7 @@ spdk_nvmf_ctrlr_set_features_keep_alive_timer(struct spdk_nvmf_request *req) 
	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



int

static int

spdk_nvmf_ctrlr_get_features_keep_alive_timer(struct spdk_nvmf_request *req)

{

	struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr;
@@ -667,7 +667,7 @@ spdk_nvmf_ctrlr_get_features_keep_alive_timer(struct spdk_nvmf_request *req) 
	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



int

static int

spdk_nvmf_ctrlr_set_features_number_of_queues(struct spdk_nvmf_request *req)

{

	struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr;
@@ -693,7 +693,7 @@ spdk_nvmf_ctrlr_set_features_number_of_queues(struct spdk_nvmf_request *req) 
	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



int

static int

spdk_nvmf_ctrlr_get_features_number_of_queues(struct spdk_nvmf_request *req)

{

	struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr;
@@ -711,7 +711,17 @@ spdk_nvmf_ctrlr_get_features_number_of_queues(struct spdk_nvmf_request *req) 
	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



int

static int

spdk_nvmf_ctrlr_get_features_write_cache(struct spdk_nvmf_request *req)

{

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



	SPDK_TRACELOG(SPDK_TRACE_NVMF, "Get Features - Write Cache\n");

	rsp->cdw0 = 1;

	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



static int

spdk_nvmf_ctrlr_set_features_async_event_configuration(struct spdk_nvmf_request *req)

{

	struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr;
@@ -723,7 +733,7 @@ spdk_nvmf_ctrlr_set_features_async_event_configuration(struct spdk_nvmf_request 
	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



int

static int

spdk_nvmf_ctrlr_get_features_async_event_configuration(struct spdk_nvmf_request *req)

{

	struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr;
@@ -734,7 +744,7 @@ spdk_nvmf_ctrlr_get_features_async_event_configuration(struct spdk_nvmf_request 
	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



int

static int

spdk_nvmf_ctrlr_async_event_request(struct spdk_nvmf_request *req)

{

	struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr;
@@ -754,7 +764,7 @@ spdk_nvmf_ctrlr_async_event_request(struct spdk_nvmf_request *req) 
	return SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS;

}



int

static int

spdk_nvmf_ctrlr_get_log_page(struct spdk_nvmf_request *req)

{

	struct spdk_nvmf_subsystem *subsystem = req->qpair->ctrlr->subsys;
@@ -951,7 +961,7 @@ spdk_nvmf_ctrlr_identify_active_ns_list(struct spdk_nvmf_subsystem *subsystem, 
	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



int

static int

spdk_nvmf_ctrlr_identify(struct spdk_nvmf_request *req)

{

	uint8_t cns;
@@ -996,3 +1006,167 @@ invalid_cns: 
	rsp->status.sc = SPDK_NVME_SC_INVALID_FIELD;

	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



static int

spdk_nvmf_ctrlr_abort(struct spdk_nvmf_request *req)

{

	struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr;

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

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;

	uint32_t cdw10 = cmd->cdw10;

	uint16_t cid = cdw10 >> 16;

	uint16_t sqid = cdw10 & 0xFFFFu;

	struct spdk_nvmf_qpair *qpair;

	struct spdk_nvmf_request *req_to_abort;



	SPDK_TRACELOG(SPDK_TRACE_NVMF, "abort sqid=%u cid=%u\n", sqid, cid);



	rsp->cdw0 = 1; /* Command not aborted */



	qpair = spdk_nvmf_ctrlr_get_qpair(ctrlr, sqid);

	if (qpair == NULL) {

		SPDK_TRACELOG(SPDK_TRACE_NVMF, "sqid %u not found\n", sqid);

		rsp->status.sct = SPDK_NVME_SCT_GENERIC;

		rsp->status.sc = SPDK_NVME_SC_INVALID_FIELD;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	/*

	 * NOTE: This relies on the assumption that all connections for a ctrlr will be handled

	 * on the same thread.  If this assumption becomes untrue, this will need to pass a message

	 * to the thread handling qpair, and the abort will need to be asynchronous.

	 */

	req_to_abort = spdk_nvmf_qpair_get_request(qpair, cid);

	if (req_to_abort == NULL) {

		SPDK_TRACELOG(SPDK_TRACE_NVMF, "cid %u not found\n", cid);

		rsp->status.sct = SPDK_NVME_SCT_GENERIC;

		rsp->status.sc = SPDK_NVME_SC_INVALID_FIELD;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	if (spdk_nvmf_request_abort(req_to_abort) == 0) {

		SPDK_TRACELOG(SPDK_TRACE_NVMF, "abort ctrlr=%p req=%p sqid=%u cid=%u successful\n",

			      ctrlr, req_to_abort, sqid, cid);

		rsp->cdw0 = 0; /* Command successfully aborted */

	}

	rsp->status.sct = SPDK_NVME_SCT_GENERIC;

	rsp->status.sc = SPDK_NVME_SC_SUCCESS;

	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



static int

spdk_nvmf_ctrlr_get_features(struct spdk_nvmf_request *req)

{

	uint8_t feature;

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;

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



	feature = cmd->cdw10 & 0xff; /* mask out the FID value */

	switch (feature) {

	case SPDK_NVME_FEAT_NUMBER_OF_QUEUES:

		return spdk_nvmf_ctrlr_get_features_number_of_queues(req);

	case SPDK_NVME_FEAT_VOLATILE_WRITE_CACHE:

		return spdk_nvmf_ctrlr_get_features_write_cache(req);

	case SPDK_NVME_FEAT_KEEP_ALIVE_TIMER:

		return spdk_nvmf_ctrlr_get_features_keep_alive_timer(req);

	case SPDK_NVME_FEAT_ASYNC_EVENT_CONFIGURATION:

		return spdk_nvmf_ctrlr_get_features_async_event_configuration(req);

	case SPDK_NVME_FEAT_HOST_IDENTIFIER:

		return spdk_nvmf_ctrlr_get_features_host_identifier(req);

	default:

		SPDK_ERRLOG("Get Features command with unsupported feature ID 0x%02x\n", feature);

		response->status.sc = SPDK_NVME_SC_INVALID_FIELD;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}

}



static int

spdk_nvmf_ctrlr_set_features(struct spdk_nvmf_request *req)

{

	uint8_t feature;

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;

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



	feature = cmd->cdw10 & 0xff; /* mask out the FID value */

	switch (feature) {

	case SPDK_NVME_FEAT_NUMBER_OF_QUEUES:

		return spdk_nvmf_ctrlr_set_features_number_of_queues(req);

	case SPDK_NVME_FEAT_KEEP_ALIVE_TIMER:

		return spdk_nvmf_ctrlr_set_features_keep_alive_timer(req);

	case SPDK_NVME_FEAT_ASYNC_EVENT_CONFIGURATION:

		return spdk_nvmf_ctrlr_set_features_async_event_configuration(req);

	case SPDK_NVME_FEAT_HOST_IDENTIFIER:

		return spdk_nvmf_ctrlr_set_features_host_identifier(req);

	default:

		SPDK_ERRLOG("Set Features command with unsupported feature ID 0x%02x\n", feature);

		response->status.sc = SPDK_NVME_SC_INVALID_FIELD;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}

}



static int

spdk_nvmf_ctrlr_keep_alive(struct spdk_nvmf_request *req)

{

	SPDK_TRACELOG(SPDK_TRACE_NVMF, "Keep Alive\n");

	/*

	 * To handle keep alive just clear or reset the

	 * ctrlr based keep alive duration counter.

	 * When added, a separate timer based process

	 * will monitor if the time since last recorded

	 * keep alive has exceeded the max duration and

	 * take appropriate action.

	 */

	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



int

spdk_nvmf_ctrlr_process_admin_cmd(struct spdk_nvmf_request *req)

{

	struct spdk_nvmf_subsystem *subsystem = req->qpair->ctrlr->subsys;

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;

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



	if (subsystem->subtype == SPDK_NVMF_SUBTYPE_DISCOVERY) {

		/* Discovery controllers only support Get Log Page and Identify */

		switch (cmd->opc) {

		case SPDK_NVME_OPC_IDENTIFY:

		case SPDK_NVME_OPC_GET_LOG_PAGE:

			break;

		default:

			goto invalid_opcode;

		}

	}



	switch (cmd->opc) {

	case SPDK_NVME_OPC_GET_LOG_PAGE:

		return spdk_nvmf_ctrlr_get_log_page(req);

	case SPDK_NVME_OPC_IDENTIFY:

		return spdk_nvmf_ctrlr_identify(req);

	case SPDK_NVME_OPC_ABORT:

		return spdk_nvmf_ctrlr_abort(req);

	case SPDK_NVME_OPC_GET_FEATURES:

		return spdk_nvmf_ctrlr_get_features(req);

	case SPDK_NVME_OPC_SET_FEATURES:

		return spdk_nvmf_ctrlr_set_features(req);

	case SPDK_NVME_OPC_ASYNC_EVENT_REQUEST:

		return spdk_nvmf_ctrlr_async_event_request(req);

	case SPDK_NVME_OPC_KEEP_ALIVE:

		return spdk_nvmf_ctrlr_keep_alive(req);



	case SPDK_NVME_OPC_CREATE_IO_SQ:

	case SPDK_NVME_OPC_CREATE_IO_CQ:

	case SPDK_NVME_OPC_DELETE_IO_SQ:

	case SPDK_NVME_OPC_DELETE_IO_CQ:

		/* Create and Delete I/O CQ/SQ not allowed in NVMe-oF */

		goto invalid_opcode;



	default:

		goto invalid_opcode;

	}



invalid_opcode:

	SPDK_ERRLOG("Unsupported admin opcode 0x%x\n", cmd->opc);

	response->status.sct = SPDK_NVME_SCT_GENERIC;

	response->status.sc = SPDK_NVME_SC_INVALID_OPCODE;

	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}

lib/nvmf/ctrlr.h

+2 −18
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ void spdk_nvmf_ctrlr_connect(struct spdk_nvmf_qpair *qpair, 


struct spdk_nvmf_qpair *spdk_nvmf_ctrlr_get_qpair(struct spdk_nvmf_ctrlr *ctrlr, uint16_t qid);



struct spdk_nvmf_request *spdk_nvmf_qpair_get_request(struct spdk_nvmf_qpair *qpair, uint16_t cid);



void

spdk_nvmf_property_get(struct spdk_nvmf_ctrlr *ctrlr,

		       struct spdk_nvmf_fabric_prop_get_cmd *cmd,
@@ -121,23 +119,9 @@ int spdk_nvmf_ctrlr_poll(struct spdk_nvmf_ctrlr *ctrlr); 


void spdk_nvmf_ctrlr_destruct(struct spdk_nvmf_ctrlr *ctrlr);



int spdk_nvmf_ctrlr_set_features_host_identifier(struct spdk_nvmf_request *req);

int spdk_nvmf_ctrlr_get_features_host_identifier(struct spdk_nvmf_request *req);



int spdk_nvmf_ctrlr_set_features_keep_alive_timer(struct spdk_nvmf_request *req);

int spdk_nvmf_ctrlr_get_features_keep_alive_timer(struct spdk_nvmf_request *req);



int spdk_nvmf_ctrlr_set_features_number_of_queues(struct spdk_nvmf_request *req);

int spdk_nvmf_ctrlr_get_features_number_of_queues(struct spdk_nvmf_request *req);



int spdk_nvmf_ctrlr_set_features_async_event_configuration(struct spdk_nvmf_request *req);

int spdk_nvmf_ctrlr_get_features_async_event_configuration(struct spdk_nvmf_request *req);



int spdk_nvmf_ctrlr_async_event_request(struct spdk_nvmf_request *req);



int spdk_nvmf_ctrlr_get_log_page(struct spdk_nvmf_request *req);

int spdk_nvmf_ctrlr_process_admin_cmd(struct spdk_nvmf_request *req);



int spdk_nvmf_ctrlr_identify(struct spdk_nvmf_request *req);

int spdk_nvmf_ctrlr_process_io_cmd(struct spdk_nvmf_request *req);



bool spdk_nvmf_ctrlr_dsm_supported(struct spdk_nvmf_ctrlr *ctrlr);

lib/nvmf/ctrlr_bdev.c

+6 −166
Original line number Diff line number Diff line
@@ -83,12 +83,6 @@ spdk_nvmf_ctrlr_dsm_supported(struct spdk_nvmf_ctrlr *ctrlr) 
	return true;

}



static void

nvmf_bdev_ctrlr_poll_for_completions(struct spdk_nvmf_subsystem *subsystem)

{

	return;

}



static void

nvmf_bdev_ctrlr_complete_cmd(struct spdk_bdev_io *bdev_io, bool success,

			     void *cb_arg)
@@ -123,152 +117,6 @@ spdk_nvmf_bdev_ctrlr_identify_ns(struct spdk_bdev *bdev, struct spdk_nvme_ns_dat 
	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



static int

nvmf_bdev_ctrlr_abort(struct spdk_nvmf_request *req)

{

	struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr;

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

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;

	uint32_t cdw10 = cmd->cdw10;

	uint16_t cid = cdw10 >> 16;

	uint16_t sqid = cdw10 & 0xFFFFu;

	struct spdk_nvmf_qpair *qpair;

	struct spdk_nvmf_request *req_to_abort;



	SPDK_TRACELOG(SPDK_TRACE_NVMF, "abort sqid=%u cid=%u\n", sqid, cid);



	rsp->cdw0 = 1; /* Command not aborted */



	qpair = spdk_nvmf_ctrlr_get_qpair(ctrlr, sqid);

	if (qpair == NULL) {

		SPDK_TRACELOG(SPDK_TRACE_NVMF, "sqid %u not found\n", sqid);

		rsp->status.sct = SPDK_NVME_SCT_GENERIC;

		rsp->status.sc = SPDK_NVME_SC_INVALID_FIELD;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	/*

	 * NOTE: This relies on the assumption that all connections for a ctrlr will be handled

	 * on the same thread.  If this assumption becomes untrue, this will need to pass a message

	 * to the thread handling qpair, and the abort will need to be asynchronous.

	 */

	req_to_abort = spdk_nvmf_qpair_get_request(qpair, cid);

	if (req_to_abort == NULL) {

		SPDK_TRACELOG(SPDK_TRACE_NVMF, "cid %u not found\n", cid);

		rsp->status.sct = SPDK_NVME_SCT_GENERIC;

		rsp->status.sc = SPDK_NVME_SC_INVALID_FIELD;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	if (spdk_nvmf_request_abort(req_to_abort) == 0) {

		SPDK_TRACELOG(SPDK_TRACE_NVMF, "abort ctrlr=%p req=%p sqid=%u cid=%u successful\n",

			      ctrlr, req_to_abort, sqid, cid);

		rsp->cdw0 = 0; /* Command successfully aborted */

	}

	rsp->status.sct = SPDK_NVME_SCT_GENERIC;

	rsp->status.sc = SPDK_NVME_SC_SUCCESS;

	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



static int

nvmf_bdev_ctrlr_get_features(struct spdk_nvmf_request *req)

{

	uint8_t feature;

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;

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



	feature = cmd->cdw10 & 0xff; /* mask out the FID value */

	switch (feature) {

	case SPDK_NVME_FEAT_NUMBER_OF_QUEUES:

		return spdk_nvmf_ctrlr_get_features_number_of_queues(req);

	case SPDK_NVME_FEAT_VOLATILE_WRITE_CACHE:

		response->cdw0 = 1;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	case SPDK_NVME_FEAT_KEEP_ALIVE_TIMER:

		return spdk_nvmf_ctrlr_get_features_keep_alive_timer(req);

	case SPDK_NVME_FEAT_ASYNC_EVENT_CONFIGURATION:

		return spdk_nvmf_ctrlr_get_features_async_event_configuration(req);

	case SPDK_NVME_FEAT_HOST_IDENTIFIER:

		return spdk_nvmf_ctrlr_get_features_host_identifier(req);

	default:

		SPDK_ERRLOG("Get Features command with unsupported feature ID 0x%02x\n", feature);

		response->status.sc = SPDK_NVME_SC_INVALID_FIELD;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}

}



static int

nvmf_bdev_ctrlr_set_features(struct spdk_nvmf_request *req)

{

	uint8_t feature;

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;

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



	feature = cmd->cdw10 & 0xff; /* mask out the FID value */

	switch (feature) {

	case SPDK_NVME_FEAT_NUMBER_OF_QUEUES:

		return spdk_nvmf_ctrlr_set_features_number_of_queues(req);

	case SPDK_NVME_FEAT_KEEP_ALIVE_TIMER:

		return spdk_nvmf_ctrlr_set_features_keep_alive_timer(req);

	case SPDK_NVME_FEAT_ASYNC_EVENT_CONFIGURATION:

		return spdk_nvmf_ctrlr_set_features_async_event_configuration(req);

	case SPDK_NVME_FEAT_HOST_IDENTIFIER:

		return spdk_nvmf_ctrlr_set_features_host_identifier(req);

	default:

		SPDK_ERRLOG("Set Features command with unsupported feature ID 0x%02x\n", feature);

		response->status.sc = SPDK_NVME_SC_INVALID_FIELD;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}

}



static int

nvmf_bdev_ctrlr_process_admin_cmd(struct spdk_nvmf_request *req)

{

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;

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



	/* pre-set response details for this command */

	response->status.sc = SPDK_NVME_SC_SUCCESS;



	switch (cmd->opc) {

	case SPDK_NVME_OPC_GET_LOG_PAGE:

		return spdk_nvmf_ctrlr_get_log_page(req);

	case SPDK_NVME_OPC_IDENTIFY:

		return spdk_nvmf_ctrlr_identify(req);

	case SPDK_NVME_OPC_ABORT:

		return nvmf_bdev_ctrlr_abort(req);

	case SPDK_NVME_OPC_GET_FEATURES:

		return nvmf_bdev_ctrlr_get_features(req);

	case SPDK_NVME_OPC_SET_FEATURES:

		return nvmf_bdev_ctrlr_set_features(req);

	case SPDK_NVME_OPC_ASYNC_EVENT_REQUEST:

		return spdk_nvmf_ctrlr_async_event_request(req);

	case SPDK_NVME_OPC_KEEP_ALIVE:

		SPDK_TRACELOG(SPDK_TRACE_NVMF, "Keep Alive\n");

		/*

		 * To handle keep alive just clear or reset the

		 * ctrlr based keep alive duration counter.

		 * When added, a separate timer based process

		 * will monitor if the time since last recorded

		 * keep alive has exceeded the max duration and

		 * take appropriate action.

		 */

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;



	case SPDK_NVME_OPC_CREATE_IO_SQ:

	case SPDK_NVME_OPC_CREATE_IO_CQ:

	case SPDK_NVME_OPC_DELETE_IO_SQ:

	case SPDK_NVME_OPC_DELETE_IO_CQ:

		SPDK_ERRLOG("Admin opc 0x%02X not allowed in NVMf\n", cmd->opc);

		response->status.sc = SPDK_NVME_SC_INVALID_OPCODE;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	default:

		SPDK_ERRLOG("Unsupported admin command\n");

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



}



static int

nvmf_bdev_ctrlr_rw_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

		       struct spdk_io_channel *ch, struct spdk_nvmf_request *req)
@@ -444,8 +292,8 @@ nvmf_bdev_ctrlr_nvme_passthru_io(struct spdk_bdev *bdev, struct spdk_bdev_desc * 
	return SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS;

}



static int

nvmf_bdev_ctrlr_process_io_cmd(struct spdk_nvmf_request *req)

int

spdk_nvmf_ctrlr_process_io_cmd(struct spdk_nvmf_request *req)

{

	uint32_t nsid;

	struct spdk_bdev *bdev;
@@ -486,8 +334,8 @@ nvmf_bdev_ctrlr_process_io_cmd(struct spdk_nvmf_request *req) 
	}

}



static int

nvmf_bdev_ctrlr_attach(struct spdk_nvmf_subsystem *subsystem)

int

spdk_nvmf_subsystem_bdev_attach(struct spdk_nvmf_subsystem *subsystem)

{

	struct spdk_bdev *bdev;

	struct spdk_io_channel *ch;
@@ -510,8 +358,8 @@ nvmf_bdev_ctrlr_attach(struct spdk_nvmf_subsystem *subsystem) 
	return 0;

}



static void

nvmf_bdev_ctrlr_detach(struct spdk_nvmf_subsystem *subsystem)

void

spdk_nvmf_subsystem_bdev_detach(struct spdk_nvmf_subsystem *subsystem)

{

	uint32_t i;
@@ -530,11 +378,3 @@ nvmf_bdev_ctrlr_detach(struct spdk_nvmf_subsystem *subsystem) 
	}

	subsystem->dev.max_nsid = 0;

}
 


const struct spdk_nvmf_ctrlr_ops spdk_nvmf_bdev_ctrlr_ops = {

	.attach				= nvmf_bdev_ctrlr_attach,

	.process_admin_cmd		= nvmf_bdev_ctrlr_process_admin_cmd,

	.process_io_cmd			= nvmf_bdev_ctrlr_process_io_cmd,

	.poll_for_completions		= nvmf_bdev_ctrlr_poll_for_completions,

	.detach				= nvmf_bdev_ctrlr_detach,

};

lib/nvmf/ctrlr_discovery.c

+0 −54
Original line number Diff line number Diff line
@@ -143,57 +143,3 @@ spdk_nvmf_get_discovery_log_page(void *buffer, uint64_t offset, uint32_t length) 
	/* We should have copied or zeroed every byte of the output buffer. */

	assert(copy_len + zero_len == length);

}
 


static int

nvmf_discovery_ctrlr_process_admin_cmd(struct spdk_nvmf_request *req)

{

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;

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



	/* pre-set response details for this command */

	response->status.sc = SPDK_NVME_SC_SUCCESS;



	if (req->data == NULL) {

		SPDK_ERRLOG("discovery command with no buffer\n");

		response->status.sc = SPDK_NVME_SC_INVALID_FIELD;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	switch (cmd->opc) {

	case SPDK_NVME_OPC_IDENTIFY:

		return spdk_nvmf_ctrlr_identify(req);

	case SPDK_NVME_OPC_GET_LOG_PAGE:

		return spdk_nvmf_ctrlr_get_log_page(req);

	default:

		SPDK_ERRLOG("Unsupported Opcode 0x%x for Discovery service\n", cmd->opc);

		response->status.sc = SPDK_NVME_SC_INVALID_OPCODE;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



static int

nvmf_discovery_ctrlr_process_io_cmd(struct spdk_nvmf_request *req)

{

	/* Discovery controllers do not support I/O queues, so this code should be unreachable. */

	abort();

}



static void

nvmf_discovery_ctrlr_detach(struct spdk_nvmf_subsystem *subsystem)

{

}



static int

nvmf_discovery_ctrlr_attach(struct spdk_nvmf_subsystem *subsystem)

{

	return 0;

}



const struct spdk_nvmf_ctrlr_ops spdk_nvmf_discovery_ctrlr_ops = {

	.attach				= nvmf_discovery_ctrlr_attach,

	.process_admin_cmd		= nvmf_discovery_ctrlr_process_admin_cmd,

	.process_io_cmd			= nvmf_discovery_ctrlr_process_io_cmd,

	.detach				= nvmf_discovery_ctrlr_detach,

};