Commit 8421f839 authored by Alexey Marchuk's avatar Alexey Marchuk Committed by Tomasz Zawadzki
Browse files

rdma: Fix qpair desctruction in error flow 



rdma_qp may not be initialized when qpair is not fully
created. When such a qpair is being destroyed we may pass
a NULL pointer to spdk_rdma_qp_disconnect or spdk_rdma_qp_destroy
and hit an assert. This patch fixes this problem for NVMEoF
target and initiator.

Change-Id: I84787dc1b1211293c2a19f59d47727eaecd9d5a1
Signed-off-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3050


Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
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>
parent 89013903

lib/nvme/nvme_rdma.c

+7 −7
Original line number Diff line number Diff line
@@ -1815,17 +1815,17 @@ nvme_rdma_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme 
	}



	if (rqpair->cm_id) {

		if (rqpair->rdma_qp) {

			spdk_rdma_qp_disconnect(rqpair->rdma_qp);

			if (rctrlr != NULL) {

				if (nvme_rdma_process_event(rqpair, rctrlr->cm_channel, RDMA_CM_EVENT_DISCONNECTED)) {

					SPDK_DEBUGLOG(SPDK_LOG_NVME, "Target did not respond to qpair disconnect.\n");

				}

			}



		if (rqpair->rdma_qp) {

			spdk_rdma_qp_destroy(rqpair->rdma_qp);

			rqpair->rdma_qp = NULL;

		}



		rdma_destroy_id(rqpair->cm_id);

		rqpair->cm_id = NULL;

	}

lib/nvmf/rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -3566,7 +3566,7 @@ nvmf_rdma_close_qpair(struct spdk_nvmf_qpair *qpair) 
		return;

	}



	if (rqpair->cm_id) {

	if (rqpair->rdma_qp) {

		spdk_rdma_qp_disconnect(rqpair->rdma_qp);

	}