Commit 0accbe8a authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

nvme/tcp: Properly size the receive buffer 



Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Change-Id: I38e6e2f532597cb5e359879680edfc2172157c2f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1635


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 1621809e

lib/nvme/nvme_tcp.c

+20 −0
Original line number Diff line number Diff line
@@ -883,6 +883,7 @@ nvme_tcp_icresp_handle(struct nvme_tcp_qpair *tqpair, 
	struct spdk_nvme_tcp_ic_resp *ic_resp = &pdu->hdr.ic_resp;

	uint32_t error_offset = 0;

	enum spdk_nvme_tcp_term_req_fes fes;

	int recv_buf_size;



	/* Only PFV 0 is defined currently */

	if (ic_resp->pfv != 0) {
@@ -914,6 +915,25 @@ nvme_tcp_icresp_handle(struct nvme_tcp_qpair *tqpair, 
	SPDK_DEBUGLOG(SPDK_LOG_NVME, "host_hdgst_enable: %u\n", tqpair->host_hdgst_enable);

	SPDK_DEBUGLOG(SPDK_LOG_NVME, "host_ddgst_enable: %u\n", tqpair->host_ddgst_enable);



	/* Now that we know whether digests are enabled, properly size the receive buffer to

	 * handle 4 incoming 4K read commands. */

	recv_buf_size = 0x1000 + sizeof(struct spdk_nvme_tcp_cmd);



	if (tqpair->host_hdgst_enable) {

		recv_buf_size += SPDK_NVME_TCP_DIGEST_LEN;

	}



	if (tqpair->host_ddgst_enable) {

		recv_buf_size += SPDK_NVME_TCP_DIGEST_LEN;

	}



	if (spdk_sock_set_recvbuf(tqpair->sock, recv_buf_size * 4) < 0) {

		SPDK_WARNLOG("Unable to allocate enough memory for receive buffer on tqpair=%p with size=%d\n",

			     tqpair,

			     recv_buf_size);

		/* Not fatal. */

	}



	tqpair->state = NVME_TCP_QPAIR_STATE_RUNNING;

	nvme_tcp_qpair_set_recv_state(tqpair, NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_READY);

	return;