diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2020-12-03 17:23:24 -0800 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2020-12-03 17:25:24 -0800 |
| commit | cadd64807cd83e2213dcb70f93d12d978c02b5fa (patch) | |
| tree | b1c7a0f08e572ddb25c8016d65cb2ee588b1c2ea /net/ipv4/tcp.c | |
| parent | 2faa7328f53b36b2b171501154bba3fd66d8f5da (diff) | |
| parent | 55144f31f0d2fdd3e74ead67f1649bf577961eaa (diff) | |
Merge branch 'Add support to set window_clamp from bpf setsockops'
Prankur gupta says:
====================
This patch contains support to set tcp window_field field from bpf setsockops.
v2: Used TCP_WINDOW_CLAMP setsockopt logic for bpf_setsockopt (review comment addressed)
v3: Created a common function for duplicated code (review comment addressed)
v4: Removing logic to pass struct sock and struct tcp_sock together (review comment addressed)
====================
Acked-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index b2bc3d7fe9e8..17379f6dd955 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3022,6 +3022,21 @@ int tcp_sock_set_keepcnt(struct sock *sk, int val) } EXPORT_SYMBOL(tcp_sock_set_keepcnt); +int tcp_set_window_clamp(struct sock *sk, int val) +{ + struct tcp_sock *tp = tcp_sk(sk); + + if (!val) { + if (sk->sk_state != TCP_CLOSE) + return -EINVAL; + tp->window_clamp = 0; + } else { + tp->window_clamp = val < SOCK_MIN_RCVBUF / 2 ? + SOCK_MIN_RCVBUF / 2 : val; + } + return 0; +} + /* * Socket option code for TCP. */ @@ -3235,15 +3250,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, break; case TCP_WINDOW_CLAMP: - if (!val) { - if (sk->sk_state != TCP_CLOSE) { - err = -EINVAL; - break; - } - tp->window_clamp = 0; - } else - tp->window_clamp = val < SOCK_MIN_RCVBUF / 2 ? - SOCK_MIN_RCVBUF / 2 : val; + err = tcp_set_window_clamp(sk, val); break; case TCP_QUICKACK: |