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

nvmf/tcp: Increase in-capsule buffer size to fill DIF fields

Browse Source 
When NVMe/TCP initiator transfers in-capsule data, NVMe/TCP has to
process it as in-capsule data. If DIF insert/strip is enabled,
in-capsule data size will be increased by NVMe/TCP target to insert
metadata. However size of in-capsule data buffer had not been
increased, and buffer overflow occurred when NVMe/TCP initiator
transfers in-capsule data to NVMe/TCP target with DIF insert/strip
being enabled.

This patch increases size of in-capsule data buffer size to store
metadata. 16 byte metadata per 512 byte data block is the current
maximum ratio of metadata per block.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I88b127efd7a945bde167a95df19a0b9175cb8cd0
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/461333
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-07-11 10:59:38 +09:00 committed by Darek Stojaczyk
parent 9d4ee5f344
commit e3e023cfd3
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/nvmf/tcp.c
View File

@ -926,8 +926,12 @@ spdk_nvmf_tcp_qpair_init_mem_resource(struct spdk_nvmf_tcp_qpair *tqpair, uint16
int i; int i;
struct spdk_nvmf_tcp_req *tcp_req; struct spdk_nvmf_tcp_req *tcp_req;
struct spdk_nvmf_transport *transport = tqpair->qpair.transport; struct spdk_nvmf_transport *transport = tqpair->qpair.transport;
struct spdk_nvmf_tcp_transport *ttransport; uint32_t in_capsule_data_size;
ttransport = SPDK_CONTAINEROF(transport, struct spdk_nvmf_tcp_transport, transport);
in_capsule_data_size = transport->opts.in_capsule_data_size;
if (transport->opts.dif_insert_or_strip) {
in_capsule_data_size = SPDK_BDEV_BUF_SIZE_WITH_MD(in_capsule_data_size);
}
if (!tqpair->qpair.sq_head_max) { if (!tqpair->qpair.sq_head_max) {
tqpair->req = calloc(1, sizeof(*tqpair->req)); tqpair->req = calloc(1, sizeof(*tqpair->req));
@ -936,8 +940,8 @@ spdk_nvmf_tcp_qpair_init_mem_resource(struct spdk_nvmf_tcp_qpair *tqpair, uint16
return -1; return -1;
} }
if (transport->opts.in_capsule_data_size) { if (in_capsule_data_size) {
tqpair->buf = spdk_dma_zmalloc(ttransport->transport.opts.in_capsule_data_size, 0x1000, NULL); tqpair->buf = spdk_dma_zmalloc(in_capsule_data_size, 0x1000, NULL);
if (!tqpair->buf) { if (!tqpair->buf) {
SPDK_ERRLOG("Unable to allocate buf on tqpair=%p.\n", tqpair); SPDK_ERRLOG("Unable to allocate buf on tqpair=%p.\n", tqpair);
return -1; return -1;
@ -978,9 +982,8 @@ spdk_nvmf_tcp_qpair_init_mem_resource(struct spdk_nvmf_tcp_qpair *tqpair, uint16
return -1; return -1;
} }
if (transport->opts.in_capsule_data_size) { if (in_capsule_data_size) {
tqpair->bufs = spdk_dma_zmalloc(size * transport->opts.in_capsule_data_size, tqpair->bufs = spdk_dma_zmalloc(size * in_capsule_data_size, 0x1000, NULL);
0x1000, NULL);
if (!tqpair->bufs) { if (!tqpair->bufs) {
SPDK_ERRLOG("Unable to allocate bufs on tqpair=%p.\n", tqpair); SPDK_ERRLOG("Unable to allocate bufs on tqpair=%p.\n", tqpair);
return -1; return -1;
@ -995,7 +998,7 @@ spdk_nvmf_tcp_qpair_init_mem_resource(struct spdk_nvmf_tcp_qpair *tqpair, uint16
/* Set up memory to receive commands */ /* Set up memory to receive commands */
if (tqpair->bufs) { if (tqpair->bufs) {
tcp_req->buf = (void *)((uintptr_t)tqpair->bufs + (i * transport->opts.in_capsule_data_size)); tcp_req->buf = (void *)((uintptr_t)tqpair->bufs + (i * in_capsule_data_size));
} }
/* Set the cmdn and rsp */ /* Set the cmdn and rsp */