Commit 4be6d304 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

nvme: Add ctrlr_abort_queued_aborts() into qpair_abort_all_queued_reqs() 



nvme_qpair_abort_all_queued_reqs() aborts error injections, queued
requests, aborting queued requests, and outstanding requests. (Aborting
outstanding requests depends on transports.) However, it did not abort
queued aborts.

Include nvme_ctrlr_abort_queued_aborts() into
nvme_qpair_abort_all_queued_reqs() to do really the name of the
function indicates.

nvme_ctrlr_abort_queued_aborts() has been called in a few cases, but
we do not care duplication.

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I19102cc6603a72ce5c398a7947cb4d606b692991
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12849


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarVasuki Manikarnike <vasuki.manikarnike@hpe.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
parent 7104c833

lib/nvme/nvme_ctrlr.c

+1 −1
Original line number Diff line number Diff line
@@ -1585,7 +1585,7 @@ error: 
	return rc;

}



static void

void

nvme_ctrlr_abort_queued_aborts(struct spdk_nvme_ctrlr *ctrlr)

{

	struct nvme_request	*req, *tmp;

lib/nvme/nvme_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -1176,6 +1176,7 @@ void nvme_ctrlr_process_async_event(struct spdk_nvme_ctrlr *ctrlr, 
				       const struct spdk_nvme_cpl *cpl);

void nvme_ctrlr_disconnect_qpair(struct spdk_nvme_qpair *qpair);

void nvme_ctrlr_complete_queued_async_events(struct spdk_nvme_ctrlr *ctrlr);

void nvme_ctrlr_abort_queued_aborts(struct spdk_nvme_ctrlr *ctrlr);

int nvme_qpair_init(struct spdk_nvme_qpair *qpair, uint16_t id,

		    struct spdk_nvme_ctrlr *ctrlr,

		    enum spdk_nvme_qprio qprio,

lib/nvme/nvme_qpair.c

+3 −0
Original line number Diff line number Diff line
@@ -1055,6 +1055,9 @@ nvme_qpair_abort_all_queued_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr) 
	nvme_qpair_complete_error_reqs(qpair);

	nvme_qpair_abort_queued_reqs(qpair, dnr);

	_nvme_qpair_complete_abort_queued_reqs(qpair);

	if (nvme_qpair_is_admin_queue(qpair)) {

		nvme_ctrlr_abort_queued_aborts(qpair->ctrlr);

	}

}



int

test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ DEFINE_STUB_V(nvme_transport_ctrlr_disconnect_qpair, (struct spdk_nvme_ctrlr *ct 
DEFINE_STUB_V(nvme_ctrlr_disconnect_qpair, (struct spdk_nvme_qpair *qpair));



DEFINE_STUB_V(nvme_ctrlr_complete_queued_async_events, (struct spdk_nvme_ctrlr *ctrlr));

DEFINE_STUB_V(nvme_ctrlr_abort_queued_aborts, (struct spdk_nvme_ctrlr *ctrlr));



void

nvme_ctrlr_fail(struct spdk_nvme_ctrlr *ctrlr, bool hot_remove)