Commit 8550f328 authored by Lawrence Brakmo's avatar Lawrence Brakmo Committed by David S. Miller

bpf: Support for per connection SYN/SYN-ACK RTOs

This patch adds support for setting a per connection SYN and
SYN_ACK RTOs from within a BPF_SOCK_OPS program. For example,
to set small RTOs when it is known both hosts are within a
datacenter.
Signed-off-by: default avatarLawrence Brakmo <brakmo@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae16189e
...@@ -2057,4 +2057,15 @@ static inline int tcp_call_bpf(struct sock *sk, int op) ...@@ -2057,4 +2057,15 @@ static inline int tcp_call_bpf(struct sock *sk, int op)
} }
#endif #endif
static inline u32 tcp_timeout_init(struct sock *sk)
{
int timeout;
timeout = tcp_call_bpf(sk, BPF_SOCK_OPS_TIMEOUT_INIT);
if (timeout <= 0)
timeout = TCP_TIMEOUT_INIT;
return timeout;
}
#endif /* _TCP_H */ #endif /* _TCP_H */
...@@ -748,6 +748,9 @@ struct bpf_sock_ops { ...@@ -748,6 +748,9 @@ struct bpf_sock_ops {
*/ */
enum { enum {
BPF_SOCK_OPS_VOID, BPF_SOCK_OPS_VOID,
BPF_SOCK_OPS_TIMEOUT_INIT, /* Should return SYN-RTO value to use or
* -1 if default value should be used
*/
}; };
#endif /* _UAPI__LINUX_BPF_H__ */ #endif /* _UAPI__LINUX_BPF_H__ */
...@@ -6406,7 +6406,8 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops, ...@@ -6406,7 +6406,8 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,
} else { } else {
tcp_rsk(req)->tfo_listener = false; tcp_rsk(req)->tfo_listener = false;
if (!want_cookie) if (!want_cookie)
inet_csk_reqsk_queue_hash_add(sk, req, TCP_TIMEOUT_INIT); inet_csk_reqsk_queue_hash_add(sk, req,
tcp_timeout_init((struct sock *)req));
af_ops->send_synack(sk, dst, &fl, req, &foc, af_ops->send_synack(sk, dst, &fl, req, &foc,
!want_cookie ? TCP_SYNACK_NORMAL : !want_cookie ? TCP_SYNACK_NORMAL :
TCP_SYNACK_COOKIE); TCP_SYNACK_COOKIE);
......
...@@ -3326,7 +3326,7 @@ static void tcp_connect_init(struct sock *sk) ...@@ -3326,7 +3326,7 @@ static void tcp_connect_init(struct sock *sk)
tp->rcv_wup = tp->rcv_nxt; tp->rcv_wup = tp->rcv_nxt;
tp->copied_seq = tp->rcv_nxt; tp->copied_seq = tp->rcv_nxt;
inet_csk(sk)->icsk_rto = TCP_TIMEOUT_INIT; inet_csk(sk)->icsk_rto = tcp_timeout_init(sk);
inet_csk(sk)->icsk_retransmits = 0; inet_csk(sk)->icsk_retransmits = 0;
tcp_clear_retrans(tp); tcp_clear_retrans(tp);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment