Commit 6a89f75e authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

nvme_rdma: Remove handling stale connect 



The feature will be redesigned and restored in the following patches.
For the NVMe bdev module, it can reconnect by itself without relying
on the feature.

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


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

lib/nvme/nvme_rdma.c

+1 −34
Original line number Diff line number Diff line
@@ -74,13 +74,6 @@ 
/* The default size for a shared rdma completion queue. */

#define DEFAULT_NVME_RDMA_CQ_SIZE		4096



/*

 * In the special case of a stale connection we don't expose a mechanism

 * for the user to retry the connection so we need to handle it internally.

 */

#define NVME_RDMA_STALE_CONN_RETRY_MAX		5

#define NVME_RDMA_STALE_CONN_RETRY_DELAY_US	10000



/*

 * Maximum value of transport_retry_count used by RDMA controller

 */
@@ -1171,16 +1164,7 @@ nvme_rdma_connect(struct nvme_rdma_qpair *rqpair) 
		return ret;

	}



	ret = nvme_rdma_process_event(rqpair, rctrlr->cm_channel, RDMA_CM_EVENT_ESTABLISHED);

	if (ret == -ESTALE) {

		SPDK_NOTICELOG("Received a stale connection notice during connection.\n");

		return -EAGAIN;

	} else if (ret) {

		SPDK_ERRLOG("RDMA connect error %d\n", ret);

		return ret;

	} else {

		return 0;

	}

	return nvme_rdma_process_event(rqpair, rctrlr->cm_channel, RDMA_CM_EVENT_ESTABLISHED);

}



static int
@@ -1325,25 +1309,8 @@ static int 
nvme_rdma_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)

{

	int rc;

	int retry_count = 0;



	rc = _nvme_rdma_ctrlr_connect_qpair(ctrlr, qpair);



	/*

	 * -EAGAIN represents the special case where the target side still thought it was connected.

	 * Most NICs will fail the first connection attempt, and the NICs will clean up whatever

	 * state they need to. After that, subsequent connection attempts will succeed.

	 */

	if (rc == -EAGAIN) {

		SPDK_NOTICELOG("Detected stale connection on Target side for qpid: %d\n", qpair->id);

		do {

			nvme_delay(NVME_RDMA_STALE_CONN_RETRY_DELAY_US);

			nvme_transport_ctrlr_disconnect_qpair(ctrlr, qpair);

			rc = _nvme_rdma_ctrlr_connect_qpair(ctrlr, qpair);

			retry_count++;

		} while (rc == -EAGAIN && retry_count < NVME_RDMA_STALE_CONN_RETRY_MAX);

	}



	if (rc == 0) {

		nvme_qpair_set_state(qpair, NVME_QPAIR_CONNECTED);

	}