Commit 2c80fce0 authored by Ziye Yang's avatar Ziye Yang Committed by Tomasz Zawadzki
Browse files

sock/uring: enable "enable_recv_pipe" in uring sock 



Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
Change-Id: If62030a011ded73181b88f90fe87586a907af9ae
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4145


Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 174a5fe1

include/spdk/sock.h

+3 −3
Original line number Diff line number Diff line
@@ -89,17 +89,17 @@ struct spdk_sock_request { 
 */

struct spdk_sock_impl_opts {

	/**

	 * Size of sock receive buffer. Used by posix socket module.

	 * Size of sock receive buffer. Used by posix and uring socket modules.

	 */

	uint32_t recv_buf_size;



	/**

	 * Size of sock send buffer. Used by posix socket module.

	 * Size of sock send buffer. Used by posix and uring socket modules.

	 */

	uint32_t send_buf_size;



	/**

	 * Enable or disable receive pipe. Used by posix socket module.

	 * Enable or disable receive pipe. Used by posix and uring socket modules.

	 */

	bool enable_recv_pipe;

include/spdk_internal/sock.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ 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)



struct spdk_sock {

	struct spdk_net_impl		*net_impl;

module/sock/posix/posix.c

+0 −2
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ 


#define MAX_TMPBUF 1024

#define PORTNUMLEN 32

#define MIN_SO_RCVBUF_SIZE (2 * 1024 * 1024)

#define MIN_SO_SNDBUF_SIZE (2 * 1024 * 1024)

#define IOV_BATCH_SIZE 64



#if defined(SO_ZEROCOPY) && defined(MSG_ZEROCOPY)

module/sock/uring/uring.c

+73 −13
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ 


#define MAX_TMPBUF 1024

#define PORTNUMLEN 32

#define SO_RCVBUF_SIZE (2 * 1024 * 1024)

#define SO_SNDBUF_SIZE (2 * 1024 * 1024)

#define SPDK_SOCK_GROUP_QUEUE_DEPTH 4096

#define IOV_BATCH_SIZE 64
@@ -101,6 +99,12 @@ struct spdk_uring_sock_group_impl { 
	TAILQ_HEAD(, spdk_uring_sock)		pending_recv;

};



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,

	.enable_recv_pipe = true,

};



#define SPDK_URING_SOCK_REQUEST_IOV(req) ((struct iovec *)((uint8_t *)req + sizeof(struct spdk_sock_request)))



static int
@@ -286,15 +290,16 @@ uring_sock_set_recvbuf(struct spdk_sock *_sock, int sz) 


	assert(sock != NULL);



	/* The size of the pipe is purely derived from benchmarks. It seems to work well. */

	if (g_spdk_uring_sock_impl_opts.enable_recv_pipe) {

		rc = uring_sock_alloc_pipe(sock, sz);

		if (rc) {

			SPDK_ERRLOG("unable to allocate sufficient recvbuf with sz=%d on sock=%p\n", sz, _sock);

			return rc;

		}

	}



	if (sz < SO_RCVBUF_SIZE) {

		sz = SO_RCVBUF_SIZE;

	if (sz < MIN_SO_RCVBUF_SIZE) {

		sz = MIN_SO_RCVBUF_SIZE;

	}



	rc = setsockopt(sock->fd, SOL_SOCKET, SO_RCVBUF, &sz, sizeof(sz));
@@ -313,8 +318,8 @@ uring_sock_set_sendbuf(struct spdk_sock *_sock, int sz) 


	assert(sock != NULL);



	if (sz < SO_SNDBUF_SIZE) {

		sz = SO_SNDBUF_SIZE;

	if (sz < MIN_SO_SNDBUF_SIZE) {

		sz = MIN_SO_SNDBUF_SIZE;

	}



	rc = setsockopt(sock->fd, SOL_SOCKET, SO_SNDBUF, &sz, sizeof(sz));
@@ -389,13 +394,13 @@ retry: 
			continue;

		}



		val = SO_RCVBUF_SIZE;

		val = g_spdk_uring_sock_impl_opts.recv_buf_size;

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

		if (rc) {

			/* Not fatal */

		}



		val = SO_SNDBUF_SIZE;

		val = g_spdk_uring_sock_impl_opts.send_buf_size;

		rc = setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &val, sizeof val);

		if (rc) {

			/* Not fatal */
@@ -1284,6 +1289,59 @@ uring_sock_group_impl_close(struct spdk_sock_group_impl *_group) 
	return 0;

}



static int

uring_sock_impl_get_opts(struct spdk_sock_impl_opts *opts, size_t *len)

{

	if (!opts || !len) {

		errno = EINVAL;

		return -1;

	}



#define FIELD_OK(field) \

	offsetof(struct spdk_sock_impl_opts, field) + sizeof(opts->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);



#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) \

	if (FIELD_OK(field)) { \

		g_spdk_uring_sock_impl_opts.field = opts->field; \

	}



	SET_FIELD(recv_buf_size);

	SET_FIELD(send_buf_size);

	SET_FIELD(enable_recv_pipe);



#undef SET_FIELD

#undef FIELD_OK



	return 0;

}



static int

uring_sock_flush(struct spdk_sock *_sock)

{
@@ -1320,6 +1378,8 @@ static struct spdk_net_impl g_uring_net_impl = { 
	.group_impl_remove_sock = uring_sock_group_impl_remove_sock,

	.group_impl_poll	= uring_sock_group_impl_poll,

	.group_impl_close	= uring_sock_group_impl_close,

	.get_opts		= uring_sock_impl_get_opts,

	.set_opts		= uring_sock_impl_set_opts,

};



SPDK_NET_IMPL_REGISTER(uring, &g_uring_net_impl, DEFAULT_SOCK_PRIORITY + 1);