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

sock: extract copying impl_opts to a function

Browse Source 
Both get_opts and set_opts use very similar macros to achieve almost the
same thing, so it makes sense to extract it to a separate function.
Additionally, it'll be also useful in subsequent patches introducing
per-sock impl_opts, as there will be more places when we want to copy
impl_opts.

Signed-off-by: Konrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I8ab27298d62ea0118463ee945c708acd91aa5104
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13658
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
This commit is contained in:
Konrad Sztyber 2022-07-06 15:27:24 +02:00 committed by Tomasz Zawadzki
parent 38f82ecf1e
commit 030bbebeb2
2 changed files with 62 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
module/sock/posix/posix.c
View File

@ -93,54 +93,16 @@ posix_sock_map_cleanup(void)
#define __posix_sock(sock) (struct spdk_posix_sock *)sock #define __posix_sock(sock) (struct spdk_posix_sock *)sock
#define __posix_group_impl(group) (struct spdk_posix_sock_group_impl *)group #define __posix_group_impl(group) (struct spdk_posix_sock_group_impl *)group
static int static void
posix_sock_impl_get_opts(struct spdk_sock_impl_opts *opts, size_t *len) posix_sock_copy_impl_opts(struct spdk_sock_impl_opts *dest, const struct spdk_sock_impl_opts *src,
size_t len)
{ {
if (!opts || !len) {
errno = EINVAL;
return -1;
}
memset(opts, 0, *len);
#define FIELD_OK(field) \ #define FIELD_OK(field) \
offsetof(struct spdk_sock_impl_opts, field) + sizeof(opts->field) <= *len offsetof(struct spdk_sock_impl_opts, field) + sizeof(src->field) <= len
#define GET_FIELD(field) \
if (FIELD_OK(field)) { \
opts->field = g_spdk_posix_sock_impl_opts.field; \
}
GET_FIELD(recv_buf_size);
GET_FIELD(send_buf_size);
GET_FIELD(enable_recv_pipe);
GET_FIELD(enable_zerocopy_send);
GET_FIELD(enable_quickack);
GET_FIELD(enable_placement_id);
GET_FIELD(enable_zerocopy_send_server);
GET_FIELD(enable_zerocopy_send_client);
GET_FIELD(zerocopy_threshold);
#undef GET_FIELD
#undef FIELD_OK
*len = spdk_min(*len, sizeof(g_spdk_posix_sock_impl_opts));
return 0;
}
static int
posix_sock_impl_set_opts(const struct spdk_sock_impl_opts *opts, size_t len)
{
if (!opts) {
errno = EINVAL;
return -1;
}
#define FIELD_OK(field) \
offsetof(struct spdk_sock_impl_opts, field) + sizeof(opts->field) <= len
#define SET_FIELD(field) \ #define SET_FIELD(field) \
if (FIELD_OK(field)) { \ if (FIELD_OK(field)) { \
g_spdk_posix_sock_impl_opts.field = opts->field; \ dest->field = src->field; \
} }
SET_FIELD(recv_buf_size); SET_FIELD(recv_buf_size);
@ -155,6 +117,32 @@ posix_sock_impl_set_opts(const struct spdk_sock_impl_opts *opts, size_t len)
#undef SET_FIELD #undef SET_FIELD
#undef FIELD_OK #undef FIELD_OK
}
static int
posix_sock_impl_get_opts(struct spdk_sock_impl_opts *opts, size_t *len)
{
if (!opts || !len) {
errno = EINVAL;
return -1;
}
memset(opts, 0, *len);
posix_sock_copy_impl_opts(opts, &g_spdk_posix_sock_impl_opts, *len);
*len = spdk_min(*len, sizeof(g_spdk_posix_sock_impl_opts));
return 0;
}
static int
posix_sock_impl_set_opts(const struct spdk_sock_impl_opts *opts, size_t len)
{
if (!opts) {
errno = EINVAL;
return -1;
}
posix_sock_copy_impl_opts(&g_spdk_posix_sock_impl_opts, opts, len);
return 0; return 0;
} }

73
module/sock/uring/uring.c
View File

@ -114,53 +114,16 @@ uring_sock_map_cleanup(void)
#define __uring_sock(sock) (struct spdk_uring_sock *)sock #define __uring_sock(sock) (struct spdk_uring_sock *)sock
#define __uring_group_impl(group) (struct spdk_uring_sock_group_impl *)group #define __uring_group_impl(group) (struct spdk_uring_sock_group_impl *)group
static int static void
uring_sock_impl_get_opts(struct spdk_sock_impl_opts *opts, size_t *len) uring_sock_copy_impl_opts(struct spdk_sock_impl_opts *dest, const struct spdk_sock_impl_opts *src,
size_t len)
{ {
if (!opts || !len) {
errno = EINVAL;
return -1;
}
memset(opts, 0, *len);
#define FIELD_OK(field) \ #define FIELD_OK(field) \
offsetof(struct spdk_sock_impl_opts, field) + sizeof(opts->field) <= *len offsetof(struct spdk_sock_impl_opts, field) + sizeof(src->field) <= len
#define GET_FIELD(field) \
if (FIELD_OK(field)) { \
opts->field = g_spdk_uring_sock_impl_opts.field; \
}
GET_FIELD(recv_buf_size);
GET_FIELD(send_buf_size);
GET_FIELD(enable_recv_pipe);
GET_FIELD(enable_quickack);
GET_FIELD(enable_placement_id);
GET_FIELD(enable_zerocopy_send_server);
GET_FIELD(enable_zerocopy_send_client);
GET_FIELD(zerocopy_threshold);
#undef GET_FIELD
#undef FIELD_OK
*len = spdk_min(*len, sizeof(g_spdk_uring_sock_impl_opts));
return 0;
}
static int
uring_sock_impl_set_opts(const struct spdk_sock_impl_opts *opts, size_t len)
{
if (!opts) {
errno = EINVAL;
return -1;
}
#define FIELD_OK(field) \
offsetof(struct spdk_sock_impl_opts, field) + sizeof(opts->field) <= len
#define SET_FIELD(field) \ #define SET_FIELD(field) \
if (FIELD_OK(field)) { \ if (FIELD_OK(field)) { \
g_spdk_uring_sock_impl_opts.field = opts->field; \ dest->field = src->field; \
} }
SET_FIELD(recv_buf_size); SET_FIELD(recv_buf_size);
@ -174,6 +137,32 @@ uring_sock_impl_set_opts(const struct spdk_sock_impl_opts *opts, size_t len)
#undef SET_FIELD #undef SET_FIELD
#undef FIELD_OK #undef FIELD_OK
}
static int
uring_sock_impl_get_opts(struct spdk_sock_impl_opts *opts, size_t *len)
{
if (!opts || !len) {
errno = EINVAL;
return -1;
}
memset(opts, 0, *len);
uring_sock_copy_impl_opts(opts, &g_spdk_uring_sock_impl_opts, *len);
*len = spdk_min(*len, sizeof(g_spdk_uring_sock_impl_opts));
return 0;
}
static int
uring_sock_impl_set_opts(const struct spdk_sock_impl_opts *opts, size_t len)
{
if (!opts) {
errno = EINVAL;
return -1;
}
uring_sock_copy_impl_opts(&g_spdk_uring_sock_impl_opts, opts, len);
return 0; return 0;
} }