Commit ec1f0bd7 authored by Jacek Kalwas's avatar Jacek Kalwas Committed by Tomasz Zawadzki
Browse files

sock: add util to create sock fd 



Just moved the code from posix.c, code in uring.c is logically the same.

While doing the move, removed /* error */ comment above return.

Change-Id: I0faa3f030a2eec31fbbf65d41f2218ff3133f27e
Signed-off-by: default avatarJacek Kalwas <jacek.kalwas@nutanix.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/25806


Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
Reviewed-by: default avatarBen Walker <ben@nvidia.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Mellanox Build Bot
parent 150fffaa

include/spdk_internal/sock_module.h

+10 −0
Original line number Diff line number Diff line
@@ -384,6 +384,16 @@ spdk_sock_get_placement_id(int fd, enum spdk_placement_mode mode, int *placement 
	}

}



/**

 * Creates sock file descriptor.

 *

 * Use close() when returned fd is no longer needed.

 *

 * \return fd on success, -1 on failure.

 */

int spdk_sock_posix_fd_create(struct addrinfo *res, struct spdk_sock_opts *opts,

			      struct spdk_sock_impl_opts *impl_opts);



/**

 * Insert a group into the placement map.

 * If the group is already in the map, take a reference.

lib/sock/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) 
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk



SO_VER := 10

SO_MINOR := 0

SO_MINOR := 1



C_SRCS = sock.c sock_rpc.c

lib/sock/sock.c

+73 −0
Original line number Diff line number Diff line
@@ -336,6 +336,79 @@ sock_init_opts(struct spdk_sock_opts *opts, struct spdk_sock_opts *opts_user) 
	}

}



int

spdk_sock_posix_fd_create(struct addrinfo *res, struct spdk_sock_opts *opts,

			  struct spdk_sock_impl_opts *impl_opts)

{

	int fd;

	int val = 1;

	int rc, sz;

#if defined(__linux__)

	int to;

#endif



	fd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);

	if (fd < 0) {

		return -1;

	}



	sz = impl_opts->recv_buf_size;

	rc = setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &sz, sizeof(sz));

	if (rc) {

		/* Not fatal */

	}



	sz = 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);

		return -1;

	}

	rc = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof val);

	if (rc != 0) {

		close(fd);

		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);

			return -1;

		}

	}

#endif



	if (res->ai_family == AF_INET6) {

		rc = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &val, sizeof val);

		if (rc != 0) {

			close(fd);

			return -1;

		}

	}



	if (opts->ack_timeout) {

#if defined(__linux__)

		to = opts->ack_timeout;

		rc = setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &to, sizeof(to));

		if (rc != 0) {

			close(fd);

			return -1;

		}

#else

		SPDK_WARNLOG("TCP_USER_TIMEOUT is not supported.\n");

#endif

	}



	return fd;

}



struct spdk_sock *

spdk_sock_connect(const char *ip, int port, const char *impl_name)

{

lib/sock/spdk_sock.map

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 


	# internal function in spdk_internal/sock_module.h

	spdk_net_impl_register;

	spdk_sock_posix_fd_create;

	spdk_sock_group_get_buf;

	spdk_sock_map_insert;

	spdk_sock_map_release;

module/sock/posix/posix.c

+1 −80
Original line number Diff line number Diff line
@@ -477,85 +477,6 @@ posix_sock_alloc(int fd, struct spdk_sock_impl_opts *impl_opts, bool enable_zero 
	return sock;

}



static int

posix_fd_create(struct addrinfo *res, struct spdk_sock_opts *opts,

		struct spdk_sock_impl_opts *impl_opts)

{

	int fd;

	int val = 1;

	int rc, sz;

#if defined(__linux__)

	int to;

#endif



	fd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);

	if (fd < 0) {

		/* error */

		return -1;

	}



	sz = impl_opts->recv_buf_size;

	rc = setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &sz, sizeof(sz));

	if (rc) {

		/* Not fatal */

	}



	sz = 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;

		}

	}



	if (opts->ack_timeout) {

#if defined(__linux__)

		to = opts->ack_timeout;

		rc = setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &to, sizeof(to));

		if (rc != 0) {

			close(fd);

			/* error */

			return -1;

		}

#else

		SPDK_WARNLOG("TCP_USER_TIMEOUT is not supported.\n");

#endif

	}



	return fd;

}



static int

posix_sock_psk_find_session_server_cb(SSL *ssl, const unsigned char *identity,

				      size_t identity_len, SSL_SESSION **sess)
@@ -986,7 +907,7 @@ posix_sock_create(const char *ip, int port, 
	fd = -1;

	for (res = res0; res != NULL; res = res->ai_next) {

retry:

		fd = posix_fd_create(res, opts, &impl_opts);

		fd = spdk_sock_posix_fd_create(res, opts, &impl_opts);

		if (fd < 0) {

			continue;

		}