From 181ce83d9bc52487f99401afe39a73499bd128fe Mon Sep 17 00:00:00 2001 From: David Gibson Date: Thu, 17 Nov 2022 16:58:45 +1100 Subject: tcp: Improved helpers to update connections after moving When we compact the connection tables (both spliced and non-spliced) we need to move entries from one slot to another. That requires some updates in the entries themselves. Add helpers to make all the necessary updates for the spliced and non-spliced cases. This will simplify later cleanups. Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- tcp.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'tcp.c') diff --git a/tcp.c b/tcp.c index 05eed85..90eb840 100644 --- a/tcp.c +++ b/tcp.c @@ -1291,11 +1291,13 @@ static void tcp_hash_remove(const struct tcp_tap_conn *conn) } /** - * tcp_hash_update() - Update pointer for given connection - * @old: Old connection pointer - * @new: New connection pointer + * tcp_tap_conn_update() - Update tcp_tap_conn when being moved in the table + * @c: Execution context + * @old: Old location of tcp_tap_conn + * @new: New location of tcp_tap_conn */ -static void tcp_hash_update(struct tcp_tap_conn *old, struct tcp_tap_conn *new) +static void tcp_tap_conn_update(struct ctx *c, struct tcp_tap_conn *old, + struct tcp_tap_conn *new) { struct tcp_tap_conn *entry, *prev = NULL; int b = old->hash_bucket; @@ -1314,6 +1316,8 @@ static void tcp_hash_update(struct tcp_tap_conn *old, struct tcp_tap_conn *new) debug("TCP: hash table update: old index %li, new index %li, sock %i, " "bucket: %i, old: %p, new: %p", CONN_IDX(old), CONN_IDX(new), new->sock, b, old, new); + + tcp_epoll_ctl(c, new); } /** @@ -1362,9 +1366,7 @@ static void tcp_table_compact(struct ctx *c, struct tcp_tap_conn *hole) memcpy(hole, from, sizeof(*hole)); to = hole; - tcp_hash_update(from, to); - - tcp_epoll_ctl(c, to); + tcp_tap_conn_update(c, from, to); debug("TCP: hash table compaction: old index %li, new index %li, " "sock %i, from: %p, to: %p", -- cgit v1.2.3