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

rdma: set wr opcodes while parsing the SGL. 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 1f9ac117

lib/nvmf/rdma.c

+8 −7
Original line number Diff line number Diff line
@@ -910,8 +910,6 @@ request_transfer_in(struct spdk_nvmf_request *req) 


	SPDK_DEBUGLOG(SPDK_LOG_RDMA, "RDMA READ POSTED. Request: %p Connection: %p\n", req, qpair);



	rdma_req->data.wr.opcode = IBV_WR_RDMA_READ;

	rdma_req->data.wr.next = NULL;

	rc = ibv_post_send(rqpair->cm_id->qp, &rdma_req->data.wr, &bad_wr);

	if (rc) {

		SPDK_ERRLOG("Unable to transfer data from host to target\n");
@@ -965,12 +963,8 @@ request_transfer_out(struct spdk_nvmf_request *req, int *data_posted) 
	if (rsp->status.sc == SPDK_NVME_SC_SUCCESS &&

	    req->xfer == SPDK_NVME_DATA_CONTROLLER_TO_HOST) {

		SPDK_DEBUGLOG(SPDK_LOG_RDMA, "RDMA WRITE POSTED. Request: %p Connection: %p\n", req, qpair);



		rdma_req->data.wr.opcode = IBV_WR_RDMA_WRITE;



		rdma_req->data.wr.next = send_wr;

		*data_posted = 1;

		send_wr = &rdma_req->data.wr;

		*data_posted = 1;

	}



	SPDK_DEBUGLOG(SPDK_LOG_RDMA, "RDMA SEND POSTED. Request: %p Connection: %p\n", req, qpair);
@@ -1358,6 +1352,13 @@ spdk_nvmf_rdma_request_parse_sgl(struct spdk_nvmf_rdma_transport *rtransport, 
		rdma_req->data.wr.num_sge = rdma_req->req.iovcnt;

		rdma_req->data.wr.wr.rdma.rkey = sgl->keyed.key;

		rdma_req->data.wr.wr.rdma.remote_addr = sgl->address;

		if (rdma_req->req.xfer == SPDK_NVME_DATA_CONTROLLER_TO_HOST) {

			rdma_req->data.wr.opcode = IBV_WR_RDMA_WRITE;

			rdma_req->data.wr.next = &rdma_req->rsp.wr;

		} else if (rdma_req->req.xfer == SPDK_NVME_DATA_HOST_TO_CONTROLLER) {

			rdma_req->data.wr.opcode = IBV_WR_RDMA_READ;

			rdma_req->data.wr.next = NULL;

		}



		/* set the number of outstanding data WRs for this request. */

		rdma_req->num_outstanding_data_wr = 1;