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

tcp: Don't store hash bucket in connection structures

Browse source 
Currently when we insert a connection into the hash table, we store its
bucket number so we can find it when removing entries.  However, we can
recompute the hash value from other contents of the structure so we don't
need to store it.  This brings the size of tcp_tap_conn down to 64 bytes
again, which means it will fit in a single cacheline on common machines.

This change also removes a non-obvious constraint that the hash table have
less than twice TCP_MAX_CONNS buckets, because of the way
TCP_HASH_BUCKET_BITS was constructed.

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 2022-11-17 16:58:54 +11:00 committed by Stefano Brivio
parent 233b95e90f
commit b65d603e23
2 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
tcp.c
View file

@ -1243,6 +1243,24 @@ static unsigned int tcp_hash(const struct ctx *c, int af, const void *addr,
return (unsigned int)(b % TCP_HASH_TABLE_SIZE); return (unsigned int)(b % TCP_HASH_TABLE_SIZE);
} }
/**
* tcp_conn_hash() - Calculate hash bucket of an existing connection
* @c: Execution context
* @conn: Connection
*
* Return: hash value, already modulo size of the hash table
*/
static unsigned int tcp_conn_hash(const struct ctx *c,
const struct tcp_tap_conn *conn)
{
if (CONN_V6(conn))
return tcp_hash(c, AF_INET6, &conn->a.a6,
conn->tap_port, conn->sock_port);
else
return tcp_hash(c, AF_INET, &conn->a.a4.a,
conn->tap_port, conn->sock_port);
}
/** /**
* tcp_hash_insert() - Insert connection into hash table, chain link * tcp_hash_insert() - Insert connection into hash table, chain link
* @c: Execution context * @c: Execution context
@ -1258,7 +1276,6 @@ static void tcp_hash_insert(const struct ctx *c, struct tcp_tap_conn *conn,
b = tcp_hash(c, af, addr, conn->tap_port, conn->sock_port); b = tcp_hash(c, af, addr, conn->tap_port, conn->sock_port);
conn->next_index = tc_hash[b] ? CONN_IDX(tc_hash[b]) : -1; conn->next_index = tc_hash[b] ? CONN_IDX(tc_hash[b]) : -1;
tc_hash[b] = conn; tc_hash[b] = conn;
conn->hash_bucket = b;
debug("TCP: hash table insert: index %li, sock %i, bucket: %i, next: " debug("TCP: hash table insert: index %li, sock %i, bucket: %i, next: "
"%p", CONN_IDX(conn), conn->sock, b, conn_at_idx(conn->next_index)); "%p", CONN_IDX(conn), conn->sock, b, conn_at_idx(conn->next_index));
@ -1266,12 +1283,14 @@ static void tcp_hash_insert(const struct ctx *c, struct tcp_tap_conn *conn,
/** /**
* tcp_hash_remove() - Drop connection from hash table, chain unlink * tcp_hash_remove() - Drop connection from hash table, chain unlink
* @c: Execution context
* @conn: Connection pointer * @conn: Connection pointer
*/ */
static void tcp_hash_remove(const struct tcp_tap_conn *conn) static void tcp_hash_remove(const struct ctx *c,
const struct tcp_tap_conn *conn)
{ {
struct tcp_tap_conn *entry, *prev = NULL; struct tcp_tap_conn *entry, *prev = NULL;
int b = conn->hash_bucket; int b = tcp_conn_hash(c, conn);
for (entry = tc_hash[b]; entry; for (entry = tc_hash[b]; entry;
prev = entry, entry = conn_at_idx(entry->next_index)) { prev = entry, entry = conn_at_idx(entry->next_index)) {
@ -1299,7 +1318,7 @@ static void tcp_tap_conn_update(struct ctx *c, struct tcp_tap_conn *old,
struct tcp_tap_conn *new) struct tcp_tap_conn *new)
{ {
struct tcp_tap_conn *entry, *prev = NULL; struct tcp_tap_conn *entry, *prev = NULL;
int b = old->hash_bucket; int b = tcp_conn_hash(c, old);
for (entry = tc_hash[b]; entry; for (entry = tc_hash[b]; entry;
prev = entry, entry = conn_at_idx(entry->next_index)) { prev = entry, entry = conn_at_idx(entry->next_index)) {
@ -1387,7 +1406,7 @@ static void tcp_conn_destroy(struct ctx *c, struct tcp_tap_conn *conn)
if (conn->timer != -1) if (conn->timer != -1)
close(conn->timer); close(conn->timer);
tcp_hash_remove(conn); tcp_hash_remove(c, conn);
tcp_table_compact(c, (union tcp_conn *)conn); tcp_table_compact(c, (union tcp_conn *)conn);
} }

5
tcp_conn.h
View file

@ -9,8 +9,6 @@
#ifndef TCP_CONN_H #ifndef TCP_CONN_H
#define TCP_CONN_H #define TCP_CONN_H
#define TCP_HASH_BUCKET_BITS (TCP_CONN_INDEX_BITS + 1)
/** /**
* struct tcp_conn_common - Common fields for spliced and non-spliced * struct tcp_conn_common - Common fields for spliced and non-spliced
* @spliced: Is this a spliced connection? * @spliced: Is this a spliced connection?
@ -32,7 +30,6 @@ extern const char *tcp_common_flag_str[];
* @events: Connection events, implying connection states * @events: Connection events, implying connection states
* @timer: timerfd descriptor for timeout events * @timer: timerfd descriptor for timeout events
* @flags: Connection flags representing internal attributes * @flags: Connection flags representing internal attributes
* @hash_bucket: Bucket index in connection lookup hash table
* @retrans: Number of retransmissions occurred due to ACK_TIMEOUT * @retrans: Number of retransmissions occurred due to ACK_TIMEOUT
* @ws_from_tap: Window scaling factor advertised from tap/guest * @ws_from_tap: Window scaling factor advertised from tap/guest
* @ws_to_tap: Window scaling factor advertised to tap/guest * @ws_to_tap: Window scaling factor advertised to tap/guest
@ -97,8 +94,6 @@ struct tcp_tap_conn {
#define ACK_FROM_TAP_DUE BIT(5) #define ACK_FROM_TAP_DUE BIT(5)
unsigned int hash_bucket :TCP_HASH_BUCKET_BITS;
#define TCP_MSS_BITS 14 #define TCP_MSS_BITS 14
unsigned int tap_mss :TCP_MSS_BITS; unsigned int tap_mss :TCP_MSS_BITS;
#define MSS_SET(conn, mss) (conn->tap_mss = (mss >> (16 - TCP_MSS_BITS))) #define MSS_SET(conn, mss) (conn->tap_mss = (mss >> (16 - TCP_MSS_BITS)))