diff options
| author |   Alex Copot <alex.mihai.c@gmail.com> | 2012-04-12 22:21:45 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-04-14 15:28:55 -0400 |
| commit | aacd9289af8b82f5fb01bcdd53d0e3406d1333c7 (patch) | |
| tree | d918d09ce942b52f707676e0a648e5c6a84de1b4 /include/net/inet6_connection_sock.h | |
| parent | inet: makes syn_ack_timeout mandatory (diff) | |
| download | linux-dev-aacd9289af8b82f5fb01bcdd53d0e3406d1333c7.tar.xz linux-dev-aacd9289af8b82f5fb01bcdd53d0e3406d1333c7.zip | |
tcp: bind() use stronger condition for bind_conflict
We must try harder to get unique (addr, port) pairs when
doing port autoselection for sockets with SO_REUSEADDR
option set.
We achieve this by adding a relaxation parameter to
inet_csk_bind_conflict. When 'relax' parameter is off
we return a conflict whenever the current searched
pair (addr, port) is not unique.
This tries to address the problems reported in patch:
8d238b25b1ec22a73b1c2206f111df2faaff8285
Revert "tcp: bind() fix when many ports are bound"
Tests where ran for creating and binding(0) many sockets
on 100 IPs. The results are, on average:
* 60000 sockets, 600 ports / IP:
* 0.210 s, 620 (IP, port) duplicates without patch
* 0.219 s, no duplicates with patch
* 100000 sockets, 1000 ports / IP:
* 0.371 s, 1720 duplicates without patch
* 0.373 s, no duplicates with patch
* 200000 sockets, 2000 ports / IP:
* 0.766 s, 6900 duplicates without patch
* 0.768 s, no duplicates with patch
* 500000 sockets, 5000 ports / IP:
* 2.227 s, 41500 duplicates without patch
* 2.284 s, no duplicates with patch
Signed-off-by: Alex Copot <alex.mihai.c@gmail.com>
Signed-off-by: Daniel Baluta <dbaluta@ixiacom.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/inet6_connection_sock.h')
| -rw-r--r-- | include/net/inet6_connection_sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/inet6_connection_sock.h b/include/net/inet6_connection_sock.h index 3207e58ee019..1866a676c810 100644 --- a/include/net/inet6_connection_sock.h +++ b/include/net/inet6_connection_sock.h @@ -23,7 +23,7 @@ struct sock; struct sockaddr; extern int inet6_csk_bind_conflict(const struct sock *sk, - const struct inet_bind_bucket *tb); + const struct inet_bind_bucket *tb, bool relax); extern struct dst_entry* inet6_csk_route_req(struct sock *sk, const struct request_sock *req); |