mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tcp: Partially unify tcp_timer() and tcp_splice_timer()

Browse source 
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>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2022-11-17 16:58:48 +11:00 committed by Stefano Brivio
parent 0eef48c4be
commit 34476511f7
4 changed files with 41 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tcp.c
View file

@ -3283,8 +3283,6 @@ int tcp_init(struct ctx *c)
refill_arg.ns = 1; refill_arg.ns = 1;
NS_CALL(tcp_sock_refill, &refill_arg); NS_CALL(tcp_sock_refill, &refill_arg);
tcp_splice_timer(c);
} }
return 0; return 0;
@ -3416,7 +3414,7 @@ static int tcp_port_rebind(void *arg)
void tcp_timer(struct ctx *c, const struct timespec *ts) void tcp_timer(struct ctx *c, const struct timespec *ts)
{ {
struct tcp_sock_refill_arg refill_arg = { c, 0 }; struct tcp_sock_refill_arg refill_arg = { c, 0 };
struct tcp_tap_conn *conn; union tcp_conn *conn;
(void)ts; (void)ts;
@ -3439,11 +3437,13 @@ void tcp_timer(struct ctx *c, const struct timespec *ts)
} }
} }
for (conn = CONN(c->tcp.conn_count - 1); conn >= CONN(0); conn--) { for (conn = tc + c->tcp.conn_count - 1; conn >= tc; conn--) {
if (conn->c.spliced) if (conn->c.spliced) {
continue; tcp_splice_timer(c, &conn->splice);
if (conn->events == CLOSED) } else {
tcp_conn_destroy(c, conn); if (conn->tap.events == CLOSED)
tcp_conn_destroy(c, &conn->tap);
}
} }
tcp_sock_refill(&refill_arg); tcp_sock_refill(&refill_arg);
@ -3453,6 +3453,6 @@ void tcp_timer(struct ctx *c, const struct timespec *ts)
(c->ifi6 && ns_sock_pool6[TCP_SOCK_POOL_TSH] < 0)) (c->ifi6 && ns_sock_pool6[TCP_SOCK_POOL_TSH] < 0))
NS_CALL(tcp_sock_refill, &refill_arg); NS_CALL(tcp_sock_refill, &refill_arg);
tcp_splice_timer(c); tcp_splice_pipe_refill(c);
} }
} }

3
tcp_conn.h
View file

@ -201,5 +201,8 @@ extern union tcp_conn tc[];
void tcp_splice_conn_update(struct ctx *c, struct tcp_splice_conn *new); 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_table_compact(struct ctx *c, union tcp_conn *hole);
void tcp_splice_destroy(struct ctx *c, struct tcp_splice_conn *conn); 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 */ #endif /* TCP_CONN_H */

65
tcp_splice.c
View file

@ -766,7 +766,7 @@ smaller:
* tcp_splice_pipe_refill() - Refill pool of pre-opened pipes * tcp_splice_pipe_refill() - Refill pool of pre-opened pipes
* @c: Execution context * @c: Execution context
*/ */
static void tcp_splice_pipe_refill(const struct ctx *c) void tcp_splice_pipe_refill(const struct ctx *c)
{ {
int i; int i;
@ -803,48 +803,41 @@ void tcp_splice_init(struct ctx *c)
{ {
memset(splice_pipe_pool, 0xff, sizeof(splice_pipe_pool)); memset(splice_pipe_pool, 0xff, sizeof(splice_pipe_pool));
tcp_set_pipe_size(c); tcp_set_pipe_size(c);
tcp_splice_pipe_refill(c);
} }
/** /**
* tcp_splice_timer() - Timer for spliced connections * tcp_splice_timer() - Timer for spliced connections
* @c: Execution context * @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; if (conn->flags & CLOSING) {
tcp_splice_destroy(c, conn);
for (conn = CONN(c->tcp.conn_count - 1); conn >= CONN(0); conn--) { return;
if (!conn->c.spliced)
continue;
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_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);
}
conn_flag(c, conn, ~RCVLOWAT_ACT_A);
conn_flag(c, conn, ~RCVLOWAT_ACT_B);
} }
tcp_splice_pipe_refill(c); 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);
}
conn_flag(c, conn, ~RCVLOWAT_ACT_A);
conn_flag(c, conn, ~RCVLOWAT_ACT_B);
} }

1
tcp_splice.h
View file

@ -9,6 +9,5 @@
void tcp_sock_handler_splice(struct ctx *c, union epoll_ref ref, void tcp_sock_handler_splice(struct ctx *c, union epoll_ref ref,
uint32_t events); uint32_t events);
void tcp_splice_init(struct ctx *c); void tcp_splice_init(struct ctx *c);
void tcp_splice_timer(struct ctx *c);
#endif /* TCP_SPLICE_H */ #endif /* TCP_SPLICE_H */