mirrors/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2025-06-15 20:05:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tcp, tcp_splice: Remove redundant handling from tcp_timer()

Browse source 
tcp_timer() scans the connection table, expiring "tap" connections and
calling tcp_splice_timer() for "splice" connections.  tcp_splice_timer()
expires spliced connections and then does some other processing.

However, tcp_timer() is always called shortly after tcp_defer_handler()
(from post_handler()), which also scans the flow table expiring both tap
and spliced connections.  So remove the redundant handling, and only do
the extra tcp_splice_timer() work from tcp_timer().

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 2024-01-16 11:50:33 +11:00 • committed by Stefano Brivio
parent 8563e7c870
commit eebca1115f
3 changed files with 5 additions and 19 deletions

15
tcp.c
View file

@ -3201,20 +3201,9 @@ void tcp_timer(struct ctx *c, const struct timespec *now)
}
}
for (flow = flowtab + c->flow_count - 1; flow >= flowtab; flow--) {
switch (flow->f.type) {
case FLOW_TCP:
if (flow->tcp.events == CLOSED)
tcp_conn_destroy(c, flow);
break;
case FLOW_TCP_SPLICE:
for (flow = flowtab + c->flow_count - 1; flow >= flowtab; flow--)
if (flow->f.type == FLOW_TCP_SPLICE)
tcp_splice_timer(c, flow);
break;
default:
die("Unexpected %s in tcp_timer()",
FLOW_TYPE(&flow->f));
}
}
tcp_sock_refill_init(c);
if (c->mode == MODE_PASTA)