diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2024-01-16 11:50:34 +1100 |
|---|---|---|
| committer | Stefano Brivio <sbrivio@redhat.com> | 2024-01-22 23:35:15 +0100 |
| commit | c97bb527d6894a66f19584c1e300854c3110da64 (patch) | |
| tree | 56b3fcb7c57dfd67674c3a865de15ddb877ed651 /tcp_splice.c | |
| parent | eebca1115fbdb0fc72af713171434b0adbf4e87b (diff) | |
| download | passt-c97bb527d6894a66f19584c1e300854c3110da64.tar passt-c97bb527d6894a66f19584c1e300854c3110da64.tar.gz passt-c97bb527d6894a66f19584c1e300854c3110da64.tar.bz2 passt-c97bb527d6894a66f19584c1e300854c3110da64.tar.lz passt-c97bb527d6894a66f19584c1e300854c3110da64.tar.xz passt-c97bb527d6894a66f19584c1e300854c3110da64.tar.zst passt-c97bb527d6894a66f19584c1e300854c3110da64.zip | |
tcp, tcp_splice: Move per-type cleanup logic into per-type helpers
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>
Diffstat (limited to 'tcp_splice.c')
| -rw-r--r-- | tcp_splice.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tcp_splice.c b/tcp_splice.c index a187136..a7d577a 100644 --- a/tcp_splice.c +++ b/tcp_splice.c @@ -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 - * @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; unsigned side; + if (!(flow->tcp_splice.flags & CLOSING)) + return; + for (side = 0; side < SIDES; side++) { if (conn->events & SPLICE_ESTABLISHED) { /* Flushing might need to block: don't recycle them. */ |