tcp: remove tcp_tw_recycle

The tcp_tw_recycle was already broken for connections
behind NAT, since the per-destination timestamp is not
monotonically increasing for multiple machines behind
a single destination address.

After the randomization of TCP timestamp offsets
in commit 8a5bd45f6616 (tcp: randomize tcp timestamp offsets
for each connection), the tcp_tw_recycle is broken for all
types of connections for the same reason: the timestamps
received from a single machine is not monotonically increasing,
anymore.

Remove tcp_tw_recycle, since it is not functional. Also, remove
the PAWSPassive SNMP counter since it is only used for
tcp_tw_recycle, and simplify tcp_v4_route_req and tcp_v6_route_req
since the strict argument is only set when tcp_tw_recycle is
enabled.

Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Yuchung Cheng <ycheng@google.com>
Cc: Lutz Vieweg <lvml@5t9.de>
Cc: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 13 deletions

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index d8b401fff9fe..7482b5d11861 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1213,19 +1213,9 @@ static void tcp_v4_init_req(struct request_sock *req,
 
 static struct dst_entry *tcp_v4_route_req(const struct sock *sk,
                                           struct flowi *fl,
-                                          const struct request_sock *req,
-                                          bool *strict)
+                                          const struct request_sock *req)
 {
-        struct dst_entry *dst = inet_csk_route_req(sk, &fl->u.ip4, req);
-
-        if (strict) {
-                if (fl->u.ip4.daddr == inet_rsk(req)->ir_rmt_addr)
-                        *strict = true;
-                else
-                        *strict = false;
-        }
-
-        return dst;
+        return inet_csk_route_req(sk, &fl->u.ip4, req);
 }
 
 struct request_sock_ops tcp_request_sock_ops __read_mostly = {
@@ -2462,7 +2452,6 @@ static int __net_init tcp_sk_init(struct net *net)
         net->ipv4.sysctl_tcp_tw_reuse = 0;
 
         cnt = tcp_hashinfo.ehash_mask + 1;
-        net->ipv4.tcp_death_row.sysctl_tw_recycle = 0;
         net->ipv4.tcp_death_row.sysctl_max_tw_buckets = (cnt + 1) / 2;
         net->ipv4.tcp_death_row.hashinfo = &tcp_hashinfo;