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

nvme_rdma: Remove cm_channel param from process_event() 



nvme_rdma_poll_events() gets the cm_channel pointer itself.
Before calling nvme_rdma_process_event(), we checks the
rctrlr is valid.

Hence we do not have to pass the cm_channel pointer to
nvme_rdma_process_event() via a parameter.

This simplifies the code and makes the following patches a little easier.

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


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

lib/nvme/nvme_rdma.c

+6 −11
Original line number Diff line number Diff line
@@ -631,7 +631,6 @@ nvme_rdma_validate_cm_event(enum rdma_cm_event_type expected_evt_type, 


static int

nvme_rdma_process_event(struct nvme_rdma_qpair *rqpair,

			struct rdma_event_channel *channel,

			enum rdma_cm_event_type evt)

{

	struct nvme_rdma_ctrlr	*rctrlr;
@@ -1081,8 +1080,7 @@ fail: 
static int

nvme_rdma_resolve_addr(struct nvme_rdma_qpair *rqpair,

		       struct sockaddr *src_addr,

		       struct sockaddr *dst_addr,

		       struct rdma_event_channel *cm_channel)

		       struct sockaddr *dst_addr)

{

	int ret;
@@ -1093,7 +1091,7 @@ nvme_rdma_resolve_addr(struct nvme_rdma_qpair *rqpair, 
		return ret;

	}



	ret = nvme_rdma_process_event(rqpair, cm_channel, RDMA_CM_EVENT_ADDR_RESOLVED);

	ret = nvme_rdma_process_event(rqpair, RDMA_CM_EVENT_ADDR_RESOLVED);

	if (ret) {

		SPDK_ERRLOG("RDMA address resolution error\n");

		return -1;
@@ -1120,7 +1118,7 @@ nvme_rdma_resolve_addr(struct nvme_rdma_qpair *rqpair, 
		return ret;

	}



	ret = nvme_rdma_process_event(rqpair, cm_channel, RDMA_CM_EVENT_ROUTE_RESOLVED);

	ret = nvme_rdma_process_event(rqpair, RDMA_CM_EVENT_ROUTE_RESOLVED);

	if (ret) {

		SPDK_ERRLOG("RDMA route resolution error\n");

		return -1;
@@ -1137,7 +1135,6 @@ nvme_rdma_connect(struct nvme_rdma_qpair *rqpair) 
	struct ibv_device_attr				attr;

	int						ret;

	struct spdk_nvme_ctrlr				*ctrlr;

	struct nvme_rdma_ctrlr				*rctrlr;



	ret = ibv_query_device(rqpair->cm_id->verbs, &attr);

	if (ret != 0) {
@@ -1151,8 +1148,6 @@ nvme_rdma_connect(struct nvme_rdma_qpair *rqpair) 
	if (!ctrlr) {

		return -1;

	}

	rctrlr = nvme_rdma_ctrlr(ctrlr);

	assert(rctrlr != NULL);



	request_data.qid = rqpair->qpair.id;

	request_data.hrqsize = rqpair->num_entries + 1;
@@ -1175,7 +1170,7 @@ nvme_rdma_connect(struct nvme_rdma_qpair *rqpair) 
		return ret;

	}



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

	return nvme_rdma_process_event(rqpair, RDMA_CM_EVENT_ESTABLISHED);

}



static int
@@ -1265,7 +1260,7 @@ nvme_rdma_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qp 


	rc = nvme_rdma_resolve_addr(rqpair,

				    src_addr_specified ? (struct sockaddr *)&src_addr : NULL,

				    (struct sockaddr *)&dst_addr, rctrlr->cm_channel);

				    (struct sockaddr *)&dst_addr);

	if (rc < 0) {

		SPDK_ERRLOG("nvme_rdma_resolve_addr() failed\n");

		return -1;
@@ -1843,7 +1838,7 @@ nvme_rdma_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme 
		if (rqpair->rdma_qp) {

			rc = spdk_rdma_qp_disconnect(rqpair->rdma_qp);

			if ((rctrlr != NULL) && (rc == 0)) {

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

				if (nvme_rdma_process_event(rqpair, RDMA_CM_EVENT_DISCONNECTED)) {

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

				}

			}