Commit 5c2ccd06 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvme: add helper function to get payload type 



This will simplify upcoming patches that change the way nvme_payload
stores its type.

Change-Id: Idf0a5b8dfd7d66a10f89254d2c5c54fee2968a43
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/413173


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent cf6ee253

lib/nvme/nvme.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ nvme_user_copy_cmd_complete(void *arg, const struct spdk_nvme_cpl *cpl) 


	if (req->user_buffer && req->payload_size) {

		/* Copy back to the user buffer and free the contig buffer */

		assert(req->payload.type == NVME_PAYLOAD_TYPE_CONTIG);

		assert(nvme_payload_type(&req->payload) == NVME_PAYLOAD_TYPE_CONTIG);

		xfer = spdk_nvme_opc_get_data_transfer(req->cmd.opc);

		if (xfer == SPDK_NVME_DATA_CONTROLLER_TO_HOST ||

		    xfer == SPDK_NVME_DATA_BIDIRECTIONAL) {

lib/nvme/nvme_internal.h

+5 −0
Original line number Diff line number Diff line
@@ -160,6 +160,11 @@ struct __attribute__((packed)) nvme_payload { 
	uint8_t type;

};



static inline enum nvme_payload_type

nvme_payload_type(const struct nvme_payload *payload) {

	return payload->type;

}



struct nvme_request {

	struct spdk_nvme_cmd		cmd;

lib/nvme/nvme_ns_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ _nvme_ns_cmd_rw(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *qpair, 
						  cb_fn,

						  cb_arg, opc,

						  io_flags, req, sectors_per_max_io, 0, apptag_mask, apptag);

	} else if (req->payload.type == NVME_PAYLOAD_TYPE_SGL && check_sgl) {

	} else if (nvme_payload_type(&req->payload) == NVME_PAYLOAD_TYPE_SGL && check_sgl) {

		if (ns->ctrlr->flags & SPDK_NVME_CTRLR_SGL_SUPPORTED) {

			return _nvme_ns_cmd_split_request_sgl(ns, qpair, payload, payload_offset, md_offset,

							      lba, lba_count, cb_fn, cb_arg, opc, io_flags,

lib/nvme/nvme_pcie.c

+4 −4
Original line number Diff line number Diff line
@@ -1771,7 +1771,7 @@ nvme_pcie_qpair_build_hw_sgl_request(struct spdk_nvme_qpair *qpair, struct nvme_ 
	 * Build scattered payloads.

	 */

	assert(req->payload_size != 0);

	assert(req->payload.type == NVME_PAYLOAD_TYPE_SGL);

	assert(nvme_payload_type(&req->payload) == NVME_PAYLOAD_TYPE_SGL);

	assert(req->payload.u.sgl.reset_sgl_fn != NULL);

	assert(req->payload.u.sgl.next_sge_fn != NULL);

	req->payload.u.sgl.reset_sgl_fn(req->payload.u.sgl.cb_arg, req->payload_offset);
@@ -1848,7 +1848,7 @@ nvme_pcie_qpair_build_prps_sgl_request(struct spdk_nvme_qpair *qpair, struct nvm 
	/*

	 * Build scattered payloads.

	 */

	assert(req->payload.type == NVME_PAYLOAD_TYPE_SGL);

	assert(nvme_payload_type(&req->payload) == NVME_PAYLOAD_TYPE_SGL);

	assert(req->payload.u.sgl.reset_sgl_fn != NULL);

	req->payload.u.sgl.reset_sgl_fn(req->payload.u.sgl.cb_arg, req->payload_offset);
@@ -1945,9 +1945,9 @@ nvme_pcie_qpair_submit_request(struct spdk_nvme_qpair *qpair, struct nvme_reques 
	if (req->payload_size == 0) {

		/* Null payload - leave PRP fields zeroed */

		rc = 0;

	} else if (req->payload.type == NVME_PAYLOAD_TYPE_CONTIG) {

	} else if (nvme_payload_type(&req->payload) == NVME_PAYLOAD_TYPE_CONTIG) {

		rc = nvme_pcie_qpair_build_contig_request(qpair, req, tr);

	} else if (req->payload.type == NVME_PAYLOAD_TYPE_SGL) {

	} else if (nvme_payload_type(&req->payload) == NVME_PAYLOAD_TYPE_SGL) {

		if (ctrlr->flags & SPDK_NVME_CTRLR_SGL_SUPPORTED) {

			rc = nvme_pcie_qpair_build_hw_sgl_request(qpair, req, tr);

		} else {

lib/nvme/nvme_rdma.c

+4 −4
Original line number Diff line number Diff line
@@ -909,7 +909,7 @@ nvme_rdma_build_contig_request(struct nvme_rdma_qpair *rqpair, struct nvme_reque 
	struct ibv_mr *mr;



	assert(req->payload_size != 0);

	assert(req->payload.type == NVME_PAYLOAD_TYPE_CONTIG);

	assert(nvme_payload_type(&req->payload) == NVME_PAYLOAD_TYPE_CONTIG);



	mr = (struct ibv_mr *)spdk_mem_map_translate(rqpair->mr_map->map, (uint64_t)payload);

	if (mr == NULL) {
@@ -938,7 +938,7 @@ nvme_rdma_build_sgl_request(struct nvme_rdma_qpair *rqpair, struct nvme_request 
	uint32_t length;



	assert(req->payload_size != 0);

	assert(req->payload.type == NVME_PAYLOAD_TYPE_SGL);

	assert(nvme_payload_type(&req->payload) == NVME_PAYLOAD_TYPE_SGL);

	assert(req->payload.u.sgl.reset_sgl_fn != NULL);

	assert(req->payload.u.sgl.next_sge_fn != NULL);

	req->payload.u.sgl.reset_sgl_fn(req->payload.u.sgl.cb_arg, req->payload_offset);
@@ -980,9 +980,9 @@ nvme_rdma_req_init(struct nvme_rdma_qpair *rqpair, struct nvme_request *req, 


	if (req->payload_size == 0) {

		rc = nvme_rdma_build_null_request(req);

	} else if (req->payload.type == NVME_PAYLOAD_TYPE_CONTIG) {

	} else if (nvme_payload_type(&req->payload) == NVME_PAYLOAD_TYPE_CONTIG) {

		rc = nvme_rdma_build_contig_request(rqpair, req);

	} else if (req->payload.type == NVME_PAYLOAD_TYPE_SGL) {

	} else if (nvme_payload_type(&req->payload) == NVME_PAYLOAD_TYPE_SGL) {

		rc = nvme_rdma_build_sgl_request(rqpair, req);

	} else {

		rc = -1;