Commit 75940304 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

nvme: Set dnr to zero for abort_reqs() including a fix of degradation 

The patch

nvme: Set dnr to zero for nvme_qpair_abort_reqs()
https://github.com/spdk/spdk/commit/1b3172f726cf9e806977ff6949625cdb0a9542a6

did the change stated in the title.

However,

Revert "nvme/rdma: Correct qpair disconnect process"
https://github.com/spdk/spdk/commit/c8f986c7ee63284ff73180c9a99acaf43d22882b



destroyed it for RDMA transport.

Additionally, we had still set DNR to 1 in nvme_qpair_init().

This patch fixes both.

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


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent e685574f

lib/nvme/nvme_qpair.c

+1 −1
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ nvme_qpair_deinit(struct spdk_nvme_qpair *qpair) 
{

	struct nvme_error_cmd *cmd, *entry;



	nvme_qpair_abort_queued_reqs(qpair, 1);

	nvme_qpair_abort_queued_reqs(qpair, 0);

	_nvme_qpair_complete_abort_queued_reqs(qpair);

	nvme_qpair_complete_error_reqs(qpair);

lib/nvme/nvme_rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -1866,7 +1866,7 @@ nvme_rdma_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ 
		return 0;

	}



	nvme_rdma_qpair_abort_reqs(qpair, 1);

	nvme_rdma_qpair_abort_reqs(qpair, 0);

	nvme_qpair_deinit(qpair);



	nvme_rdma_put_memory_domain(rqpair->memory_domain);