Commit c1fbbfbe authored by Alexey Marchuk's avatar Alexey Marchuk Committed by Tomasz Zawadzki
Browse files

nvmf/tcp: Align recv_buf_size to MIN_SOC_PIPE_SIZE 



If the user decided to disable ICD then we have several side effects:
1. SPDK prints several warnings/errors
2. SPDK doesn't create recv pipe and doesn't set SO_RCVBUF socket option.

I think that we should not rely on ICD only when we create recv pipe or
set SO_RCVBUF since data may be transferred in sgls via R2T/H2C and
we still need recv_pipe and SO_RCVBUF for better performance.
Alternative option is to set recv_buf_size as a maximum between
ICD and io_unit_size

Signed-off-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
Change-Id: Ida71ecc099f9a9355e4617f13315a341872d1cb3
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4755


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 4fe47d6f

lib/nvmf/tcp.c

+3 −2
Original line number Diff line number Diff line
@@ -37,14 +37,14 @@ 
#include "spdk/assert.h"

#include "spdk/thread.h"

#include "spdk/nvmf_transport.h"

#include "spdk/sock.h"

#include "spdk/string.h"

#include "spdk/trace.h"

#include "spdk/util.h"

#include "spdk/log.h"



#include "spdk_internal/assert.h"

#include "spdk/log.h"

#include "spdk_internal/nvme_tcp.h"

#include "spdk_internal/sock.h"



#include "nvmf_internal.h"
@@ -1642,6 +1642,7 @@ nvmf_tcp_icreq_handle(struct spdk_nvmf_tcp_transport *ttransport, 
		tqpair->recv_buf_size -= SPDK_NVME_TCP_DIGEST_LEN * SPDK_NVMF_TCP_RECV_BUF_SIZE_FACTOR;

	}



	tqpair->recv_buf_size = spdk_max(tqpair->recv_buf_size, MIN_SOCK_PIPE_SIZE);

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

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

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