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

sock/posix: move fd creation to a separated function

Browse Source 
Options modified on sock after connected is also moved to a
function.

Signed-off-by: Liu Qing <winglq@gmail.com>
Change-Id: I4c2a9ae9858c102764959d055bed208b4b0621d9
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9516
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: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Liu Qing 2021-09-16 08:59:01 +08:00 committed by Keith Lucas
parent 00af36fd73
commit 12f496dc8b
1 changed files with 79 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -303,23 +303,14 @@ posix_sock_set_sendbuf(struct spdk_sock *_sock, int sz)
return 0; return 0;
} }
static struct spdk_posix_sock * static void
posix_sock_alloc(int fd, bool enable_zero_copy) posix_sock_init(struct spdk_posix_sock *sock, bool enable_zero_copy)
{ {
struct spdk_posix_sock *sock;
#if defined(SPDK_ZEROCOPY) || defined(__linux__) #if defined(SPDK_ZEROCOPY) || defined(__linux__)
int flag; int flag;
int rc; int rc;
#endif #endif
sock = calloc(1, sizeof(*sock));
if (sock == NULL) {
SPDK_ERRLOG("sock allocation failed\n");
return NULL;
}
sock->fd = fd;
#if defined(SPDK_ZEROCOPY) #if defined(SPDK_ZEROCOPY)
flag = 1; flag = 1;
@ -350,10 +341,85 @@ posix_sock_alloc(int fd, bool enable_zero_copy)
spdk_sock_map_insert(&g_map, sock->placement_id, NULL); spdk_sock_map_insert(&g_map, sock->placement_id, NULL);
} }
#endif #endif
}
static struct spdk_posix_sock *
posix_sock_alloc(int fd, bool enable_zero_copy)
{
struct spdk_posix_sock *sock;
sock = calloc(1, sizeof(*sock));
if (sock == NULL) {
SPDK_ERRLOG("sock allocation failed\n");
return NULL;
}
sock->fd = fd;
posix_sock_init(sock, enable_zero_copy);
return sock; return sock;
} }
static int
posix_fd_create(struct addrinfo *res, struct spdk_sock_opts *opts)
{
int fd;
int val = 1;
int rc, sz;
fd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
if (fd < 0) {
/* error */
return -1;
}
sz = g_spdk_posix_sock_impl_opts.recv_buf_size;
rc = setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &sz, sizeof(sz));
if (rc) {
/* Not fatal */
}
sz = g_spdk_posix_sock_impl_opts.send_buf_size;
rc = setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sz, sizeof(sz));
if (rc) {
/* Not fatal */
}
rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof val);
if (rc != 0) {
close(fd);
/* error */
return -1;
}
rc = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof val);
if (rc != 0) {
close(fd);
/* error */
return -1;
}
#if defined(SO_PRIORITY)
if (opts->priority) {
rc = setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &opts->priority, sizeof val);
if (rc != 0) {
close(fd);
/* error */
return -1;
}
}
#endif
if (res->ai_family == AF_INET6) {
rc = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &val, sizeof val);
if (rc != 0) {
close(fd);
/* error */
return -1;
}
}
return fd;
}
static struct spdk_sock * static struct spdk_sock *
posix_sock_create(const char *ip, int port, posix_sock_create(const char *ip, int port,
enum posix_sock_create_type type, enum posix_sock_create_type type,
@ -365,8 +431,7 @@ posix_sock_create(const char *ip, int port,
char *p; char *p;
struct addrinfo hints, *res, *res0; struct addrinfo hints, *res, *res0;
int fd, flag; int fd, flag;
int val = 1; int rc;
int rc, sz;
bool enable_zcopy_user_opts = true; bool enable_zcopy_user_opts = true;
bool enable_zcopy_impl_opts = true; bool enable_zcopy_impl_opts = true;
@ -401,61 +466,10 @@ posix_sock_create(const char *ip, int port,
fd = -1; fd = -1;
for (res = res0; res != NULL; res = res->ai_next) { for (res = res0; res != NULL; res = res->ai_next) {
retry: retry:
fd = socket(res->ai_family, res->ai_socktype, res->ai_protocol); fd = posix_fd_create(res, opts);
if (fd < 0) { if (fd < 0) {
/* error */
continue; continue;
} }
sz = g_spdk_posix_sock_impl_opts.recv_buf_size;
rc = setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &sz, sizeof(sz));
if (rc) {
/* Not fatal */
}
sz = g_spdk_posix_sock_impl_opts.send_buf_size;
rc = setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sz, sizeof(sz));
if (rc) {
/* Not fatal */
}
rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof val);
if (rc != 0) {
close(fd);
fd = -1;
/* error */
continue;
}
rc = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof val);
if (rc != 0) {
close(fd);
fd = -1;
/* error */
continue;
}
#if defined(SO_PRIORITY)
if (opts->priority) {
rc = setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &opts->priority, sizeof val);
if (rc != 0) {
close(fd);
fd = -1;
/* error */
continue;
}
}
#endif
if (res->ai_family == AF_INET6) {
rc = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &val, sizeof val);
if (rc != 0) {
close(fd);
fd = -1;
/* error */
continue;
}
}
if (type == SPDK_SOCK_CREATE_LISTEN) { if (type == SPDK_SOCK_CREATE_LISTEN) {
rc = bind(fd, res->ai_addr, res->ai_addrlen); rc = bind(fd, res->ai_addr, res->ai_addrlen);
if (rc != 0) { if (rc != 0) {