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

rdma: add an stailq for qpairs pending recv 



This will help us not iterate through the whole list of connections when
only some of them have pending recvs.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent c3884f94

lib/nvmf/rdma.c

+12 −4
Original line number Diff line number Diff line
@@ -383,6 +383,8 @@ struct spdk_nvmf_rdma_qpair { 


	TAILQ_ENTRY(spdk_nvmf_rdma_qpair)	link;



	STAILQ_ENTRY(spdk_nvmf_rdma_qpair)	recv_link;



	STAILQ_ENTRY(spdk_nvmf_rdma_qpair)	send_link;



	/* IBV queue pair attributes: they are used to manage
@@ -425,6 +427,8 @@ struct spdk_nvmf_rdma_poller { 


	TAILQ_HEAD(, spdk_nvmf_rdma_qpair)	qpairs;



	STAILQ_HEAD(, spdk_nvmf_rdma_qpair)	qpairs_pending_recv;



	STAILQ_HEAD(, spdk_nvmf_rdma_qpair)	qpairs_pending_send;



	TAILQ_ENTRY(spdk_nvmf_rdma_poller)	link;
@@ -1052,6 +1056,9 @@ nvmf_rdma_qpair_queue_recv_wrs(struct spdk_nvmf_rdma_qpair *rqpair, struct ibv_r 
	if (rqpair->resources->recvs_to_post.first == NULL) {

		rqpair->resources->recvs_to_post.first = first;

		rqpair->resources->recvs_to_post.last = last;

		if (rqpair->srq == NULL) {

			STAILQ_INSERT_TAIL(&rqpair->poller->qpairs_pending_recv, rqpair, recv_link);

		}

	} else {

		rqpair->resources->recvs_to_post.last->next = first;

		rqpair->resources->recvs_to_post.last = last;
@@ -2978,6 +2985,7 @@ spdk_nvmf_rdma_poll_group_create(struct spdk_nvmf_transport *transport) 


		TAILQ_INIT(&poller->qpairs);

		STAILQ_INIT(&poller->qpairs_pending_send);

		STAILQ_INIT(&poller->qpairs_pending_recv);



		TAILQ_INSERT_TAIL(&rgroup->pollers, poller, link);

		if (transport->opts.no_srq == false && device->attr.max_srq != 0) {
@@ -3279,16 +3287,16 @@ _poller_submit_recvs(struct spdk_nvmf_rdma_transport *rtransport, 
			rpoller->resources->recvs_to_post.last = NULL;

		}

	} else {

		TAILQ_FOREACH(rqpair, &rpoller->qpairs, link) {

			if (!rqpair->resources->recvs_to_post.first) {

				continue;

			}

		while (!STAILQ_EMPTY(&rpoller->qpairs_pending_recv)) {

			rqpair = STAILQ_FIRST(&rpoller->qpairs_pending_recv);

			assert(rqpair->resources->recvs_to_post.first != NULL);

			rc = ibv_post_recv(rqpair->cm_id->qp, rqpair->resources->recvs_to_post.first, &bad_recv_wr);

			if (rc) {

				_qp_reset_failed_recvs(rqpair, bad_recv_wr, rc);

			}

			rqpair->resources->recvs_to_post.first = NULL;

			rqpair->resources->recvs_to_post.last = NULL;

			STAILQ_REMOVE_HEAD(&rpoller->qpairs_pending_recv, recv_link);

		}

	}

}