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

tcp, tcp_splice: Move per-type cleanup logic into per-type helpers

Browse source 
tcp_conn_destroy() and tcp_splice_destroy() are always called conditionally
on the connection being closed or closing.  Move that logic into the
"destroy" functions themselves, renaming them tcp_flow_defer() and
tcp_splice_flow_defer().

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:34 +11:00 committed by Stefano Brivio
parent eebca1115f
commit c97bb527d6
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tcp.c
View file

@ -1303,14 +1303,17 @@ static struct tcp_tap_conn *tcp_hash_lookup(const struct ctx *c,
} }
/** /**
* tcp_conn_destroy() - Close sockets, trigger hash table removal and compaction * tcp_flow_defer() - Deferred per-flow handling (clean up closed connections)
* @c: Execution context * @c: Execution context
* @flow: Flow table entry for this connection * @flow: Flow table entry for this connection
*/ */
static void tcp_conn_destroy(struct ctx *c, union flow *flow) static void tcp_flow_defer(struct ctx *c, union flow *flow)
{ {
const struct tcp_tap_conn *conn = &flow->tcp; const struct tcp_tap_conn *conn = &flow->tcp;
if (flow->tcp.events != CLOSED)
return;
close(conn->sock); close(conn->sock);
if (conn->timer != -1) if (conn->timer != -1)
close(conn->timer); close(conn->timer);
@ -1372,12 +1375,10 @@ void tcp_defer_handler(struct ctx *c)
for (flow = flowtab + c->flow_count - 1; flow >= flowtab; flow--) { for (flow = flowtab + c->flow_count - 1; flow >= flowtab; flow--) {
switch (flow->f.type) { switch (flow->f.type) {
case FLOW_TCP: case FLOW_TCP:
if (flow->tcp.events == CLOSED) tcp_flow_defer(c, flow);
tcp_conn_destroy(c, flow);
break; break;
case FLOW_TCP_SPLICE: case FLOW_TCP_SPLICE:
if (flow->tcp_splice.flags & CLOSING) tcp_splice_flow_defer(c, flow);
tcp_splice_destroy(c, flow);
break; break;
default: default:
die("Unexpected %s in tcp_defer_handler()", die("Unexpected %s in tcp_defer_handler()",

2
tcp_conn.h
View file

@ -158,7 +158,7 @@ extern int init_sock_pool6 [TCP_SOCK_POOL_SIZE];
void tcp_tap_conn_update(const struct ctx *c, struct tcp_tap_conn *old, void tcp_tap_conn_update(const struct ctx *c, struct tcp_tap_conn *old,
struct tcp_tap_conn *new); struct tcp_tap_conn *new);
void tcp_splice_conn_update(const struct ctx *c, struct tcp_splice_conn *new); void tcp_splice_conn_update(const struct ctx *c, struct tcp_splice_conn *new);
void tcp_splice_destroy(struct ctx *c, union flow *flow); void tcp_splice_flow_defer(struct ctx *c, union flow *flow);
void tcp_splice_timer(const struct ctx *c, union flow *flow); void tcp_splice_timer(const struct ctx *c, union flow *flow);
int tcp_conn_pool_sock(int pool[]); int tcp_conn_pool_sock(int pool[]);
int tcp_conn_new_sock(const struct ctx *c, sa_family_t af); int tcp_conn_new_sock(const struct ctx *c, sa_family_t af);

9
tcp_splice.c
View file

@ -243,15 +243,18 @@ void tcp_splice_conn_update(const struct ctx *c, struct tcp_splice_conn *new)
} }
/** /**
* tcp_splice_destroy() - Close spliced connection and pipes, clear * tcp_splice_flow_defer() - Deferred per-flow handling (clean up closed)
* @c: Execution context * @c: Execution context
* @flow: Flow table entry * @flow: Flow table entry for this connection
*/ */
void tcp_splice_destroy(struct ctx *c, union flow *flow) void tcp_splice_flow_defer(struct ctx *c, union flow *flow)
{ {
struct tcp_splice_conn *conn = &flow->tcp_splice; struct tcp_splice_conn *conn = &flow->tcp_splice;
unsigned side; unsigned side;
if (!(flow->tcp_splice.flags & CLOSING))
return;
for (side = 0; side < SIDES; side++) { for (side = 0; side < SIDES; side++) {
if (conn->events & SPLICE_ESTABLISHED) { if (conn->events & SPLICE_ESTABLISHED) {
/* Flushing might need to block: don't recycle them. */ /* Flushing might need to block: don't recycle them. */