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

tcp: Simplify EBPF TCP_CONGESTION to always init CC 



Now that the previous patch ensures we don't initialize the congestion
control twice, when EBPF sets the congestion control algorithm at
connection establishment we can simplify the code by simply
initializing the congestion control module at that time.

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 8919a9b3

net/core/filter.c

+1 −6
Original line number Diff line number Diff line
@@ -4313,8 +4313,6 @@ static const struct bpf_func_proto bpf_get_socket_uid_proto = { 
	.arg1_type      = ARG_PTR_TO_CTX,

};



#define SOCKOPT_CC_REINIT (1 << 0)



static int _bpf_setsockopt(struct sock *sk, int level, int optname,

			   char *optval, int optlen, u32 flags)

{
@@ -4449,13 +4447,12 @@ static int _bpf_setsockopt(struct sock *sk, int level, int optname, 
		   sk->sk_prot->setsockopt == tcp_setsockopt) {

		if (optname == TCP_CONGESTION) {

			char name[TCP_CA_NAME_MAX];

			bool reinit = flags & SOCKOPT_CC_REINIT;



			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,

							 reinit, true);

							 true, true);

		} else {

			struct inet_connection_sock *icsk = inet_csk(sk);

			struct tcp_sock *tp = tcp_sk(sk);
@@ -4652,8 +4649,6 @@ BPF_CALL_5(bpf_sock_ops_setsockopt, struct bpf_sock_ops_kern *, bpf_sock, 
	   int, level, int, optname, char *, optval, int, optlen)

{

	u32 flags = 0;

	if (bpf_sock->op > BPF_SOCK_OPS_NEEDS_ECN)

		flags |= SOCKOPT_CC_REINIT;

	return _bpf_setsockopt(bpf_sock->sk, level, optname, optval, optlen,

			       flags);

}