tcp_splice: Simplify / correct OUT_WAIT flag handling

We set the OUT_WAIT flag if we stop forwarding due to EAGAIN, but there's
still data in the pipe.  That ensures we wake up when the output socket has
room to drain the pipe into.

We clear the OUT_WAIT flag when we complete forwarding on an EPOLLOUT
event, but that's not quite right.  Even though it's called on an EPOLLOUT,
tcp_splice_forward() could, in principle empty the pipe, but also read
enough new data from the other side to fill it again.  That would set
OUT_WAIT internally, but it would be cleared after returning meaning
we could miss a necessary wakeup.

The condition on whether we need write side wakeups is actually fairly
simple: we need them if and only if we return to the main loop with data
in the pipe.  Maintain that in a single place - right after we exit the
forwarding loop in tcp_splice_forward().

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>

1 files changed, 9 insertions, 7 deletions

diff --git a/tcp_splice.c b/tcp_splice.c
index 4290268..5f41258 100644
--- a/tcp_splice.c
+++ b/tcp_splice.c
@@ -531,19 +531,22 @@ static int tcp_splice_forward(struct ctx *c,
 		conn->pending[fromsidei] += readlen > 0 ? readlen : 0;
 		conn->pending[fromsidei] -= written > 0 ? written : 0;
 
-		if (written < 0) {
-			if (!conn->pending[fromsidei])
-				break;
-
-			conn_event(conn, OUT_WAIT(!fromsidei));
+		if (written < 0)
 			break;
-		}
 
 		if (conn->events & FIN_RCVD(fromsidei) &&
 		    !conn->pending[fromsidei])
 			break;
 	}
 
+	/* We need write-side wakeups if and only if we have data in the pipe to
+	 * drain.
+	 */
+	if (conn->pending[fromsidei])
+		conn_event(conn, OUT_WAIT(!fromsidei));
+	else
+		conn_event(conn, ~OUT_WAIT(!fromsidei));
+
 	if ((conn->events & FIN_RCVD(fromsidei)) &&
 	    !(conn->events & FIN_SENT(!fromsidei)) &&
 	    !conn->pending[fromsidei]) {
@@ -606,7 +609,6 @@ void tcp_splice_sock_handler(struct ctx *c, union epoll_ref ref,
 	if (events & EPOLLOUT) {
 		if (tcp_splice_forward(c, conn, !evsidei, now))
 			goto reset;
-		conn_event(conn, ~OUT_WAIT(evsidei));
 	}
 
 	if (events & (EPOLLIN | EPOLLRDHUP)) {