tcp: simplify tcp_set_congestion_control(): Always reinitialize

Now that the previous patches ensure that all call sites for
tcp_set_congestion_control() want to initialize congestion control, we
can simplify tcp_set_congestion_control() by removing the reinit
argument and the code to support it.

Signed-off-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Yuchung Cheng <ycheng@google.com>
Acked-by: Kevin Yang <yyd@google.com>
Cc: Lawrence Brakmo <brakmo@fb.com>

diff --git a/include/net/tcp.h b/include/net/tcp.h
index e85d564446c651680dee37ab9f5a1c430eb26377..f857146c17a52df634dccb6e3e46664f23080652 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1104,7 +1104,7 @@ void tcp_get_available_congestion_control(char *buf, size_t len);
 void tcp_get_allowed_congestion_control(char *buf, size_t len);
 int tcp_set_allowed_congestion_control(char *allowed);
 int tcp_set_congestion_control(struct sock *sk, const char *name, bool load,
-                              bool reinit, bool cap_net_admin);
+                              bool cap_net_admin);
 u32 tcp_slow_start(struct tcp_sock *tp, u32 acked);
 void tcp_cong_avoid_ai(struct tcp_sock *tp, u32 w, u32 acked);
 

diff --git a/net/core/filter.c b/net/core/filter.c
index 067f6759a68f72e950f7a0fe70978cf1d691b393..e89d6d7da03c410054b8479b58144d69db58e101 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -4451,8 +4451,7 @@ static int _bpf_setsockopt(struct sock *sk, int level, int optname,
                        strncpy(name, optval, min_t(long, optlen,
                                                    TCP_CA_NAME_MAX-1));
                        name[TCP_CA_NAME_MAX-1] = 0;
-                       ret = tcp_set_congestion_control(sk, name, false,
-                                                        true, true);
+                       ret = tcp_set_congestion_control(sk, name, false, true);
                } else {
                        struct inet_connection_sock *icsk = inet_csk(sk);
                        struct tcp_sock *tp = tcp_sk(sk);

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 7360d3db2b6161280232863fb55535c09e4f90ed..e58ab9db73ff11dc74932ee7feaed242762af5bd 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3050,7 +3050,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname,
                name[val] = 0;
 
                lock_sock(sk);
-               err = tcp_set_congestion_control(sk, name, true, true,
+               err = tcp_set_congestion_control(sk, name, true,
                                                 ns_capable(sock_net(sk)->user_ns,
                                                            CAP_NET_ADMIN));
                release_sock(sk);

diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c
index d18d7a1ce4ce72cc56cf614c88d7353347a922ea..a9b0fb52a1ec4a9869bf669b21fa6ca1168ab8e3 100644 (file)
--- a/net/ipv4/tcp_cong.c
+++ b/net/ipv4/tcp_cong.c
@@ -341,7 +341,7 @@ out:
  * already initialized.
  */
 int tcp_set_congestion_control(struct sock *sk, const char *name, bool load,
-                              bool reinit, bool cap_net_admin)
+                              bool cap_net_admin)
 {
        struct inet_connection_sock *icsk = inet_csk(sk);
        const struct tcp_congestion_ops *ca;
@@ -365,15 +365,8 @@ int tcp_set_congestion_control(struct sock *sk, const char *name, bool load,
        if (!ca) {
                err = -ENOENT;
        } else if (!load) {
-               const struct tcp_congestion_ops *old_ca = icsk->icsk_ca_ops;
-
                if (bpf_try_module_get(ca, ca->owner)) {
-                       if (reinit) {
-                               tcp_reinit_congestion_control(sk, ca);
-                       } else {
-                               icsk->icsk_ca_ops = ca;
-                               bpf_module_put(old_ca, old_ca->owner);
-                       }
+                       tcp_reinit_congestion_control(sk, ca);
                } else {
                        err = -EBUSY;
                }