Commit 6c391ec2 authored by Jim Harris's avatar Jim Harris Committed by Ben Walker
Browse files

nvme/rdma: clarify icdoff usage 



Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I9ae4a9abec949942a1df001931dded94396be01e

Reviewed-on: https://review.gerrithub.io/425325


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarPotnuri Bharat Teja <bharatppotnuri@gmail.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent af32aa1b

lib/nvme/nvme_rdma.c

+9 −3
Original line number Diff line number Diff line
@@ -863,7 +863,9 @@ nvme_rdma_build_contig_inline_request(struct nvme_rdma_qpair *rqpair, 
	req->cmd.dptr.sgl1.unkeyed.type = SPDK_NVME_SGL_TYPE_DATA_BLOCK;

	req->cmd.dptr.sgl1.unkeyed.subtype = SPDK_NVME_SGL_SUBTYPE_OFFSET;

	req->cmd.dptr.sgl1.unkeyed.length = (uint32_t)req->payload_size;

	req->cmd.dptr.sgl1.address = (uint64_t)0; /* icdoff is '0' for spdk */

	/* Inline only supported for icdoff == 0 currently.  This function will

	 * not get called for controllers with other values. */

	req->cmd.dptr.sgl1.address = (uint64_t)0;



	return 0;

}
@@ -992,7 +994,9 @@ nvme_rdma_build_sgl_inline_request(struct nvme_rdma_qpair *rqpair, 
	req->cmd.dptr.sgl1.unkeyed.type = SPDK_NVME_SGL_TYPE_DATA_BLOCK;

	req->cmd.dptr.sgl1.unkeyed.subtype = SPDK_NVME_SGL_SUBTYPE_OFFSET;

	req->cmd.dptr.sgl1.unkeyed.length = (uint32_t)req->payload_size;

	req->cmd.dptr.sgl1.address = (uint64_t)0; /* icdoff is '0' for spdk */

	/* Inline only supported for icdoff == 0 currently.  This function will

	 * not get called for controllers with other values. */

	req->cmd.dptr.sgl1.address = (uint64_t)0;



	return 0;

}
@@ -1018,7 +1022,9 @@ nvme_rdma_req_init(struct nvme_rdma_qpair *rqpair, struct nvme_request *req, 
	} else if (nvme_payload_type(&req->payload) == NVME_PAYLOAD_TYPE_CONTIG) {

		/*

		 * Check if icdoff is non zero, to avoid interop conflicts with

		 * non spdk targets.

		 * targets with non-zero icdoff.  Both SPDK and the Linux kernel

		 * targets use icdoff = 0.  For targets with non-zero icdoff, we

		 * will currently just not use inline data for now.

		 */

		if (req->cmd.opc == SPDK_NVME_OPC_WRITE &&

		    req->payload_size <= nvme_rdma_icdsz_bytes(ctrlr) &&