tcp: derive delack_max with tcp_rto_min helper

Rto_min now has multiple sources, ordered by preprecedence high to
low: ip route option rto_min, icsk->icsk_rto_min.

When derive delack_max from rto_min, we should not only use ip
route option, but should use tcp_rto_min helper to get the correct
rto_min.

Signed-off-by: Kevin Yang <yyd@google.com>
Reviewed-by: Neal Cardwell <ncardwell@google.com>
Reviewed-by: Yuchung Cheng <ycheng@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Tony Lu <tonylu@linux.alibaba.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index f97e098f18a52a915817b38b2aab86167b126832..090fb0c24599680c17a70b5c81fc9bc69d9be6a0 100644 (file)
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -4163,16 +4163,9 @@ EXPORT_SYMBOL(tcp_connect);
 
 u32 tcp_delack_max(const struct sock *sk)
 {
-       const struct dst_entry *dst = __sk_dst_get(sk);
-       u32 delack_max = inet_csk(sk)->icsk_delack_max;
-
-       if (dst && dst_metric_locked(dst, RTAX_RTO_MIN)) {
-               u32 rto_min = dst_metric_rtt(dst, RTAX_RTO_MIN);
-               u32 delack_from_rto_min = max_t(int, 1, rto_min - 1);
+       u32 delack_from_rto_min = max(tcp_rto_min(sk), 2) - 1;
 
-               delack_max = min_t(u32, delack_max, delack_from_rto_min);
-       }
-       return delack_max;
+       return min(inet_csk(sk)->icsk_delack_max, delack_from_rto_min);
 }
 
 /* Send out a delayed ack, the caller does the policy checking