提交 8d32bc6f 编写于 作者: W Willy Tarreau 提交者: Zheng Zengkai

tcp: dynamically allocate the perturb table used by source ports

stable inclusion
from stable-v5.10.125
commit 24b922a5da0055f1bb8b391b83e494d2e5d56508
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5L6EY

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=24b922a5da0055f1bb8b391b83e494d2e5d56508

--------------------------------

commit e9261476 upstream.

We'll need to further increase the size of this table and it's likely
that at some point its size will not be suitable anymore for a static
table. Let's allocate it on boot from inet_hashinfo2_init(), which is
called from tcp_init().

Cc: Moshe Kol <moshe.kol@mail.huji.ac.il>
Cc: Yossi Gilad <yossi.gilad@mail.huji.ac.il>
Cc: Amit Klein <aksecurity@gmail.com>
Reviewed-by: NEric Dumazet <edumazet@google.com>
Signed-off-by: NWilly Tarreau <w@1wt.eu>
Signed-off-by: NJakub Kicinski <kuba@kernel.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>

 Conflicts:
	net/ipv4/inet_hashtables.c
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 92c5c105
...@@ -732,7 +732,8 @@ EXPORT_SYMBOL_GPL(inet_unhash); ...@@ -732,7 +732,8 @@ EXPORT_SYMBOL_GPL(inet_unhash);
* memory. * memory.
*/ */
#define INET_TABLE_PERTURB_SHIFT 16 #define INET_TABLE_PERTURB_SHIFT 16
static u32 table_perturb[1 << INET_TABLE_PERTURB_SHIFT]; #define INET_TABLE_PERTURB_SIZE (1 << INET_TABLE_PERTURB_SHIFT)
static u32 *table_perturb;
int __inet_hash_connect(struct inet_timewait_death_row *death_row, int __inet_hash_connect(struct inet_timewait_death_row *death_row,
struct sock *sk, u64 port_offset, struct sock *sk, u64 port_offset,
...@@ -775,7 +776,8 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row, ...@@ -775,7 +776,8 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row,
if (likely(remaining > 1)) if (likely(remaining > 1))
remaining &= ~1U; remaining &= ~1U;
net_get_random_once(table_perturb, sizeof(table_perturb)); net_get_random_once(table_perturb,
INET_TABLE_PERTURB_SIZE * sizeof(*table_perturb));
index = hash_32(port_offset, INET_TABLE_PERTURB_SHIFT); index = hash_32(port_offset, INET_TABLE_PERTURB_SHIFT);
offset = READ_ONCE(table_perturb[index]) + (port_offset >> 32); offset = READ_ONCE(table_perturb[index]) + (port_offset >> 32);
...@@ -912,6 +914,12 @@ void __init inet_hashinfo2_init(struct inet_hashinfo *h, const char *name, ...@@ -912,6 +914,12 @@ void __init inet_hashinfo2_init(struct inet_hashinfo *h, const char *name,
low_limit, low_limit,
high_limit); high_limit);
init_hashinfo_lhash2(h); init_hashinfo_lhash2(h);
/* this one is used for source ports of outgoing connections */
table_perturb = kmalloc_array(INET_TABLE_PERTURB_SIZE,
sizeof(*table_perturb), GFP_KERNEL);
if (!table_perturb)
panic("TCP: failed to alloc table_perturb");
} }
int inet_hashinfo2_init_mod(struct inet_hashinfo *h) int inet_hashinfo2_init_mod(struct inet_hashinfo *h)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册