From 912d37cd5b8c507d17f38758d50ff3ba0401a99c Mon Sep 17 00:00:00 2001 From: David Gibson Date: Tue, 14 Feb 2023 10:48:21 +1100 Subject: tcp: Move socket pool declarations around tcp_splice.c has some explicit extern declarations to access the socket pools. This is pretty dangerous - if we changed the type of these variables in tcp.c, we'd have tcp.c and tcp_splice.c using the same memory in different ways with no compiler error. So, move the extern declarations to tcp_conn.h so they're visible to both tcp.c and tcp_splice.c, but not the rest of pasta. In fact the pools for the guest namespace are necessarily only used by tcp_splice.c - we have no sockets on the guest side if we're not splicing. So move those declarations and the functions that deal exclusively with them to tcp_splice.c Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- tcp_splice.c | 50 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 7 deletions(-) (limited to 'tcp_splice.c') diff --git a/tcp_splice.c b/tcp_splice.c index 1d624f1..09f0e3e 100644 --- a/tcp_splice.c +++ b/tcp_splice.c @@ -60,11 +60,11 @@ #define TCP_SPLICE_CONN_PRESSURE 30 /* % of conn_count */ #define TCP_SPLICE_FILE_PRESSURE 30 /* % of c->nofile */ -/* From tcp.c */ -extern int init_sock_pool4 [TCP_SOCK_POOL_SIZE]; -extern int init_sock_pool6 [TCP_SOCK_POOL_SIZE]; -extern int ns_sock_pool4 [TCP_SOCK_POOL_SIZE]; -extern int ns_sock_pool6 [TCP_SOCK_POOL_SIZE]; +/* Pools for pre-opened sockets (in namespace) */ +#define TCP_SOCK_POOL_TSH 16 /* Refill in ns if > x used */ + +static int ns_sock_pool4 [TCP_SOCK_POOL_SIZE]; +static int ns_sock_pool6 [TCP_SOCK_POOL_SIZE]; /* Pool of pre-opened pipes */ static int splice_pipe_pool [TCP_SPLICE_PIPE_POOL_SIZE][2][2]; @@ -782,7 +782,7 @@ smaller: * tcp_splice_pipe_refill() - Refill pool of pre-opened pipes * @c: Execution context */ -void tcp_splice_pipe_refill(const struct ctx *c) +static void tcp_splice_pipe_refill(const struct ctx *c) { int i; @@ -811,6 +811,39 @@ void tcp_splice_pipe_refill(const struct ctx *c) } } +/** + * tcp_sock_refill_ns() - Refill pools of pre-opened sockets in namespace + * @arg: Execution context cast to void * + * + * Return: 0 + */ +static int tcp_sock_refill_ns(void *arg) +{ + const struct ctx *c = (const struct ctx *)arg; + + ns_enter(c); + + if (c->ifi4) + tcp_sock_refill_pool(c, ns_sock_pool4, AF_INET); + if (c->ifi6) + tcp_sock_refill_pool(c, ns_sock_pool6, AF_INET6); + + return 0; +} + +/** + * tcp_splice_refill() - Refill pools of resources needed for splicing + * @c: Execution context + */ +void tcp_splice_refill(const struct ctx *c) +{ + if ((c->ifi4 && ns_sock_pool4[TCP_SOCK_POOL_TSH] < 0) || + (c->ifi6 && ns_sock_pool6[TCP_SOCK_POOL_TSH] < 0)) + NS_CALL(tcp_sock_refill_ns, c); + + tcp_splice_pipe_refill(c); +} + /** * tcp_splice_init() - Initialise pipe pool and size * @c: Execution context @@ -819,7 +852,10 @@ void tcp_splice_init(struct ctx *c) { memset(splice_pipe_pool, 0xff, sizeof(splice_pipe_pool)); tcp_set_pipe_size(c); - tcp_splice_pipe_refill(c); + + memset(&ns_sock_pool4, 0xff, sizeof(ns_sock_pool4)); + memset(&ns_sock_pool6, 0xff, sizeof(ns_sock_pool6)); + NS_CALL(tcp_sock_refill_ns, c); } /** -- cgit v1.2.3