Commit 84523c04 authored by Ben Walker's avatar Ben Walker Committed by Daniel Verkamp
Browse files

nvmf: Remove abort implementation 



This will be re-added later in the series, implemented
in a different way.

Change-Id: I1f9df22025eb37f7f58ce1547862f61906ea557c
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/415315


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent fdf5c1d7

lib/nvmf/ctrlr.c

+3 −99
Original line number Diff line number Diff line
@@ -419,19 +419,6 @@ spdk_nvmf_ctrlr_connect(struct spdk_nvmf_request *req) 
	}

}



struct spdk_nvmf_qpair *

spdk_nvmf_ctrlr_get_qpair(struct spdk_nvmf_ctrlr *ctrlr, uint16_t qid)

{

	struct spdk_nvmf_qpair *qpair;



	TAILQ_FOREACH(qpair, &ctrlr->qpairs, link) {

		if (qpair->qid == qid) {

			return qpair;

		}

	}

	return NULL;

}



static uint64_t

nvmf_prop_get_cap(struct spdk_nvmf_ctrlr *ctrlr)

{
@@ -1381,100 +1368,17 @@ invalid_cns: 
	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}





static struct spdk_nvmf_request *

spdk_nvmf_qpair_abort(struct spdk_nvmf_qpair *qpair, uint16_t cid)

{

	struct spdk_nvmf_ctrlr *ctrlr = qpair->ctrlr;

	struct spdk_nvmf_request *req;



	if (spdk_nvmf_qpair_is_admin_queue(qpair)) {

		if (ctrlr->aer_req && ctrlr->aer_req->cmd->nvme_cmd.cid == cid) {

			SPDK_DEBUGLOG(SPDK_LOG_NVMF, "Aborting AER request\n");

			req = ctrlr->aer_req;

			ctrlr->aer_req = NULL;

			return req;

		}

	}



	/* TODO: track list of outstanding requests in qpair? */

	return NULL;

}



static void

spdk_nvmf_ctrlr_abort_on_qpair(void *arg)

{

	struct spdk_nvmf_request *req = arg;

	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_DEBUGLOG(SPDK_LOG_NVMF, "abort sqid=%u cid=%u\n", sqid, cid);



	qpair = spdk_nvmf_ctrlr_get_qpair(ctrlr, sqid);

	if (qpair == NULL) {

		SPDK_DEBUGLOG(SPDK_LOG_NVMF, "sqid %u not found\n", sqid);

		rsp->status.sct = SPDK_NVME_SCT_GENERIC;

		rsp->status.sc = SPDK_NVME_SC_INVALID_FIELD;

		goto complete_abort;

	}



	assert(spdk_get_thread() == qpair->group->thread);



	req_to_abort = spdk_nvmf_qpair_abort(qpair, cid);

	if (req_to_abort == NULL) {

		SPDK_DEBUGLOG(SPDK_LOG_NVMF, "cid %u not found\n", cid);

		rsp->status.sct = SPDK_NVME_SCT_GENERIC;

		rsp->status.sc = SPDK_NVME_SC_INVALID_FIELD;

		goto complete_abort;

	}



	/* Complete the request with aborted status */

	req_to_abort->rsp->nvme_cpl.status.sct = SPDK_NVME_SCT_GENERIC;

	req_to_abort->rsp->nvme_cpl.status.sc = SPDK_NVME_SC_ABORTED_BY_REQUEST;

	spdk_nvmf_request_complete(req_to_abort);



	SPDK_DEBUGLOG(SPDK_LOG_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;



complete_abort:

	/* Complete the abort request on the admin qpair */

	spdk_thread_send_msg(req->qpair->group->thread, _spdk_nvmf_request_complete, req);

}



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 sqid = cdw10 & 0xFFFFu;

	struct spdk_nvmf_qpair *qpair;



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



	qpair = spdk_nvmf_ctrlr_get_qpair(ctrlr, sqid);

	if (qpair == NULL) {

		SPDK_DEBUGLOG(SPDK_LOG_NVMF, "sqid %u not found\n", sqid);

	rsp->status.sct = SPDK_NVME_SCT_GENERIC;

		rsp->status.sc = SPDK_NVME_SC_INVALID_FIELD;

	rsp->status.sc = SPDK_NVME_SC_INTERNAL_DEVICE_ERROR;

	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



	/* Process the abort request on the poll group thread handling the qpair */

	spdk_thread_send_msg(qpair->group->thread, spdk_nvmf_ctrlr_abort_on_qpair, req);

	return SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS;

}



static int

get_features_generic(struct spdk_nvmf_request *req, uint32_t cdw0)

{

lib/nvmf/nvmf_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ void spdk_nvmf_get_discovery_log_page(struct spdk_nvmf_tgt *tgt, 
				      void *buffer, uint64_t offset,

				      uint32_t length);



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

void spdk_nvmf_ctrlr_destruct(struct spdk_nvmf_ctrlr *ctrlr);

int spdk_nvmf_ctrlr_process_fabrics_cmd(struct spdk_nvmf_request *req);

int spdk_nvmf_ctrlr_process_admin_cmd(struct spdk_nvmf_request *req);

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

+0 −6
Original line number Diff line number Diff line
@@ -40,12 +40,6 @@ 


SPDK_LOG_REGISTER_COMPONENT("nvmf", SPDK_LOG_NVMF)



struct spdk_nvmf_qpair *

spdk_nvmf_ctrlr_get_qpair(struct spdk_nvmf_ctrlr *ctrlr, uint16_t qid)

{

	return NULL;

}



int

spdk_nvmf_request_complete(struct spdk_nvmf_request *req)

{