ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme_tcp: correctly support the incapsule data size.

Browse Source 
According to the TP 8000 spec, the maximal in capsule
data size is defined as follows:

1 For the Fabrics command and admin, it should not exceed
8192 bytes.

2 For I/O command, it shoudld be defined according to ioccsz
in the Identify controller data.

Change-Id: Ic13eda33e1516858e1e8749ee89459e3148d9e37
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
Reviewed-on: https://review.gerrithub.io/435826
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Sasha Kotchubievsky <sashakot@mellanox.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Ziye Yang 2018-12-03 10:18:36 +08:00 committed by Jim Harris
parent 1fa981d178
commit 20ccf47aed
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/nvme/nvme_tcp.c
View File

@ -78,7 +78,6 @@ struct nvme_tcp_qpair {
TAILQ_HEAD(, nvme_tcp_req) active_r2t_reqs; TAILQ_HEAD(, nvme_tcp_req) active_r2t_reqs;
TAILQ_HEAD(, nvme_tcp_pdu) send_queue; TAILQ_HEAD(, nvme_tcp_pdu) send_queue;
uint32_t in_capsule_data_size;
struct nvme_tcp_pdu recv_pdu; struct nvme_tcp_pdu recv_pdu;
struct nvme_tcp_pdu send_pdu; /* only for error pdu and init pdu */ struct nvme_tcp_pdu send_pdu; /* only for error pdu and init pdu */
enum nvme_tcp_pdu_recv_state recv_state; enum nvme_tcp_pdu_recv_state recv_state;
@ -555,12 +554,20 @@ nvme_tcp_build_sgl_request(struct nvme_tcp_qpair *tqpair, struct nvme_request *r
return 0; return 0;
} }
static inline uint32_t
nvme_tcp_icdsz_bytes(struct spdk_nvme_ctrlr *ctrlr)
{
return (ctrlr->cdata.nvmf_specific.ioccsz * 16 - sizeof(struct spdk_nvme_cmd));
}
static int static int
nvme_tcp_req_init(struct nvme_tcp_qpair *tqpair, struct nvme_request *req, nvme_tcp_req_init(struct nvme_tcp_qpair *tqpair, struct nvme_request *req,
struct nvme_tcp_req *tcp_req) struct nvme_tcp_req *tcp_req)
{ {
struct spdk_nvme_ctrlr *ctrlr = tqpair->qpair.ctrlr;
int rc = 0; int rc = 0;
enum spdk_nvme_data_transfer xfer; enum spdk_nvme_data_transfer xfer;
uint32_t max_incapsule_data_size;
tcp_req->req = req; tcp_req->req = req;
req->cmd.cid = tcp_req->cid; req->cmd.cid = tcp_req->cid;
@ -588,19 +595,21 @@ nvme_tcp_req_init(struct nvme_tcp_qpair *tqpair, struct nvme_request *req,
} else { } else {
xfer = spdk_nvme_opc_get_data_transfer(req->cmd.opc); xfer = spdk_nvme_opc_get_data_transfer(req->cmd.opc);
} }
if (xfer == SPDK_NVME_DATA_HOST_TO_CONTROLLER) {
max_incapsule_data_size = nvme_tcp_icdsz_bytes(ctrlr);
if ((req->cmd.opc == SPDK_NVME_OPC_FABRIC) || nvme_qpair_is_admin_queue(&tqpair->qpair)) {
max_incapsule_data_size = spdk_min(max_incapsule_data_size, NVME_TCP_IN_CAPSULE_DATA_MAX_SIZE);
}
/* Only for fabrics command */ if (req->payload_size <= max_incapsule_data_size) {
if ((req->cmd.opc == SPDK_NVME_OPC_FABRIC) && (tqpair->in_capsule_data_size != 0) && req->cmd.dptr.sgl1.unkeyed.type = SPDK_NVME_SGL_TYPE_DATA_BLOCK;
(xfer == SPDK_NVME_DATA_HOST_TO_CONTROLLER) && req->cmd.dptr.sgl1.unkeyed.subtype = SPDK_NVME_SGL_SUBTYPE_OFFSET;
(req->payload_size <= tqpair->in_capsule_data_size)) { req->cmd.dptr.sgl1.address = 0;
req->cmd.dptr.sgl1.unkeyed.type = SPDK_NVME_SGL_TYPE_DATA_BLOCK; tcp_req->in_capsule_data = true;
req->cmd.dptr.sgl1.unkeyed.subtype = SPDK_NVME_SGL_SUBTYPE_OFFSET; }
req->cmd.dptr.sgl1.address = 0;
tcp_req->in_capsule_data = true;
} }
return 0; return 0;
} }
static void static void
@ -1705,7 +1714,6 @@ nvme_tcp_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr,
return NULL; return NULL;
} }
tqpair->in_capsule_data_size = NVME_TCP_IN_CAPSULE_DATA_MAX_SIZE;
tqpair->num_entries = qsize; tqpair->num_entries = qsize;
qpair = &tqpair->qpair; qpair = &tqpair->qpair;