colin/passt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcp: Split pool lookup from creating new sockets in tcp_conn_new_sock()

Browse Source 
tcp_conn_new_sock() first looks for a socket in a pre-opened pool, then if
that's empty creates a new socket in the init namespace.  Both parts of
this are duplicated in other places: the pool lookup logic is duplicated in
tcp_splice_new(), and the socket opening logic is duplicated in
tcp_sock_refill_pool().

Split the function into separate parts so we can remove both these
duplications.

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
2023-02-14 10:48:22 +11:00
committed by Stefano Brivio
parent 912d37cd5b
commit dc467d526f
3 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tcp_splice.c
View File

@@ -451,18 +451,14 @@ static int tcp_splice_connect_ns(void *arg)
static int tcp_splice_new(const struct ctx *c, struct tcp_splice_conn *conn,
in_port_t port, int outbound)
{
int *p, i, s = -1;
int *p, s = -1;
if (outbound)
p = CONN_V6(conn) ? init_sock_pool6 : init_sock_pool4;
else
p = CONN_V6(conn) ? ns_sock_pool6 : ns_sock_pool4;
for (i = 0; i < TCP_SOCK_POOL_SIZE; i++, p++) {
SWAP(s, *p);
if (s >= 0)
break;
}
s = tcp_conn_pool_sock(p);
/* No socket available in namespace: create a new one for connect() */
if (s < 0 && !outbound) {