From nobody Sat Nov 23 09:01:34 2024 Received: from out30-113.freemail.mail.aliyun.com (out30-113.freemail.mail.aliyun.com [115.124.30.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 144C51F76B8; Thu, 14 Nov 2024 10:52:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.113 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731581535; cv=none; b=ZQJSfh5t235WbleldiiHE5HJ7oXu+1annfE0StlLDJ3xDI3rZHkIeYZcWV1OdtV4fgU48vavhU4aQS5IL7/GEGI9TUDQr2J9/5OYqCNCmiaXaog/IQeyg/iO34a4YScVSHHmyS5vjH+bi0RbKuwAgNQ+6QjO/8hDStkDfZyYZn4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731581535; c=relaxed/simple; bh=33iSfMKIdyyEBqdPoJp5aO2D35RMl6jK4xzMJQma0As=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iVNZQi9LfpPAZaGciaf7xQK5HIpGoCwFS8HWlrHhpdhxWzIqOp3c4ZBaSlcsWeDnS+H+dH/M+lRulGJmxOs/IHBPsF74fhuWVI0hgITEQ/BL4clVMqsclzRu3MPzSG0U+Ro7rwVprF1Vc00E/YLbsjdNBWjiJ07m4b9Dw1bYhmY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=XHpqrtaW; arc=none smtp.client-ip=115.124.30.113 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="XHpqrtaW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1731581529; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=WTI5UDQyt8ScJ2+IPhPY2rCmo4xTEj4n+2P/0MEirRg=; b=XHpqrtaW+cUwvOfl0GIn0orB02LnTQOYhGszwUvmBu0nLXvRHu2B5av4xsdKy3sd5GvH/ImloKZPM/2Fr6dQ7iSnhQW3uNtVg/6uTvdtkg15L/EbCxzmDY93ttrhIlxl6eha7O4WInau6H0uOoeW1vjolvwq/J7oU/tpUGE1kLw= Received: from localhost(mailfrom:lulie@linux.alibaba.com fp:SMTPD_---0WJOM9.G_1731581528 cluster:ay36) by smtp.aliyun-inc.com; Thu, 14 Nov 2024 18:52:09 +0800 From: Philo Lu To: netdev@vger.kernel.org Cc: willemdebruijn.kernel@gmail.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, dsahern@kernel.org, horms@kernel.org, antony.antony@secunet.com, steffen.klassert@secunet.com, linux-kernel@vger.kernel.org, dust.li@linux.alibaba.com, jakub@cloudflare.com, fred.cc@alibaba-inc.com, yubing.qiuyubing@alibaba-inc.com Subject: [PATCH v9 net-next 1/4] net/udp: Add a new struct for hash2 slot Date: Thu, 14 Nov 2024 18:52:04 +0800 Message-Id: <20241114105207.30185-2-lulie@linux.alibaba.com> X-Mailer: git-send-email 2.32.0.3.g01195cf9f In-Reply-To: <20241114105207.30185-1-lulie@linux.alibaba.com> References: <20241114105207.30185-1-lulie@linux.alibaba.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Preparing for udp 4-tuple hash (uhash4 for short). To implement uhash4 without cache line missing when lookup, hslot2 is used to record the number of hashed sockets in hslot4. Thus adding a new struct udp_hslot_main with field hash4_cnt, which is used by hash2. The new struct is used to avoid doubling the size of udp_hslot. Before uhash4 lookup, firstly checking hash4_cnt to see if there are hashed sks in hslot4. Because hslot2 is always used in lookup, there is no cache line miss. Related helpers are updated, and use the helpers as possible. uhash4 is implemented in following patches. Signed-off-by: Philo Lu Acked-by: Willem de Bruijn Acked-by: Paolo Abeni --- include/net/udp.h | 38 ++++++++++++++++++++++++++++++++++---- net/ipv4/udp.c | 44 +++++++++++++++++++++++--------------------- net/ipv6/udp.c | 15 ++++++--------- 3 files changed, 63 insertions(+), 34 deletions(-) diff --git a/include/net/udp.h b/include/net/udp.h index 61222545ab1c..62a7207e65f2 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -50,7 +50,7 @@ struct udp_skb_cb { #define UDP_SKB_CB(__skb) ((struct udp_skb_cb *)((__skb)->cb)) =20 /** - * struct udp_hslot - UDP hash slot + * struct udp_hslot - UDP hash slot used by udp_table.hash * * @head: head of list of sockets * @count: number of sockets in 'head' list @@ -60,7 +60,22 @@ struct udp_hslot { struct hlist_head head; int count; spinlock_t lock; -} __attribute__((aligned(2 * sizeof(long)))); +} __aligned(2 * sizeof(long)); + +/** + * struct udp_hslot_main - UDP hash slot used by udp_table.hash2 + * + * @hslot: basic hash slot + * @hash4_cnt: number of sockets in hslot4 of the same + * (local port, local address) + */ +struct udp_hslot_main { + struct udp_hslot hslot; /* must be the first member */ +#if !IS_ENABLED(CONFIG_BASE_SMALL) + u32 hash4_cnt; +#endif +} __aligned(2 * sizeof(long)); +#define UDP_HSLOT_MAIN(__hslot) ((struct udp_hslot_main *)(__hslot)) =20 /** * struct udp_table - UDP table @@ -72,7 +87,7 @@ struct udp_hslot { */ struct udp_table { struct udp_hslot *hash; - struct udp_hslot *hash2; + struct udp_hslot_main *hash2; unsigned int mask; unsigned int log; }; @@ -84,6 +99,7 @@ static inline struct udp_hslot *udp_hashslot(struct udp_t= able *table, { return &table->hash[udp_hashfn(net, num, table->mask)]; } + /* * For secondary hash, net_hash_mix() is performed before calling * udp_hashslot2(), this explains difference with udp_hashslot() @@ -91,8 +107,22 @@ static inline struct udp_hslot *udp_hashslot(struct udp= _table *table, static inline struct udp_hslot *udp_hashslot2(struct udp_table *table, unsigned int hash) { - return &table->hash2[hash & table->mask]; + return &table->hash2[hash & table->mask].hslot; +} + +#if IS_ENABLED(CONFIG_BASE_SMALL) +static inline void udp_table_hash4_init(struct udp_table *table) +{ +} +#else /* !CONFIG_BASE_SMALL */ + +/* Must be called with table->hash2 initialized */ +static inline void udp_table_hash4_init(struct udp_table *table) +{ + for (int i =3D 0; i <=3D table->mask; i++) + table->hash2[i].hash4_cnt =3D 0; } +#endif /* CONFIG_BASE_SMALL */ =20 extern struct proto udp_prot; =20 diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 0e24916b39d4..2fdac5fae2a8 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -486,13 +486,12 @@ struct sock *__udp4_lib_lookup(const struct net *net,= __be32 saddr, int sdif, struct udp_table *udptable, struct sk_buff *skb) { unsigned short hnum =3D ntohs(dport); - unsigned int hash2, slot2; struct udp_hslot *hslot2; struct sock *result, *sk; + unsigned int hash2; =20 hash2 =3D ipv4_portaddr_hash(net, daddr, hnum); - slot2 =3D hash2 & udptable->mask; - hslot2 =3D &udptable->hash2[slot2]; + hslot2 =3D udp_hashslot2(udptable, hash2); =20 /* Lookup connected or non-wildcard socket */ result =3D udp4_lib_lookup2(net, saddr, sport, @@ -519,8 +518,7 @@ struct sock *__udp4_lib_lookup(const struct net *net, _= _be32 saddr, =20 /* Lookup wildcard sockets */ hash2 =3D ipv4_portaddr_hash(net, htonl(INADDR_ANY), hnum); - slot2 =3D hash2 & udptable->mask; - hslot2 =3D &udptable->hash2[slot2]; + hslot2 =3D udp_hashslot2(udptable, hash2); =20 result =3D udp4_lib_lookup2(net, saddr, sport, htonl(INADDR_ANY), hnum, dif, sdif, @@ -2268,7 +2266,7 @@ static int __udp4_lib_mcast_deliver(struct net *net, = struct sk_buff *skb, udptable->mask; hash2 =3D ipv4_portaddr_hash(net, daddr, hnum) & udptable->mask; start_lookup: - hslot =3D &udptable->hash2[hash2]; + hslot =3D &udptable->hash2[hash2].hslot; offset =3D offsetof(typeof(*sk), __sk_common.skc_portaddr_node); } =20 @@ -2539,14 +2537,13 @@ static struct sock *__udp4_lib_demux_lookup(struct = net *net, struct udp_table *udptable =3D net->ipv4.udp_table; INET_ADDR_COOKIE(acookie, rmt_addr, loc_addr); unsigned short hnum =3D ntohs(loc_port); - unsigned int hash2, slot2; struct udp_hslot *hslot2; + unsigned int hash2; __portpair ports; struct sock *sk; =20 hash2 =3D ipv4_portaddr_hash(net, loc_addr, hnum); - slot2 =3D hash2 & udptable->mask; - hslot2 =3D &udptable->hash2[slot2]; + hslot2 =3D udp_hashslot2(udptable, hash2); ports =3D INET_COMBINED_PORTS(rmt_port, hnum); =20 udp_portaddr_for_each_entry_rcu(sk, &hslot2->head) { @@ -3187,7 +3184,7 @@ static struct sock *bpf_iter_udp_batch(struct seq_fil= e *seq) batch_sks =3D 0; =20 for (; state->bucket <=3D udptable->mask; state->bucket++) { - struct udp_hslot *hslot2 =3D &udptable->hash2[state->bucket]; + struct udp_hslot *hslot2 =3D &udptable->hash2[state->bucket].hslot; =20 if (hlist_empty(&hslot2->head)) continue; @@ -3428,10 +3425,11 @@ __setup("uhash_entries=3D", set_uhash_entries); =20 void __init udp_table_init(struct udp_table *table, const char *name) { - unsigned int i; + unsigned int i, slot_size; =20 + slot_size =3D sizeof(struct udp_hslot) + sizeof(struct udp_hslot_main); table->hash =3D alloc_large_system_hash(name, - 2 * sizeof(struct udp_hslot), + slot_size, uhash_entries, 21, /* one slot per 2 MB */ 0, @@ -3440,17 +3438,18 @@ void __init udp_table_init(struct udp_table *table,= const char *name) UDP_HTABLE_SIZE_MIN, UDP_HTABLE_SIZE_MAX); =20 - table->hash2 =3D table->hash + (table->mask + 1); + table->hash2 =3D (void *)(table->hash + (table->mask + 1)); for (i =3D 0; i <=3D table->mask; i++) { INIT_HLIST_HEAD(&table->hash[i].head); table->hash[i].count =3D 0; spin_lock_init(&table->hash[i].lock); } for (i =3D 0; i <=3D table->mask; i++) { - INIT_HLIST_HEAD(&table->hash2[i].head); - table->hash2[i].count =3D 0; - spin_lock_init(&table->hash2[i].lock); + INIT_HLIST_HEAD(&table->hash2[i].hslot.head); + table->hash2[i].hslot.count =3D 0; + spin_lock_init(&table->hash2[i].hslot.lock); } + udp_table_hash4_init(table); } =20 u32 udp_flow_hashrnd(void) @@ -3476,18 +3475,20 @@ static void __net_init udp_sysctl_init(struct net *= net) static struct udp_table __net_init *udp_pernet_table_alloc(unsigned int ha= sh_entries) { struct udp_table *udptable; + unsigned int slot_size; int i; =20 udptable =3D kmalloc(sizeof(*udptable), GFP_KERNEL); if (!udptable) goto out; =20 - udptable->hash =3D vmalloc_huge(hash_entries * 2 * sizeof(struct udp_hslo= t), + slot_size =3D sizeof(struct udp_hslot) + sizeof(struct udp_hslot_main); + udptable->hash =3D vmalloc_huge(hash_entries * slot_size, GFP_KERNEL_ACCOUNT); if (!udptable->hash) goto free_table; =20 - udptable->hash2 =3D udptable->hash + hash_entries; + udptable->hash2 =3D (void *)(udptable->hash + hash_entries); udptable->mask =3D hash_entries - 1; udptable->log =3D ilog2(hash_entries); =20 @@ -3496,10 +3497,11 @@ static struct udp_table __net_init *udp_pernet_tabl= e_alloc(unsigned int hash_ent udptable->hash[i].count =3D 0; spin_lock_init(&udptable->hash[i].lock); =20 - INIT_HLIST_HEAD(&udptable->hash2[i].head); - udptable->hash2[i].count =3D 0; - spin_lock_init(&udptable->hash2[i].lock); + INIT_HLIST_HEAD(&udptable->hash2[i].hslot.head); + udptable->hash2[i].hslot.count =3D 0; + spin_lock_init(&udptable->hash2[i].hslot.lock); } + udp_table_hash4_init(udptable); =20 return udptable; =20 diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 0cef8ae5d1ea..0d7aac9d44e5 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -224,13 +224,12 @@ struct sock *__udp6_lib_lookup(const struct net *net, struct sk_buff *skb) { unsigned short hnum =3D ntohs(dport); - unsigned int hash2, slot2; struct udp_hslot *hslot2; struct sock *result, *sk; + unsigned int hash2; =20 hash2 =3D ipv6_portaddr_hash(net, daddr, hnum); - slot2 =3D hash2 & udptable->mask; - hslot2 =3D &udptable->hash2[slot2]; + hslot2 =3D udp_hashslot2(udptable, hash2); =20 /* Lookup connected or non-wildcard sockets */ result =3D udp6_lib_lookup2(net, saddr, sport, @@ -257,8 +256,7 @@ struct sock *__udp6_lib_lookup(const struct net *net, =20 /* Lookup wildcard sockets */ hash2 =3D ipv6_portaddr_hash(net, &in6addr_any, hnum); - slot2 =3D hash2 & udptable->mask; - hslot2 =3D &udptable->hash2[slot2]; + hslot2 =3D udp_hashslot2(udptable, hash2); =20 result =3D udp6_lib_lookup2(net, saddr, sport, &in6addr_any, hnum, dif, sdif, @@ -859,7 +857,7 @@ static int __udp6_lib_mcast_deliver(struct net *net, st= ruct sk_buff *skb, udptable->mask; hash2 =3D ipv6_portaddr_hash(net, daddr, hnum) & udptable->mask; start_lookup: - hslot =3D &udptable->hash2[hash2]; + hslot =3D &udptable->hash2[hash2].hslot; offset =3D offsetof(typeof(*sk), __sk_common.skc_portaddr_node); } =20 @@ -1065,14 +1063,13 @@ static struct sock *__udp6_lib_demux_lookup(struct = net *net, { struct udp_table *udptable =3D net->ipv4.udp_table; unsigned short hnum =3D ntohs(loc_port); - unsigned int hash2, slot2; struct udp_hslot *hslot2; + unsigned int hash2; __portpair ports; struct sock *sk; =20 hash2 =3D ipv6_portaddr_hash(net, loc_addr, hnum); - slot2 =3D hash2 & udptable->mask; - hslot2 =3D &udptable->hash2[slot2]; + hslot2 =3D udp_hashslot2(udptable, hash2); ports =3D INET_COMBINED_PORTS(rmt_port, hnum); =20 udp_portaddr_for_each_entry_rcu(sk, &hslot2->head) { --=20 2.32.0.3.g01195cf9f