Commit 4d01c21b authored by Kaiqi Chen's avatar Kaiqi Chen Committed by Tomasz Zawadzki
Browse files

nvmf/rdma: refactor nvmf_rdma_trid_from_cm_id() to return void 



Currently, nvmf_rdma_listen() only supports AF_INET and AF_INET6, and
will fail early if the address family is unsupported. Therefore,
nvmf_rdma_trid_from_cm_id() should never encounter a sa_family that is
not AF_INET or AF_INET6.

This patch changes the return type to void and replaces the default
case with an SPDK_ERRLOG and assert(false) to catch unreachable code
paths.

Change-Id: Ia56eab6df7cacf905a52e510e5ab21c25771afbd
Suggested-by: default avatarJim Harris <jim.harris@nvidia.com>
Signed-off-by: default avatarKaiqi Chen <kaiqi.chen@smartx.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26351


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarKonrad Sztyber <ksztyber@nvidia.com>
Reviewed-by: default avatarChangpeng Liu <changpeliu@tencent.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
parent cf6431e8

lib/nvmf/rdma.c

+15 −11
Original line number Diff line number Diff line
@@ -2970,7 +2970,7 @@ nvmf_rdma_destroy(struct spdk_nvmf_transport *transport, 
	return 0;

}



static int nvmf_rdma_trid_from_cm_id(struct rdma_cm_id *id,

static void nvmf_rdma_trid_from_cm_id(struct rdma_cm_id *id,

				      struct spdk_nvme_transport_id *trid,

				      bool peer);
@@ -4969,7 +4969,7 @@ nvmf_rdma_poll_group_poll(struct spdk_nvmf_transport_poll_group *group) 
	return rc2 ? rc2 : count;

}



static int

static void

nvmf_rdma_trid_from_cm_id(struct rdma_cm_id *id,

			  struct spdk_nvme_transport_id *trid,

			  bool peer)
@@ -5013,11 +5013,9 @@ nvmf_rdma_trid_from_cm_id(struct rdma_cm_id *id, 
		break;

	}

	default:

		return -1;



		SPDK_ERRLOG("Unsupported address family %d\n", saddr->sa_family);

		assert(false);

	}



	return 0;

}



static int
@@ -5033,7 +5031,9 @@ nvmf_rdma_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair, 
		return -1;

	}



	return nvmf_rdma_trid_from_cm_id(rqpair->cm_id, trid, true);

	nvmf_rdma_trid_from_cm_id(rqpair->cm_id, trid, true);



	return 0;

}



static int
@@ -5049,7 +5049,9 @@ nvmf_rdma_qpair_get_local_trid(struct spdk_nvmf_qpair *qpair, 
		return -1;

	}



	return nvmf_rdma_trid_from_cm_id(rqpair->cm_id, trid, false);

	nvmf_rdma_trid_from_cm_id(rqpair->cm_id, trid, false);



	return 0;

}



static int
@@ -5065,7 +5067,9 @@ nvmf_rdma_qpair_get_listen_trid(struct spdk_nvmf_qpair *qpair, 
		assert(false);

	}



	return nvmf_rdma_trid_from_cm_id(rqpair->listen_id, trid, false);

	nvmf_rdma_trid_from_cm_id(rqpair->listen_id, trid, false);



	return 0;

}



void