Commit 1e9d3005 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

tcp: Apply max RTO to non-TFO SYN+ACK. 



Since commit 54a378f4 ("tcp: add the ability to control
max RTO"), TFO SYN+ACK RTO is capped by the TFO full sk's
inet_csk(sk)->icsk_rto_max.

The value is inherited from the parent listener.

Let's apply the same cap to non-TFO SYN+ACK.

Note that req->rsk_listener is always non-NULL when we call
tcp_reqsk_timeout() in reqsk_timer_handler() or tcp_check_req().

It could be NULL for SYN cookie req, but we do not use
req->timeout then.

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@google.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20251106003357.273403-6-kuniyu@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 207ce0f6

include/net/tcp.h

+2 −1
Original line number Diff line number Diff line
@@ -845,7 +845,8 @@ static inline unsigned long tcp_reqsk_timeout(struct request_sock *req) 
{

	u64 timeout = (u64)req->timeout << req->num_timeout;



	return (unsigned long)min_t(u64, timeout, TCP_RTO_MAX);

	return (unsigned long)min_t(u64, timeout,

				    tcp_rto_max(req->rsk_listener));

}



u32 tcp_delack_max(const struct sock *sk);