Commit caf971df authored by Paolo Abeni's avatar Paolo Abeni Committed by Jakub Kicinski
Browse files

mptcp: reduce the arguments of mptcp_sendmsg_frag 



The current argument list is pretty long and quite unreadable,
move many of them into a specific struct. Later patches
will add more stuff to such struct.

Additionally drop the 'timeo' argument, now unused.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ba8f48f7

net/mptcp/protocol.c

+29 −24
Original line number Diff line number Diff line
@@ -914,12 +914,16 @@ mptcp_carve_data_frag(const struct mptcp_sock *msk, struct page_frag *pfrag, 
	return dfrag;

}



struct mptcp_sendmsg_info {

	int mss_now;

	int size_goal;

};



static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,

			      struct msghdr *msg, struct mptcp_data_frag *dfrag,

			      long *timeo, int *pmss_now,

			      int *ps_goal)

			      struct mptcp_sendmsg_info *info)

{

	int mss_now, avail_size, size_goal, offset, ret, frag_truesize = 0;

	int avail_size, offset, ret, frag_truesize = 0;

	bool dfrag_collapsed, can_collapse = false;

	struct mptcp_sock *msk = mptcp_sk(sk);

	struct mptcp_ext *mpext = NULL;
@@ -945,10 +949,8 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk, 
	}



	/* compute copy limit */

	mss_now = tcp_send_mss(ssk, &size_goal, msg->msg_flags);

	*pmss_now = mss_now;

	*ps_goal = size_goal;

	avail_size = size_goal;

	info->mss_now = tcp_send_mss(ssk, &info->size_goal, msg->msg_flags);

	avail_size = info->size_goal;

	skb = tcp_write_queue_tail(ssk);

	if (skb) {

		mpext = skb_ext_find(skb, SKB_EXT_MPTCP);
@@ -959,12 +961,12 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk, 
		 * queue management operation, to avoid breaking the ext <->

		 * SSN association set here

		 */

		can_collapse = (size_goal - skb->len > 0) &&

		can_collapse = (info->size_goal - skb->len > 0) &&

			      mptcp_skb_can_collapse_to(*write_seq, skb, mpext);

		if (!can_collapse)

			TCP_SKB_CB(skb)->eor = 1;

		else

			avail_size = size_goal - skb->len;

			avail_size = info->size_goal - skb->len;

	}



	if (!retransmission) {
@@ -1187,11 +1189,15 @@ static void ssk_check_wmem(struct mptcp_sock *msk) 


static int mptcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)

{

	int mss_now = 0, size_goal = 0, ret = 0;

	struct mptcp_sock *msk = mptcp_sk(sk);

	struct mptcp_sendmsg_info info = {

		.mss_now = 0,

		.size_goal = 0,

	};

	struct page_frag *pfrag;

	size_t copied = 0;

	struct sock *ssk;

	int ret = 0;

	u32 sndbuf;

	bool tx_ok;

	long timeo;
@@ -1260,8 +1266,7 @@ restart: 
	lock_sock(ssk);

	tx_ok = msg_data_left(msg);

	while (tx_ok) {

		ret = mptcp_sendmsg_frag(sk, ssk, msg, NULL, &timeo, &mss_now,

					 &size_goal);

		ret = mptcp_sendmsg_frag(sk, ssk, msg, NULL, &info);

		if (ret < 0) {

			if (ret == -EAGAIN && timeo > 0) {

				mptcp_set_timeout(sk, ssk);
@@ -1284,8 +1289,8 @@ restart: 
		if (!sk_stream_memory_free(ssk) ||

		    !mptcp_page_frag_refill(ssk, pfrag) ||

		    !mptcp_ext_cache_refill(msk)) {

			tcp_push(ssk, msg->msg_flags, mss_now,

				 tcp_sk(ssk)->nonagle, size_goal);

			tcp_push(ssk, msg->msg_flags, info.mss_now,

				 tcp_sk(ssk)->nonagle, info.size_goal);

			mptcp_set_timeout(sk, ssk);

			release_sock(ssk);

			goto restart;
@@ -1305,8 +1310,8 @@ restart: 
		 * limits before we send more data.

		 */

		if (unlikely(!sk_stream_memory_free(sk))) {

			tcp_push(ssk, msg->msg_flags, mss_now,

				 tcp_sk(ssk)->nonagle, size_goal);

			tcp_push(ssk, msg->msg_flags, info.mss_now,

				 tcp_sk(ssk)->nonagle, info.size_goal);

			mptcp_clean_una(sk);

			if (!sk_stream_memory_free(sk)) {

				/* can't send more for now, need to wait for
@@ -1323,8 +1328,8 @@ restart: 


	mptcp_set_timeout(sk, ssk);

	if (copied) {

		tcp_push(ssk, msg->msg_flags, mss_now, tcp_sk(ssk)->nonagle,

			 size_goal);

		tcp_push(ssk, msg->msg_flags, info.mss_now,

			 tcp_sk(ssk)->nonagle, info.size_goal);



		/* start the timer, if it's not pending */

		if (!mptcp_timer_pending(sk))
@@ -1763,14 +1768,15 @@ static void mptcp_worker(struct work_struct *work) 
{

	struct mptcp_sock *msk = container_of(work, struct mptcp_sock, work);

	struct sock *ssk, *sk = &msk->sk.icsk_inet.sk;

	int orig_len, orig_offset, mss_now = 0, size_goal = 0;

	struct mptcp_sendmsg_info info = {};

	struct mptcp_data_frag *dfrag;

	int orig_len, orig_offset;

	u64 orig_write_seq;

	size_t copied = 0;

	struct msghdr msg = {

		.msg_flags = MSG_DONTWAIT,

	};

	long timeo = 0;

	int ret;



	lock_sock(sk);

	mptcp_clean_una_wakeup(sk);
@@ -1809,8 +1815,7 @@ static void mptcp_worker(struct work_struct *work) 
	orig_offset = dfrag->offset;

	orig_write_seq = dfrag->data_seq;

	while (dfrag->data_len > 0) {

		int ret = mptcp_sendmsg_frag(sk, ssk, &msg, dfrag, &timeo,

					     &mss_now, &size_goal);

		ret = mptcp_sendmsg_frag(sk, ssk, &msg, dfrag, &info);

		if (ret < 0)

			break;
@@ -1823,8 +1828,8 @@ static void mptcp_worker(struct work_struct *work) 
			break;

	}

	if (copied)

		tcp_push(ssk, msg.msg_flags, mss_now, tcp_sk(ssk)->nonagle,

			 size_goal);

		tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle,

			 info.size_goal);



	dfrag->data_seq = orig_write_seq;

	dfrag->offset = orig_offset;

CRA Git | Maintained and supported by SUSTech CRA and CCSE