Commit bc13d022 authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

nvmf: move transport spdk_nvmf_*_req_get_xfer() function into the common nvmf library 



Change-Id: I1619cc9b3feea1feb16282dc6c9cc8d5a380282c
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/475952


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatar <jacek.kalwas@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 0c9057f0

lib/nvmf/nvmf_internal.h

+58 −0
Original line number Diff line number Diff line
@@ -449,6 +449,64 @@ void spdk_nvmf_ctrlr_reservation_notice_log(struct spdk_nvmf_ctrlr *ctrlr, 
		struct spdk_nvmf_ns *ns,

		enum spdk_nvme_reservation_notification_log_page_type type);



static inline enum spdk_nvme_data_transfer

spdk_nvmf_req_get_xfer(struct spdk_nvmf_request *req) {

	enum spdk_nvme_data_transfer xfer;

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;

	struct spdk_nvme_sgl_descriptor *sgl = &cmd->dptr.sgl1;



	/* Figure out data transfer direction */

	if (cmd->opc == SPDK_NVME_OPC_FABRIC)

	{

		xfer = spdk_nvme_opc_get_data_transfer(req->cmd->nvmf_cmd.fctype);

	} else

	{

		xfer = spdk_nvme_opc_get_data_transfer(cmd->opc);



		/* Some admin commands are special cases */

		if ((req->qpair->qid == 0) &&

		    ((cmd->opc == SPDK_NVME_OPC_GET_FEATURES) ||

		     (cmd->opc == SPDK_NVME_OPC_SET_FEATURES))) {

			switch (cmd->cdw10 & 0xff) {

			case SPDK_NVME_FEAT_LBA_RANGE_TYPE:

			case SPDK_NVME_FEAT_AUTONOMOUS_POWER_STATE_TRANSITION:

			case SPDK_NVME_FEAT_HOST_IDENTIFIER:

				break;

			default:

				xfer = SPDK_NVME_DATA_NONE;

			}

		}

	}



	if (xfer == SPDK_NVME_DATA_NONE)

	{

		return xfer;

	}



	/* Even for commands that may transfer data, they could have specified 0 length.

	 * We want those to show up with xfer SPDK_NVME_DATA_NONE.

	 */

	switch (sgl->generic.type)

	{

	case SPDK_NVME_SGL_TYPE_DATA_BLOCK:

	case SPDK_NVME_SGL_TYPE_BIT_BUCKET:

	case SPDK_NVME_SGL_TYPE_SEGMENT:

	case SPDK_NVME_SGL_TYPE_LAST_SEGMENT:

	case SPDK_NVME_SGL_TYPE_TRANSPORT_DATA_BLOCK:

		if (sgl->unkeyed.length == 0) {

			xfer = SPDK_NVME_DATA_NONE;

		}

		break;

	case SPDK_NVME_SGL_TYPE_KEYED_DATA_BLOCK:

		if (sgl->keyed.length == 0) {

			xfer = SPDK_NVME_DATA_NONE;

		}

		break;

	}



	return xfer;

}



/*

 * Abort aer is sent on a per controller basis and sends a completion for the aer to the host.

 * This function should be called when attempting to recover in error paths when it is OK for

lib/nvmf/rdma.c

+6 −63
Original line number Diff line number Diff line
@@ -1395,68 +1395,6 @@ spdk_nvmf_rdma_check_contiguous_entries(uint64_t addr_1, uint64_t addr_2) 
	return addr_1 == addr_2;

}



typedef enum spdk_nvme_data_transfer spdk_nvme_data_transfer_t;



static spdk_nvme_data_transfer_t

spdk_nvmf_rdma_request_get_xfer(struct spdk_nvmf_rdma_request *rdma_req)

{

	enum spdk_nvme_data_transfer xfer;

	struct spdk_nvme_cmd *cmd = &rdma_req->req.cmd->nvme_cmd;

	struct spdk_nvme_sgl_descriptor *sgl = &cmd->dptr.sgl1;



#ifdef SPDK_CONFIG_RDMA_SEND_WITH_INVAL

	rdma_req->rsp.wr.opcode = IBV_WR_SEND;

	rdma_req->rsp.wr.imm_data = 0;

#endif



	/* Figure out data transfer direction */

	if (cmd->opc == SPDK_NVME_OPC_FABRIC) {

		xfer = spdk_nvme_opc_get_data_transfer(rdma_req->req.cmd->nvmf_cmd.fctype);

	} else {

		xfer = spdk_nvme_opc_get_data_transfer(cmd->opc);



		/* Some admin commands are special cases */

		if ((rdma_req->req.qpair->qid == 0) &&

		    ((cmd->opc == SPDK_NVME_OPC_GET_FEATURES) ||

		     (cmd->opc == SPDK_NVME_OPC_SET_FEATURES))) {

			switch (cmd->cdw10 & 0xff) {

			case SPDK_NVME_FEAT_LBA_RANGE_TYPE:

			case SPDK_NVME_FEAT_AUTONOMOUS_POWER_STATE_TRANSITION:

			case SPDK_NVME_FEAT_HOST_IDENTIFIER:

				break;

			default:

				xfer = SPDK_NVME_DATA_NONE;

			}

		}

	}



	if (xfer == SPDK_NVME_DATA_NONE) {

		return xfer;

	}



	/* Even for commands that may transfer data, they could have specified 0 length.

	 * We want those to show up with xfer SPDK_NVME_DATA_NONE.

	 */

	switch (sgl->generic.type) {

	case SPDK_NVME_SGL_TYPE_DATA_BLOCK:

	case SPDK_NVME_SGL_TYPE_BIT_BUCKET:

	case SPDK_NVME_SGL_TYPE_SEGMENT:

	case SPDK_NVME_SGL_TYPE_LAST_SEGMENT:

	case SPDK_NVME_SGL_TYPE_TRANSPORT_DATA_BLOCK:

		if (sgl->unkeyed.length == 0) {

			xfer = SPDK_NVME_DATA_NONE;

		}

		break;

	case SPDK_NVME_SGL_TYPE_KEYED_DATA_BLOCK:

		if (sgl->keyed.length == 0) {

			xfer = SPDK_NVME_DATA_NONE;

		}

		break;

	}



	return xfer;

}



static inline void

nvmf_rdma_setup_wr(struct ibv_send_wr *wr, struct ibv_send_wr *next,

		   enum spdk_nvme_data_transfer xfer)
@@ -2095,8 +2033,13 @@ spdk_nvmf_rdma_request_process(struct spdk_nvmf_rdma_transport *rtransport, 
				rdma_req->req.dif.dif_insert_or_strip = true;

			}



#ifdef SPDK_CONFIG_RDMA_SEND_WITH_INVAL

			rdma_req->rsp.wr.opcode = IBV_WR_SEND;

			rdma_req->rsp.wr.imm_data = 0;

#endif



			/* The next state transition depends on the data transfer needs of this request. */

			rdma_req->req.xfer = spdk_nvmf_rdma_request_get_xfer(rdma_req);

			rdma_req->req.xfer = spdk_nvmf_req_get_xfer(&rdma_req->req);



			/* If no data to transfer, ready to execute. */

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

lib/nvmf/tcp.c

+1 −59
Original line number Diff line number Diff line
@@ -2127,64 +2127,6 @@ spdk_nvmf_tcp_sock_process(struct spdk_nvmf_tcp_qpair *tqpair) 
	return rc;

}



static enum spdk_nvme_data_transfer

spdk_nvmf_tcp_req_get_xfer(struct spdk_nvmf_tcp_req *tcp_req) {

	enum spdk_nvme_data_transfer xfer;

	struct spdk_nvme_cmd *cmd = &tcp_req->req.cmd->nvme_cmd;

	struct spdk_nvme_sgl_descriptor *sgl = &cmd->dptr.sgl1;



	/* Figure out data transfer direction */

	if (cmd->opc == SPDK_NVME_OPC_FABRIC)

	{

		xfer = spdk_nvme_opc_get_data_transfer(tcp_req->req.cmd->nvmf_cmd.fctype);

	} else

	{

		xfer = spdk_nvme_opc_get_data_transfer(cmd->opc);



		/* Some admin commands are special cases */

		if ((tcp_req->req.qpair->qid == 0) &&

		    ((cmd->opc == SPDK_NVME_OPC_GET_FEATURES) ||

		     (cmd->opc == SPDK_NVME_OPC_SET_FEATURES))) {

			switch (cmd->cdw10 & 0xff) {

			case SPDK_NVME_FEAT_LBA_RANGE_TYPE:

			case SPDK_NVME_FEAT_AUTONOMOUS_POWER_STATE_TRANSITION:

			case SPDK_NVME_FEAT_HOST_IDENTIFIER:

				break;

			default:

				xfer = SPDK_NVME_DATA_NONE;

			}

		}

	}



	if (xfer == SPDK_NVME_DATA_NONE)

	{

		return xfer;

	}



	/* Even for commands that may transfer data, they could have specified 0 length.

	 * We want those to show up with xfer SPDK_NVME_DATA_NONE.

	 */

	switch (sgl->generic.type)

	{

	case SPDK_NVME_SGL_TYPE_DATA_BLOCK:

	case SPDK_NVME_SGL_TYPE_BIT_BUCKET:

	case SPDK_NVME_SGL_TYPE_SEGMENT:

	case SPDK_NVME_SGL_TYPE_LAST_SEGMENT:

	case SPDK_NVME_SGL_TYPE_TRANSPORT_DATA_BLOCK:

		if (sgl->unkeyed.length == 0) {

			xfer = SPDK_NVME_DATA_NONE;

		}

		break;

	case SPDK_NVME_SGL_TYPE_KEYED_DATA_BLOCK:

		if (sgl->keyed.length == 0) {

			xfer = SPDK_NVME_DATA_NONE;

		}

		break;

	}



	return xfer;

}



static int

spdk_nvmf_tcp_req_parse_sgl(struct spdk_nvmf_tcp_req *tcp_req,

			    struct spdk_nvmf_transport *transport,
@@ -2539,7 +2481,7 @@ spdk_nvmf_tcp_req_process(struct spdk_nvmf_tcp_transport *ttransport, 
			}



			/* The next state transition depends on the data transfer needs of this request. */

			tcp_req->req.xfer = spdk_nvmf_tcp_req_get_xfer(tcp_req);

			tcp_req->req.xfer = spdk_nvmf_req_get_xfer(&tcp_req->req);



			/* If no data to transfer, ready to execute. */

			if (tcp_req->req.xfer == SPDK_NVME_DATA_NONE) {