diff options
| author | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-09-15 19:15:49 +0300 |
|---|---|---|
| committer | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-09-15 19:15:49 +0300 |
| commit | 59d13e5509deb9d4606a86b3bd8e7b1b3b4fcf6a (patch) | |
| tree | d8a8bd0527915f7143d175dcb5e28dcde9586eea /include | |
| parent | cdd69777f59ed04bff40e11728ebf844d0b820e9 (diff) | |
| parent | ef76035f50a1147a0d39b3d9c1b80b92a2961028 (diff) | |
| download | linux-59d13e5509deb9d4606a86b3bd8e7b1b3b4fcf6a.tar.gz | |
Merge branch 6.1/features/tcp-timewait
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/tcp.h | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index e9c8f88f4769..27039f55ef43 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -122,6 +122,7 @@ void tcp_time_wait(struct sock *sk, int state, int timeo); #define TCP_TIMEWAIT_LEN (60*HZ) /* how long to wait to destroy TIME-WAIT * state, about 60 seconds */ +#define TCP_TIMEWAIT_LEN_MIN (1*HZ) #define TCP_FIN_TIMEOUT TCP_TIMEWAIT_LEN /* BSD style FIN_WAIT2 deadlock breaker. * It used to be 3min, new value is 60sec, @@ -1565,6 +1566,34 @@ static inline int tcp_fin_time(const struct sock *sk) return fin_timeout; } +static inline int tcp_timewait_len(const struct inet_timewait_sock *tw) +{ + bool loopback = false; + + if (tw->tw_bound_dev_if == LOOPBACK_IFINDEX) + loopback = true; +#if IS_ENABLED(CONFIG_IPV6) + else if (tw->tw_family == AF_INET6) { + if (ipv6_addr_loopback(&tw->tw_v6_daddr) || + ipv6_addr_v4mapped_loopback(&tw->tw_v6_daddr) || + ipv6_addr_loopback(&tw->tw_v6_rcv_saddr) || + ipv6_addr_v4mapped_loopback(&tw->tw_v6_rcv_saddr)) + loopback = true; + } +#endif + else + { + if (ipv4_is_loopback(tw->tw_daddr) || + ipv4_is_loopback(tw->tw_rcv_saddr)) + loopback = true; + } + + if (!loopback) + return TCP_TIMEWAIT_LEN; + + return max(TCP_TIMEWAIT_LEN_MIN, sock_net((const struct sock*)tw)->ipv4.sysctl_tcp_fin_timeout); +} + static inline bool tcp_paws_check(const struct tcp_options_received *rx_opt, int paws_win) { |