| Message ID | 20211122101622.50572-2-kuniyu@amazon.co.jp (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e7049395b1c3085d12b5ba16d058c65598368853 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | dccp/tcp: Minor fixes for inet_csk_listen_start(). | expand |
On Mon, Nov 22, 2021 at 6:17 PM Kuniyuki Iwashima <kuniyu@amazon.co.jp> wrote: > > The commit 1295e2cf3065 ("inet: minor optimization for backlog setting in > listen(2)") added change so that sk_max_ack_backlog is initialised earlier > in inet_dccp_listen() and inet_listen(). Since then, we no longer use > backlog in inet_csk_listen_start(), so let's remove it. > > Fixes: 1295e2cf3065 ("inet: minor optimization for backlog setting in listen(2)") > Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.co.jp> Thanks for the fix. Acked-by: Yafang Shao <laoar.shao@gmail.com> > --- > include/net/inet_connection_sock.h | 2 +- > net/dccp/proto.c | 6 +++--- > net/ipv4/af_inet.c | 2 +- > net/ipv4/inet_connection_sock.c | 2 +- > tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c | 2 +- > 5 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h > index fa6a87246a7b..4ad47d9f9d27 100644 > --- a/include/net/inet_connection_sock.h > +++ b/include/net/inet_connection_sock.h > @@ -304,7 +304,7 @@ static inline __poll_t inet_csk_listen_poll(const struct sock *sk) > (EPOLLIN | EPOLLRDNORM) : 0; > } > > -int inet_csk_listen_start(struct sock *sk, int backlog); > +int inet_csk_listen_start(struct sock *sk); > void inet_csk_listen_stop(struct sock *sk); > > void inet_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr); > diff --git a/net/dccp/proto.c b/net/dccp/proto.c > index fc44dadc778b..55b8f958cdd2 100644 > --- a/net/dccp/proto.c > +++ b/net/dccp/proto.c > @@ -238,7 +238,7 @@ void dccp_destroy_sock(struct sock *sk) > > EXPORT_SYMBOL_GPL(dccp_destroy_sock); > > -static inline int dccp_listen_start(struct sock *sk, int backlog) > +static inline int dccp_listen_start(struct sock *sk) > { > struct dccp_sock *dp = dccp_sk(sk); > > @@ -246,7 +246,7 @@ static inline int dccp_listen_start(struct sock *sk, int backlog) > /* do not start to listen if feature negotiation setup fails */ > if (dccp_feat_finalise_settings(dp)) > return -EPROTO; > - return inet_csk_listen_start(sk, backlog); > + return inet_csk_listen_start(sk); > } > > static inline int dccp_need_reset(int state) > @@ -935,7 +935,7 @@ int inet_dccp_listen(struct socket *sock, int backlog) > * FIXME: here it probably should be sk->sk_prot->listen_start > * see tcp_listen_start > */ > - err = dccp_listen_start(sk, backlog); > + err = dccp_listen_start(sk); > if (err) > goto out; > } > diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c > index c66b0563a267..aa8d15b1e2a4 100644 > --- a/net/ipv4/af_inet.c > +++ b/net/ipv4/af_inet.c > @@ -225,7 +225,7 @@ int inet_listen(struct socket *sock, int backlog) > tcp_fastopen_init_key_once(sock_net(sk)); > } > > - err = inet_csk_listen_start(sk, backlog); > + err = inet_csk_listen_start(sk); > if (err) > goto out; > tcp_call_bpf(sk, BPF_SOCK_OPS_TCP_LISTEN_CB, 0, NULL); > diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c > index f7fea3a7c5e6..23da67a3fc06 100644 > --- a/net/ipv4/inet_connection_sock.c > +++ b/net/ipv4/inet_connection_sock.c > @@ -1035,7 +1035,7 @@ void inet_csk_prepare_forced_close(struct sock *sk) > } > EXPORT_SYMBOL(inet_csk_prepare_forced_close); > > -int inet_csk_listen_start(struct sock *sk, int backlog) > +int inet_csk_listen_start(struct sock *sk) > { > struct inet_connection_sock *icsk = inet_csk(sk); > struct inet_sock *inet = inet_sk(sk); > diff --git a/tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c b/tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c > index 8e94e5c080aa..6dc1f28fc4b6 100644 > --- a/tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c > +++ b/tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c > @@ -68,7 +68,7 @@ static void set_task_info(struct sock *sk) > } > > SEC("fentry/inet_csk_listen_start") > -int BPF_PROG(trace_inet_csk_listen_start, struct sock *sk, int backlog) > +int BPF_PROG(trace_inet_csk_listen_start, struct sock *sk) > { > set_task_info(sk); > > -- > 2.30.2 >
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h index fa6a87246a7b..4ad47d9f9d27 100644 --- a/include/net/inet_connection_sock.h +++ b/include/net/inet_connection_sock.h @@ -304,7 +304,7 @@ static inline __poll_t inet_csk_listen_poll(const struct sock *sk) (EPOLLIN | EPOLLRDNORM) : 0; } -int inet_csk_listen_start(struct sock *sk, int backlog); +int inet_csk_listen_start(struct sock *sk); void inet_csk_listen_stop(struct sock *sk); void inet_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr); diff --git a/net/dccp/proto.c b/net/dccp/proto.c index fc44dadc778b..55b8f958cdd2 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -238,7 +238,7 @@ void dccp_destroy_sock(struct sock *sk) EXPORT_SYMBOL_GPL(dccp_destroy_sock); -static inline int dccp_listen_start(struct sock *sk, int backlog) +static inline int dccp_listen_start(struct sock *sk) { struct dccp_sock *dp = dccp_sk(sk); @@ -246,7 +246,7 @@ static inline int dccp_listen_start(struct sock *sk, int backlog) /* do not start to listen if feature negotiation setup fails */ if (dccp_feat_finalise_settings(dp)) return -EPROTO; - return inet_csk_listen_start(sk, backlog); + return inet_csk_listen_start(sk); } static inline int dccp_need_reset(int state) @@ -935,7 +935,7 @@ int inet_dccp_listen(struct socket *sock, int backlog) * FIXME: here it probably should be sk->sk_prot->listen_start * see tcp_listen_start */ - err = dccp_listen_start(sk, backlog); + err = dccp_listen_start(sk); if (err) goto out; } diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index c66b0563a267..aa8d15b1e2a4 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -225,7 +225,7 @@ int inet_listen(struct socket *sock, int backlog) tcp_fastopen_init_key_once(sock_net(sk)); } - err = inet_csk_listen_start(sk, backlog); + err = inet_csk_listen_start(sk); if (err) goto out; tcp_call_bpf(sk, BPF_SOCK_OPS_TCP_LISTEN_CB, 0, NULL); diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index f7fea3a7c5e6..23da67a3fc06 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -1035,7 +1035,7 @@ void inet_csk_prepare_forced_close(struct sock *sk) } EXPORT_SYMBOL(inet_csk_prepare_forced_close); -int inet_csk_listen_start(struct sock *sk, int backlog) +int inet_csk_listen_start(struct sock *sk) { struct inet_connection_sock *icsk = inet_csk(sk); struct inet_sock *inet = inet_sk(sk); diff --git a/tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c b/tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c index 8e94e5c080aa..6dc1f28fc4b6 100644 --- a/tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c +++ b/tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c @@ -68,7 +68,7 @@ static void set_task_info(struct sock *sk) } SEC("fentry/inet_csk_listen_start") -int BPF_PROG(trace_inet_csk_listen_start, struct sock *sk, int backlog) +int BPF_PROG(trace_inet_csk_listen_start, struct sock *sk) { set_task_info(sk);
The commit 1295e2cf3065 ("inet: minor optimization for backlog setting in listen(2)") added change so that sk_max_ack_backlog is initialised earlier in inet_dccp_listen() and inet_listen(). Since then, we no longer use backlog in inet_csk_listen_start(), so let's remove it. Fixes: 1295e2cf3065 ("inet: minor optimization for backlog setting in listen(2)") Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.co.jp> --- include/net/inet_connection_sock.h | 2 +- net/dccp/proto.c | 6 +++--- net/ipv4/af_inet.c | 2 +- net/ipv4/inet_connection_sock.c | 2 +- tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)