Commit 74aa552e authored by Jim Harris's avatar Jim Harris Committed by Changpeng Liu
Browse files

nvme: make helper function to abort outstanding err reqs 



The nvme_qpair_disable functions will be going away in
an upcoming patch, so move this one bit of functionality
into a helper function in advance.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I61c2de535c2230b988d56dea13b00f39cb59dcfa

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/453483


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent f366e261

lib/nvme/nvme_ctrlr.c

+5 −0
Original line number Diff line number Diff line
@@ -844,6 +844,11 @@ spdk_nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr) 


	nvme_transport_admin_qpair_abort_aers(ctrlr->adminq);



	nvme_qpair_complete_error_reqs(ctrlr->adminq);

	TAILQ_FOREACH(qpair, &ctrlr->active_io_qpairs, tailq) {

		nvme_qpair_complete_error_reqs(qpair);

	}



	/* Disable all queues before disabling the controller hardware. */

	nvme_qpair_disable(ctrlr->adminq);

	TAILQ_FOREACH(qpair, &ctrlr->active_io_qpairs, tailq) {

lib/nvme/nvme_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -831,6 +831,7 @@ int nvme_qpair_init(struct spdk_nvme_qpair *qpair, uint16_t id, 
void	nvme_qpair_deinit(struct spdk_nvme_qpair *qpair);

void	nvme_qpair_enable(struct spdk_nvme_qpair *qpair);

void	nvme_qpair_disable(struct spdk_nvme_qpair *qpair);

void	nvme_qpair_complete_error_reqs(struct spdk_nvme_qpair *qpair);

int	nvme_qpair_submit_request(struct spdk_nvme_qpair *qpair,

				  struct nvme_request *req);

lib/nvme/nvme_qpair.c

+5 −1
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ nvme_qpair_enable(struct spdk_nvme_qpair *qpair) 
}



void

nvme_qpair_disable(struct spdk_nvme_qpair *qpair)

nvme_qpair_complete_error_reqs(struct spdk_nvme_qpair *qpair)

{

	struct nvme_request		*req;
@@ -591,7 +591,11 @@ nvme_qpair_disable(struct spdk_nvme_qpair *qpair) 
						   req->cpl.status.sct,

						   req->cpl.status.sc, true);

	}

}



void

nvme_qpair_disable(struct spdk_nvme_qpair *qpair)

{

	nvme_transport_qpair_disable(qpair);

}

test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c

+5 −0
Original line number Diff line number Diff line
@@ -262,6 +262,11 @@ nvme_qpair_disable(struct spdk_nvme_qpair *qpair) 
{

}



void

nvme_qpair_complete_error_reqs(struct spdk_nvme_qpair *qpair)

{

}



void

nvme_qpair_enable(struct spdk_nvme_qpair *qpair)

{