From 6edcf515d61619be09fa2b4532f031bb09d5cd81 Mon Sep 17 00:00:00 2001
From: Ziye Yang <ziye.yang@intel.com>
Date: Thu, 30 Jan 2020 21:37:46 +0800
Subject: [PATCH] sock/posix: Change the return type of function
 _sock_check_zcopy

Purpose: The function spdk_sock_request_put may
return an error code, and close the socket, so we should change the
return type of  _sock_check_zcopy.

If the return value of  _sock_check_zcopy is not zero,
we should not handle the EPOLLIN event.

Fixes #1169

Signed-off-by: Ziye Yang <ziye.yang@intel.com>
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/483311 (master)

(cherry picked from commit 9587017902becf2e1ce9a13dea1cd9ee4659a538)
Change-Id: Ie6fbd7ebff54749da8fa48836cc631eea09c4ab8
Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/483411
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Alexey Marchuk <alexeymar@mellanox.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
---
 module/sock/posix/posix.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/module/sock/posix/posix.c b/module/sock/posix/posix.c
index d5922246f..27a291c2f 100644
--- a/module/sock/posix/posix.c
+++ b/module/sock/posix/posix.c
@@ -462,7 +462,7 @@ spdk_posix_sock_close(struct spdk_sock *_sock)
 }
 
 #ifdef SPDK_ZEROCOPY
-static void
+static int
 _sock_check_zcopy(struct spdk_sock *sock)
 {
 	struct spdk_posix_sock *psock = __posix_sock(sock);
@@ -483,7 +483,7 @@ _sock_check_zcopy(struct spdk_sock *sock)
 
 		if (rc < 0) {
 			if (errno == EWOULDBLOCK || errno == EAGAIN) {
-				return;
+				return 0;
 			}
 
 			if (!TAILQ_EMPTY(&sock->pending_reqs)) {
@@ -491,19 +491,19 @@ _sock_check_zcopy(struct spdk_sock *sock)
 			} else {
 				SPDK_WARNLOG("Recvmsg yielded an error!\n");
 			}
-			return;
+			return 0;
 		}
 
 		cm = CMSG_FIRSTHDR(&msgh);
 		if (cm->cmsg_level != SOL_IP || cm->cmsg_type != IP_RECVERR) {
 			SPDK_WARNLOG("Unexpected cmsg level or type!\n");
-			return;
+			return 0;
 		}
 
 		serr = (struct sock_extended_err *)CMSG_DATA(cm);
 		if (serr->ee_errno != 0 || serr->ee_origin != SO_EE_ORIGIN_ZEROCOPY) {
 			SPDK_WARNLOG("Unexpected extended error origin\n");
-			return;
+			return 0;
 		}
 
 		/* Most of the time, the pending_reqs array is in the exact
@@ -521,7 +521,7 @@ _sock_check_zcopy(struct spdk_sock *sock)
 
 					rc = spdk_sock_request_put(sock, req, 0);
 					if (rc < 0) {
-						return;
+						return rc;
 					}
 
 				} else if (found) {
@@ -531,6 +531,8 @@ _sock_check_zcopy(struct spdk_sock *sock)
 
 		}
 	}
+
+	return 0;
 }
 #endif
 
@@ -959,14 +961,22 @@ spdk_posix_sock_group_impl_poll(struct spdk_sock_group_impl *_group, int max_eve
 
 	for (i = 0, j = 0; i < num_events; i++) {
 #if defined(__linux__)
+		sock = events[i].data.ptr;
+
 #ifdef SPDK_ZEROCOPY
 		if (events[i].events & EPOLLERR) {
-			_sock_check_zcopy(events[i].data.ptr);
+			rc = _sock_check_zcopy(sock);
+			/* If the socket was closed or removed from
+			 * the group in response to a send ack, don't
+			 * add it to the array here. */
+			if (rc || sock->cb_fn == NULL) {
+				continue;
+			}
 		}
 #endif
 
 		if (events[i].events & EPOLLIN) {
-			socks[j++] = events[i].data.ptr;
+			socks[j++] = sock;
 		}
 
 #elif defined(__FreeBSD__)