[PATCH 10/14] tcp: Partially unify tcp_timer() and tcp_splice_timer()

[David Gibson <david@gibson.dropbear.id.au>]

These two functions scan all the non-splced and spliced connections
respectively and perform timed updates on them.  Avoid scanning the now
unified table twice, by having tcp_timer scan it once calling the
relevant per-connection function for each one.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 tcp.c        | 18 ++++++++---------
 tcp_conn.h   |  3 +++
 tcp_splice.c | 57 +++++++++++++++++++++++-----------------------------
 tcp_splice.h |  1 -
 4 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/tcp.c b/tcp.c
index e6c05f3..b1ddc6f 100644
--- a/tcp.c
+++ b/tcp.c
@@ -3282,8 +3282,6 @@ int tcp_init(struct ctx *c)
 
 		refill_arg.ns = 1;
 		NS_CALL(tcp_sock_refill, &refill_arg);
-
-		tcp_splice_timer(c);
 	}
 
 	return 0;
@@ -3415,7 +3413,7 @@ static int tcp_port_rebind(void *arg)
 void tcp_timer(struct ctx *c, const struct timespec *ts)
 {
 	struct tcp_sock_refill_arg refill_arg = { c, 0 };
-	struct tcp_tap_conn *conn;
+	union tcp_conn *conn;
 
 	(void)ts;
 
@@ -3438,11 +3436,13 @@ void tcp_timer(struct ctx *c, const struct timespec *ts)
 		}
 	}
 
-	for (conn = CONN(c->tcp.conn_count - 1); conn >= CONN(0); conn--) {
-		if (conn->c.spliced)
-			continue;
-		if (conn->events == CLOSED)
-			tcp_conn_destroy(c, conn);
+	for (conn = tc + c->tcp.conn_count - 1; conn >= tc; conn--) {
+		if (conn->c.spliced) {
+			tcp_splice_timer(c, &conn->splice);
+		} else {
+			if (conn->tap.events == CLOSED)
+				tcp_conn_destroy(c, &conn->tap);
+		}
 	}
 
 	tcp_sock_refill(&refill_arg);
@@ -3452,6 +3452,6 @@ void tcp_timer(struct ctx *c, const struct timespec *ts)
 		    (c->ifi6 && ns_sock_pool6[TCP_SOCK_POOL_TSH] < 0))
 			NS_CALL(tcp_sock_refill, &refill_arg);
 
-		tcp_splice_timer(c);
+		tcp_splice_pipe_refill(c);
 	}
 }
diff --git a/tcp_conn.h b/tcp_conn.h
index 634e259..7c450a0 100644
--- a/tcp_conn.h
+++ b/tcp_conn.h
@@ -201,5 +201,8 @@ extern union tcp_conn tc[];
 void tcp_splice_conn_update(struct ctx *c, struct tcp_splice_conn *new);
 void tcp_table_compact(struct ctx *c, union tcp_conn *hole);
 void tcp_splice_destroy(struct ctx *c, struct tcp_splice_conn *conn);
+void tcp_splice_timer(struct ctx *c, struct tcp_splice_conn *conn);
+void tcp_splice_pipe_refill(const struct ctx *c);
+
 
 #endif /* TCP_CONN_H */
diff --git a/tcp_splice.c b/tcp_splice.c
index 8db7760..7244c5d 100644
--- a/tcp_splice.c
+++ b/tcp_splice.c
@@ -766,7 +766,7 @@ smaller:
  * tcp_splice_pipe_refill() - Refill pool of pre-opened pipes
  * @c:		Execution context
  */
-static void tcp_splice_pipe_refill(const struct ctx *c)
+void tcp_splice_pipe_refill(const struct ctx *c)
 {
 	int i;
 
@@ -803,48 +803,41 @@ void tcp_splice_init(struct ctx *c)
 {
 	memset(splice_pipe_pool, 0xff, sizeof(splice_pipe_pool));
 	tcp_set_pipe_size(c);
+	tcp_splice_pipe_refill(c);
 }
 
 /**
  * tcp_splice_timer() - Timer for spliced connections
  * @c:		Execution context
+ * @conn:	Spliced connection
  */
-void tcp_splice_timer(struct ctx *c)
+void tcp_splice_timer(struct ctx *c, struct tcp_splice_conn *conn)
 {
-	struct tcp_splice_conn *conn;
-
-	for (conn = CONN(c->tcp.conn_count - 1); conn >= CONN(0); conn--) {
-		if (!conn->c.spliced)
-			continue;
-
-		if (conn->flags & CLOSING) {
-			tcp_splice_destroy(c, conn);
-			return;
-		}
+	if (conn->flags & CLOSING) {
+		tcp_splice_destroy(c, conn);
+		return;
+	}
 
-		if ( (conn->flags & RCVLOWAT_SET_A) &&
-		    !(conn->flags & RCVLOWAT_ACT_A)) {
-			if (setsockopt(conn->a, SOL_SOCKET, SO_RCVLOWAT,
-				       &((int){ 1 }), sizeof(int))) {
-				trace("TCP (spliced): can't set SO_RCVLOWAT on "
-				      "%i", conn->a);
-			}
-			conn_flag(c, conn, ~RCVLOWAT_SET_A);
+	if ( (conn->flags & RCVLOWAT_SET_A) &&
+	     !(conn->flags & RCVLOWAT_ACT_A)) {
+		if (setsockopt(conn->a, SOL_SOCKET, SO_RCVLOWAT,
+			       &((int){ 1 }), sizeof(int))) {
+			trace("TCP (spliced): can't set SO_RCVLOWAT on "
+			      "%i", conn->a);
 		}
+		conn_flag(c, conn, ~RCVLOWAT_SET_A);
+	}
 
-		if ( (conn->flags & RCVLOWAT_SET_B) &&
-		    !(conn->flags & RCVLOWAT_ACT_B)) {
-			if (setsockopt(conn->b, SOL_SOCKET, SO_RCVLOWAT,
-				       &((int){ 1 }), sizeof(int))) {
-				trace("TCP (spliced): can't set SO_RCVLOWAT on "
-				      "%i", conn->b);
-			}
-			conn_flag(c, conn, ~RCVLOWAT_SET_B);
+	if ( (conn->flags & RCVLOWAT_SET_B) &&
+	     !(conn->flags & RCVLOWAT_ACT_B)) {
+		if (setsockopt(conn->b, SOL_SOCKET, SO_RCVLOWAT,
+			       &((int){ 1 }), sizeof(int))) {
+			trace("TCP (spliced): can't set SO_RCVLOWAT on "
+			      "%i", conn->b);
 		}
-
-		conn_flag(c, conn, ~RCVLOWAT_ACT_A);
-		conn_flag(c, conn, ~RCVLOWAT_ACT_B);
+		conn_flag(c, conn, ~RCVLOWAT_SET_B);
 	}
 
-	tcp_splice_pipe_refill(c);
+	conn_flag(c, conn, ~RCVLOWAT_ACT_A);
+	conn_flag(c, conn, ~RCVLOWAT_ACT_B);
 }
diff --git a/tcp_splice.h b/tcp_splice.h
index b222600..c7895d2 100644
--- a/tcp_splice.h
+++ b/tcp_splice.h
@@ -14,6 +14,5 @@ void tcp_sock_handler_splice(struct ctx *c, union epoll_ref ref,
 			     uint32_t events);
 void tcp_splice_destroy(struct ctx *c, struct tcp_splice_conn *conn);
 void tcp_splice_init(struct ctx *c);
-void tcp_splice_timer(struct ctx *c);
 
 #endif /* TCP_SPLICE_H */
-- 
@@ -14,6 +14,5 @@ void tcp_sock_handler_splice(struct ctx *c, union epoll_ref ref,
 			     uint32_t events);
 void tcp_splice_destroy(struct ctx *c, struct tcp_splice_conn *conn);
 void tcp_splice_init(struct ctx *c);
-void tcp_splice_timer(struct ctx *c);
 
 #endif /* TCP_SPLICE_H */
-- 
2.38.1