From acad335521de75778b7181f1c6bf16af2af2c6f5 Mon Sep 17 00:00:00 2001 From: "Szulik, Maciej" Date: Wed, 29 Mar 2023 17:30:47 +0200 Subject: [PATCH] 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: Szulik, Maciej Change-Id: I450ff555f73ddd9be727ecc49209eb5af90fa88e Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17406 Reviewed-by: Shuhei Matsumoto Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Konrad Sztyber Community-CI: Mellanox Build Bot --- include/spdk_internal/sock.h | 6 ++++-- module/sock/posix/posix.c | 4 ++-- module/sock/uring/uring.c | 4 ++-- test/unit/lib/sock/sock.c/sock_ut.c | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/spdk_internal/sock.h b/include/spdk_internal/sock.h index 70f268ba4..305330d4c 100644 --- a/include/spdk_internal/sock.h +++ b/include/spdk_internal/sock.h @@ -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 { diff --git a/module/sock/posix/posix.c b/module/sock/posix/posix.c index c8458db10..9aa5f4782 100644 --- a/module/sock/posix/posix.c +++ b/module/sock/posix/posix.c @@ -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, diff --git a/module/sock/uring/uring.c b/module/sock/uring/uring.c index 60515cd89..372e8de14 100644 --- a/module/sock/uring/uring.c +++ b/module/sock/uring/uring.c @@ -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, diff --git a/test/unit/lib/sock/sock.c/sock_ut.c b/test/unit/lib/sock/sock.c/sock_ut.c index 202aaa39a..8db9eb524 100644 --- a/test/unit/lib/sock/sock.c/sock_ut.c +++ b/test/unit/lib/sock/sock.c/sock_ut.c @@ -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;