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

rdma.c: Don't set recv->qpair to NULL 



We can use the rpoller->srq to check if a qpair is valid when processing
recv completions.

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


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

lib/nvmf/rdma.c

+2 −4
Original line number Diff line number Diff line
@@ -868,7 +868,6 @@ spdk_nvmf_rdma_qpair_destroy(struct spdk_nvmf_rdma_qpair *rqpair) 
			STAILQ_FOREACH_SAFE(rdma_recv, &rqpair->resources->incoming_queue, link, recv_tmp) {

				if (rqpair == rdma_recv->qpair) {

					STAILQ_REMOVE_HEAD(&rqpair->resources->incoming_queue, link);

					rdma_recv->qpair = NULL;

					rc = ibv_post_srq_recv(rqpair->srq, &rdma_recv->wr, &bad_recv_wr);

					if (rc) {

						SPDK_ERRLOG("Unable to re-post rx descriptor\n");
@@ -1077,7 +1076,6 @@ request_transfer_out(struct spdk_nvmf_request *req, int *data_posted) 
	if (rqpair->srq == NULL) {

		rc = ibv_post_recv(rqpair->cm_id->qp, &rdma_req->recv->wr, &bad_recv_wr);

	} else {

		rdma_req->recv->qpair = NULL;

		rc = ibv_post_srq_recv(rqpair->srq, &rdma_req->recv->wr, &bad_recv_wr);

	}
@@ -3236,9 +3234,9 @@ spdk_nvmf_rdma_poller_poll(struct spdk_nvmf_rdma_transport *rtransport, 
			assert(rdma_req->num_outstanding_data_wr == 0);

			break;

		case RDMA_WR_TYPE_RECV:

			/* rdma_recv->qpair will be NULL if using an SRQ.  In that case we have to get the qpair from the wc. */

			/* rdma_recv->qpair will be invalid if using an SRQ.  In that case we have to get the qpair from the wc. */

			rdma_recv = SPDK_CONTAINEROF(rdma_wr, struct spdk_nvmf_rdma_recv, rdma_wr);

			if (rdma_recv->qpair == NULL) {

			if (rpoller->srq != NULL) {

				rdma_recv->qpair = get_rdma_qpair_from_wc(rpoller, &wc[i]);

			}

			rqpair = rdma_recv->qpair;