Commit 29a94932 authored by Neal Cardwell's avatar Neal Cardwell Committed by Alexei Starovoitov
Browse files

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: default avatarNeal Cardwell <ncardwell@google.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarYuchung Cheng <ycheng@google.com>
Acked-by: default avatarKevin Yang <yyd@google.com>
Cc: Lawrence Brakmo <brakmo@fb.com>
parent e7b10a4d

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/core/filter.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

net/ipv4/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/ipv4/tcp_cong.c

+2 −9
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ int tcp_set_allowed_congestion_control(char *val) 
 * 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);

			}

		} else {

			err = -EBUSY;

		}