Commit 13fb1b69 authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

nvme_rdma: add a timeout for spinning on cm events. 



Previously we would just sit forever. preventing us from properly
attempting reconnects and timing out.

Change-Id: Id7386ab95cf75fd9ac972b44afa2719aad412f49
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/469021


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 37152dc5

lib/nvme/nvme_rdma.c

+12 −1
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ 
/* number of STAILQ entries for holding pending RDMA CM events. */

#define NVME_RDMA_NUM_CM_EVENTS			256



/* CM event processing timeout */

#define NVME_RDMA_QPAIR_CM_EVENT_TIMEOUT_US	100000



struct spdk_nvmf_cmd {

	struct spdk_nvme_cmd cmd;

	struct spdk_nvme_sgl_descriptor sgl[NVME_RDMA_MAX_SGL_DESCRIPTORS];
@@ -353,6 +356,7 @@ nvme_rdma_process_event(struct nvme_rdma_qpair *rqpair, 
			enum rdma_cm_event_type evt)

{

	struct nvme_rdma_ctrlr	*rctrlr;

	uint64_t timeout_ticks;

	int	rc = 0, rc2;



	if (rqpair->evt != NULL) {
@@ -362,9 +366,12 @@ nvme_rdma_process_event(struct nvme_rdma_qpair *rqpair, 
		}

	}



	timeout_ticks = (NVME_RDMA_QPAIR_CM_EVENT_TIMEOUT_US * spdk_get_ticks_hz()) / SPDK_SEC_TO_USEC +

			spdk_get_ticks();

	rctrlr = nvme_rdma_ctrlr(rqpair->qpair.ctrlr);

	assert(rctrlr != NULL);

	while (!rqpair->evt && !rc) {



	while (!rqpair->evt && spdk_get_ticks() < timeout_ticks && rc == 0) {

		rc = nvme_rdma_poll_events(rctrlr);

	}
@@ -372,6 +379,10 @@ nvme_rdma_process_event(struct nvme_rdma_qpair *rqpair, 
		return rc;

	}



	if (rqpair->evt == NULL) {

		return -EADDRNOTAVAIL;

	}



	if (rqpair->evt->event != evt) {

		SPDK_ERRLOG("Expected %s but received %s (%d) from CM event channel (status = %d)\n",

			    nvme_rdma_cm_event_str_get(evt),