diff options
author | Eric Dumazet <dada1@cosmosbay.com> | 2006-11-16 05:30:37 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:21:44 -0500 |
commit | 72a3effaf633bcae9034b7e176bdbd78d64a71db (patch) | |
tree | b7a331527f1b15335a358f97809134f35587e57a /net/ipv4/tcp_ipv4.c | |
parent | 3c62f75aac7348ee262b1295cfcfeb3473f76815 (diff) |
[NET]: Size listen hash tables using backlog hint
We currently allocate a fixed size (TCP_SYNQ_HSIZE=512) slots hash table for
each LISTEN socket, regardless of various parameters (listen backlog for
example)
On x86_64, this means order-1 allocations (might fail), even for 'small'
sockets, expecting few connections. On the contrary, a huge server wanting a
backlog of 50000 is slowed down a bit because of this fixed limit.
This patch makes the sizing of listen hash table a dynamic parameter,
depending of :
- net.core.somaxconn tunable (default is 128)
- net.ipv4.tcp_max_syn_backlog tunable (default : 256, 1024 or 128)
- backlog value given by user application (2nd parameter of listen())
For large allocations (bigger than PAGE_SIZE), we use vmalloc() instead of
kmalloc().
We still limit memory allocation with the two existing tunables (somaxconn &
tcp_max_syn_backlog). So for standard setups, this patch actually reduce RAM
usage.
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 22ef8bd26620..5fbf96552cac 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -715,7 +715,7 @@ static struct ip_options *tcp_v4_save_options(struct sock *sk, | |||
715 | return dopt; | 715 | return dopt; |
716 | } | 716 | } |
717 | 717 | ||
718 | struct request_sock_ops tcp_request_sock_ops = { | 718 | struct request_sock_ops tcp_request_sock_ops __read_mostly = { |
719 | .family = PF_INET, | 719 | .family = PF_INET, |
720 | .obj_size = sizeof(struct tcp_request_sock), | 720 | .obj_size = sizeof(struct tcp_request_sock), |
721 | .rtx_syn_ack = tcp_v4_send_synack, | 721 | .rtx_syn_ack = tcp_v4_send_synack, |
@@ -1385,7 +1385,7 @@ static void *listening_get_next(struct seq_file *seq, void *cur) | |||
1385 | if (st->state == TCP_SEQ_STATE_OPENREQ) { | 1385 | if (st->state == TCP_SEQ_STATE_OPENREQ) { |
1386 | struct request_sock *req = cur; | 1386 | struct request_sock *req = cur; |
1387 | 1387 | ||
1388 | icsk = inet_csk(st->syn_wait_sk); | 1388 | icsk = inet_csk(st->syn_wait_sk); |
1389 | req = req->dl_next; | 1389 | req = req->dl_next; |
1390 | while (1) { | 1390 | while (1) { |
1391 | while (req) { | 1391 | while (req) { |
@@ -1395,7 +1395,7 @@ static void *listening_get_next(struct seq_file *seq, void *cur) | |||
1395 | } | 1395 | } |
1396 | req = req->dl_next; | 1396 | req = req->dl_next; |
1397 | } | 1397 | } |
1398 | if (++st->sbucket >= TCP_SYNQ_HSIZE) | 1398 | if (++st->sbucket >= icsk->icsk_accept_queue.listen_opt->nr_table_entries) |
1399 | break; | 1399 | break; |
1400 | get_req: | 1400 | get_req: |
1401 | req = icsk->icsk_accept_queue.listen_opt->syn_table[st->sbucket]; | 1401 | req = icsk->icsk_accept_queue.listen_opt->syn_table[st->sbucket]; |