Commit acad3355 authored by Szulik, Maciej's avatar Szulik, Maciej Committed by Konrad Sztyber
Browse files

sock: change min recv/send buf sizes to 4 KiB 



The 2 MiB minimum may be not reasonable for some users, so it is changed
to 4 KiB to allow wider range of possible values.

The new default is introduced to keep backward compatibility (2 MiB).

Signed-off-by: default avatarSzulik, Maciej <maciej.szulik@intel.com>
Change-Id: I450ff555f73ddd9be727ecc49209eb5af90fa88e
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17406


Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Community-CI: Mellanox Build Bot
parent 06084c8b

include/spdk_internal/sock.h

+4 −2
Original line number Diff line number Diff line
@@ -22,8 +22,10 @@ extern "C" { 
#define MAX_EVENTS_PER_POLL 32

#define DEFAULT_SOCK_PRIORITY 0

#define MIN_SOCK_PIPE_SIZE 1024

#define MIN_SO_RCVBUF_SIZE (2 * 1024 * 1024)

#define MIN_SO_SNDBUF_SIZE (2 * 1024 * 1024)

#define DEFAULT_SO_RCVBUF_SIZE (2 * 1024 * 1024)

#define DEFAULT_SO_SNDBUF_SIZE (2 * 1024 * 1024)

#define MIN_SO_RCVBUF_SIZE (4 * 1024)

#define MIN_SO_SNDBUF_SIZE (4 * 1024)

#define IOV_BATCH_SIZE 64



struct spdk_sock {

module/sock/posix/posix.c

+2 −2
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ struct spdk_posix_sock_group_impl { 
};



static struct spdk_sock_impl_opts g_spdk_posix_sock_impl_opts = {

	.recv_buf_size = MIN_SO_RCVBUF_SIZE,

	.send_buf_size = MIN_SO_SNDBUF_SIZE,

	.recv_buf_size = DEFAULT_SO_RCVBUF_SIZE,

	.send_buf_size = DEFAULT_SO_SNDBUF_SIZE,

	.enable_recv_pipe = true,

	.enable_quickack = false,

	.enable_placement_id = PLACEMENT_NONE,

module/sock/uring/uring.c

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ struct spdk_uring_sock_group_impl { 
};



static struct spdk_sock_impl_opts g_spdk_uring_sock_impl_opts = {

	.recv_buf_size = MIN_SO_RCVBUF_SIZE,

	.send_buf_size = MIN_SO_SNDBUF_SIZE,

	.recv_buf_size = DEFAULT_SO_RCVBUF_SIZE,

	.send_buf_size = DEFAULT_SO_SNDBUF_SIZE,

	.enable_recv_pipe = true,

	.enable_quickack = false,

	.enable_placement_id = PLACEMENT_NONE,

test/unit/lib/sock/sock.c/sock_ut.c

+2 −2
Original line number Diff line number Diff line
@@ -925,8 +925,8 @@ posix_sock_impl_get_set_opts(void) 
	rc = spdk_sock_impl_get_opts("posix", &opts, &len);

	CU_ASSERT(rc == 0);

	CU_ASSERT(len == sizeof(opts));

	CU_ASSERT(opts.recv_buf_size == MIN_SO_RCVBUF_SIZE);

	CU_ASSERT(opts.send_buf_size == MIN_SO_SNDBUF_SIZE);

	CU_ASSERT(opts.recv_buf_size == DEFAULT_SO_RCVBUF_SIZE);

	CU_ASSERT(opts.send_buf_size == DEFAULT_SO_SNDBUF_SIZE);



	/* Try to request zero opts */

	len = 0;