Commit ab22d249 authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

sock/posix: Add a pending list for asynchronous requests 



Add an additional queue for requests that have been sent on the network
but aren't complete yet. As of this patch, the code
is still calling writev with no flags in the POSIX layer, so it completes
synchronously. That means requests pass through this new pending list
only very briefly inside of one function.

Change-Id: Iaab6efc118a6d5fe9589199515eb3a7293db4b8e
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/471768


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarOr Gerlitz <gerlitz.or@gmail.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent b7ad9426

include/spdk_internal/sock.h

+21 −3
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ struct spdk_sock { 


	int				max_iovcnt;

	TAILQ_HEAD(, spdk_sock_request)	queued_reqs;

	TAILQ_HEAD(, spdk_sock_request)	pending_reqs;

	int				queued_iovcnt;



	struct {
@@ -127,15 +128,22 @@ spdk_sock_request_queue(struct spdk_sock *sock, struct spdk_sock_request *req) 
	sock->queued_iovcnt += req->iovcnt;

}



static inline void

spdk_sock_request_pend(struct spdk_sock *sock, struct spdk_sock_request *req)

{

	TAILQ_REMOVE(&sock->queued_reqs, req, internal.link);

	assert(sock->queued_iovcnt >= req->iovcnt);

	sock->queued_iovcnt -= req->iovcnt;

	TAILQ_INSERT_TAIL(&sock->pending_reqs, req, internal.link);

}



static inline int

spdk_sock_request_put(struct spdk_sock *sock, struct spdk_sock_request *req, int err)

{

	bool closed;

	int rc = 0;



	TAILQ_REMOVE(&sock->queued_reqs, req, internal.link);

	assert(sock->queued_iovcnt >= req->iovcnt);

	sock->queued_iovcnt -= req->iovcnt;

	TAILQ_REMOVE(&sock->pending_reqs, req, internal.link);



	closed = sock->flags.closed;

	sock->cb_cnt++;
@@ -162,6 +170,15 @@ spdk_sock_abort_requests(struct spdk_sock *sock) 
	closed = sock->flags.closed;

	sock->cb_cnt++;



	req = TAILQ_FIRST(&sock->pending_reqs);

	while (req) {

		TAILQ_REMOVE(&sock->pending_reqs, req, internal.link);



		req->cb_fn(req->cb_arg, -ECANCELED);



		req = TAILQ_FIRST(&sock->pending_reqs);

	}



	req = TAILQ_FIRST(&sock->queued_reqs);

	while (req) {

		TAILQ_REMOVE(&sock->queued_reqs, req, internal.link);
@@ -177,6 +194,7 @@ spdk_sock_abort_requests(struct spdk_sock *sock) 
	sock->cb_cnt--;



	assert(TAILQ_EMPTY(&sock->queued_reqs));

	assert(TAILQ_EMPTY(&sock->pending_reqs));



	if (sock->cb_cnt == 0 && !closed && sock->flags.closed) {

		/* The user closed the socket in response to a callback above. */

lib/sock/sock.c

+2 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ spdk_sock_connect(const char *ip, int port) 
		if (sock != NULL) {

			sock->net_impl = impl;

			TAILQ_INIT(&sock->queued_reqs);

			TAILQ_INIT(&sock->pending_reqs);

			return sock;

		}

	}
@@ -214,6 +215,7 @@ spdk_sock_accept(struct spdk_sock *sock) 
	if (new_sock != NULL) {

		new_sock->net_impl = sock->net_impl;

		TAILQ_INIT(&new_sock->queued_reqs);

		TAILQ_INIT(&new_sock->pending_reqs);

	}



	return new_sock;

module/sock/posix/posix.c

+4 −0
Original line number Diff line number Diff line
@@ -524,6 +524,10 @@ _sock_flush(struct spdk_sock *sock) 


		/* Handled a full request. */

		req->internal.offset = 0;

		spdk_sock_request_pend(sock, req);



		/* The writev syscall above isn't currently asynchronous,

		 * so it's already done. */

		retval = spdk_sock_request_put(sock, req, 0);



		if (rc == 0 || retval) {

test/unit/lib/sock/posix.c/posix_ut.c

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ flush(void) 


	/* Set up data structures */

	TAILQ_INIT(&sock->queued_reqs);

	TAILQ_INIT(&sock->pending_reqs);

	sock->group_impl = &group.base;



	req1 = calloc(1, sizeof(struct spdk_sock_request) + 2 * sizeof(struct iovec));