Commit cadd6480 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

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: default avatarMartin KaFai Lau <kafai@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents 2faa7328 55144f31

include/net/tcp.h

+1 −0
Original line number Diff line number Diff line
@@ -406,6 +406,7 @@ void tcp_syn_ack_timeout(const struct request_sock *req); 
int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,

		int flags, int *addr_len);

int tcp_set_rcvlowat(struct sock *sk, int val);

int tcp_set_window_clamp(struct sock *sk, int val);

void tcp_data_ready(struct sock *sk);

#ifdef CONFIG_MMU

int tcp_mmap(struct file *file, struct socket *sock,

net/core/filter.c

+3 −0
Original line number Diff line number Diff line
@@ -4910,6 +4910,9 @@ static int _bpf_setsockopt(struct sock *sk, int level, int optname, 
				tp->notsent_lowat = val;

				sk->sk_write_space(sk);

				break;

			case TCP_WINDOW_CLAMP:

				ret = tcp_set_window_clamp(sk, val);

				break;

			default:

				ret = -EINVAL;

			}

net/ipv4/tcp.c

+16 −9
Original line number Diff line number Diff line
@@ -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:

tools/testing/selftests/bpf/bpf_tcp_helpers.h

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ struct tcp_sock { 
	__u32	rcv_nxt;

	__u32	snd_nxt;

	__u32	snd_una;

	__u32	window_clamp;

	__u8	ecn_flags;

	__u32	delivered;

	__u32	delivered_ce;

tools/testing/selftests/bpf/prog_tests/tcpbpf_user.c

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ static void verify_result(struct tcpbpf_globals *result) 


	/* check getsockopt for SAVED_SYN */

	ASSERT_EQ(result->tcp_saved_syn, 1, "tcp_saved_syn");



	/* check getsockopt for window_clamp */

	ASSERT_EQ(result->window_clamp_client, 9216, "window_clamp_client");

	ASSERT_EQ(result->window_clamp_server, 9216, "window_clamp_server");

}



static void run_test(struct tcpbpf_globals *result)