diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-05-27 19:46:02 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-27 20:30:10 +0200 |
| commit | e2baad9e4b153c67dddc5ccf987395b842329c84 (patch) | |
| tree | f33a2c65ac5d1b832967e737e17bf19c4e79b34a /net/ipv4/inet_hashtables.c | |
| parent | Merge branch 'cxgb4-next' (diff) | |
| download | linux-e2baad9e4b153c67dddc5ccf987395b842329c84.tar.xz linux-e2baad9e4b153c67dddc5ccf987395b842329c84.zip | |
tcp: connect() from bound sockets can be faster
__inet_hash_connect() does not use its third argument (port_offset)
if socket was already bound to a source port.
No need to perform useless but expensive md5 computations.
Reported-by: Crestez Dan Leonard <cdleonard@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_hashtables.c')
| -rw-r--r-- | net/ipv4/inet_hashtables.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 1b336dc179f8..5f9b063bbe8a 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -394,9 +394,10 @@ not_unique: return -EADDRNOTAVAIL; } -static inline u32 inet_sk_port_offset(const struct sock *sk) +static u32 inet_sk_port_offset(const struct sock *sk) { const struct inet_sock *inet = inet_sk(sk); + return secure_ipv4_port_ephemeral(inet->inet_rcv_saddr, inet->inet_daddr, inet->inet_dport); @@ -600,7 +601,11 @@ out: int inet_hash_connect(struct inet_timewait_death_row *death_row, struct sock *sk) { - return __inet_hash_connect(death_row, sk, inet_sk_port_offset(sk), + u32 port_offset = 0; + + if (!inet_sk(sk)->inet_num) + port_offset = inet_sk_port_offset(sk); + return __inet_hash_connect(death_row, sk, port_offset, __inet_check_established); } EXPORT_SYMBOL_GPL(inet_hash_connect); |