Unverified Commit 32586d52 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9262 MPTCP Upstream part 6 

Merge Pull Request from: @geliangtang 
 
mptcp: Fixes and cleanup for v6.7

Patch 1 refactors syncing of socket options from the MPTCP socket to
its subflows.

Patch 2 helps the MPTCP packet scheduler perform well by changing
the handling of notsent_lowat in subflows and how available buffer space
is calculated for MPTCP-level sends.

Patches 3-5 clean up kernel code by removing unused parameters, making
more consistent use of existing helper functions, and reducing extra
casting of socket pointers. 
 
Link:https://gitee.com/openeuler/kernel/pulls/9262

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 79e1c0e4 1af5a799

net/mptcp/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ void mptcp_pm_subflow_established(struct mptcp_sock *msk) 
	spin_unlock_bh(&pm->lock);

}



void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock *ssk,

void mptcp_pm_subflow_check_next(struct mptcp_sock *msk,

				 const struct mptcp_subflow_context *subflow)

{

	struct mptcp_pm_data *pm = &msk->pm;

net/mptcp/protocol.c

+3 −5
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ struct sock *__mptcp_nmpc_sk(struct mptcp_sock *msk) 
		ret = __mptcp_socket_create(msk);

		if (ret)

			return ERR_PTR(ret);



		mptcp_sockopt_sync(msk, msk->first);

	}



	return msk->first;
@@ -1259,7 +1257,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk, 
		 * queue management operation, to avoid breaking the ext <->

		 * SSN association set here

		 */

		mpext = skb_ext_find(skb, SKB_EXT_MPTCP);

		mpext = mptcp_get_ext(skb);

		if (!mptcp_skb_can_collapse_to(data_seq, skb, mpext)) {

			TCP_SKB_CB(skb)->eor = 1;

			tcp_mark_push(tcp_sk(ssk), skb);
@@ -1282,7 +1280,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk, 


		i = skb_shinfo(skb)->nr_frags;

		reuse_skb = false;

		mpext = skb_ext_find(skb, SKB_EXT_MPTCP);

		mpext = mptcp_get_ext(skb);

	}



	/* Zero window and all data acked? Probe. */
@@ -2486,7 +2484,7 @@ void mptcp_close_ssk(struct sock *sk, struct sock *ssk, 
	/* subflow aborted before reaching the fully_established status

	 * attempt the creation of the next subflow

	 */

	mptcp_pm_subflow_check_next(mptcp_sk(sk), ssk, subflow);

	mptcp_pm_subflow_check_next(mptcp_sk(sk), subflow);



	__mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_PUSH);

}

net/mptcp/protocol.h

+2 −2
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk); 
void mptcp_pm_connection_closed(struct mptcp_sock *msk);

void mptcp_pm_subflow_established(struct mptcp_sock *msk);

bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk);

void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock *ssk,

void mptcp_pm_subflow_check_next(struct mptcp_sock *msk,

				 const struct mptcp_subflow_context *subflow);

void mptcp_pm_add_addr_received(const struct sock *ssk,

				const struct mptcp_addr_info *addr);
@@ -1080,7 +1080,7 @@ static inline bool mptcp_check_fallback(const struct sock *sk) 


static inline void __mptcp_do_fallback(struct mptcp_sock *msk)

{

	if (test_bit(MPTCP_FALLBACK_DONE, &msk->flags)) {

	if (__mptcp_check_fallback(msk)) {

		pr_debug("TCP fallback already done (msk=%p)", msk);

		return;

	}

net/mptcp/sockopt.c

+7 −23
Original line number Diff line number Diff line
@@ -919,7 +919,7 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info) 
			mptcp_pm_get_local_addr_max(msk);

	}



	if (test_bit(MPTCP_FALLBACK_DONE, &msk->flags))

	if (__mptcp_check_fallback(msk))

		flags |= MPTCP_INFO_FLAG_FALLBACK;

	if (READ_ONCE(msk->can_ack))

		flags |= MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED;
@@ -1450,28 +1450,6 @@ static void sync_socket_options(struct mptcp_sock *msk, struct sock *ssk) 
	inet_assign_bit(FREEBIND, ssk, inet_test_bit(FREEBIND, sk));

}



static void __mptcp_sockopt_sync(struct mptcp_sock *msk, struct sock *ssk)

{

	bool slow = lock_sock_fast(ssk);



	sync_socket_options(msk, ssk);



	unlock_sock_fast(ssk, slow);

}



void mptcp_sockopt_sync(struct mptcp_sock *msk, struct sock *ssk)

{

	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);



	msk_owned_by_me(msk);



	if (READ_ONCE(subflow->setsockopt_seq) != msk->setsockopt_seq) {

		__mptcp_sockopt_sync(msk, ssk);



		subflow->setsockopt_seq = msk->setsockopt_seq;

	}

}



void mptcp_sockopt_sync_locked(struct mptcp_sock *msk, struct sock *ssk)

{

	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
@@ -1480,6 +1458,12 @@ void mptcp_sockopt_sync_locked(struct mptcp_sock *msk, struct sock *ssk) 


	ssk->sk_rcvlowat = 0;



	/* subflows must ignore any latency-related settings: will not affect

	 * the user-space - only the msk is relevant - but will foul the

	 * mptcp scheduler

	 */

	tcp_sk(ssk)->notsent_lowat = UINT_MAX;



	if (READ_ONCE(subflow->setsockopt_seq) != msk->setsockopt_seq) {

		sync_socket_options(msk, ssk);

net/mptcp/subflow.c

+9 −9
Original line number Diff line number Diff line
@@ -1560,8 +1560,6 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc, 
	if (addr.ss_family == AF_INET6)

		addrlen = sizeof(struct sockaddr_in6);

#endif

	mptcp_sockopt_sync(msk, ssk);



	ssk->sk_bound_dev_if = ifindex;

	err = kernel_bind(sf, (struct sockaddr *)&addr, addrlen);

	if (err)
@@ -1672,7 +1670,7 @@ int mptcp_subflow_create_socket(struct sock *sk, unsigned short family, 


	err = security_mptcp_add_subflow(sk, sf->sk);

	if (err)

		goto release_ssk;

		goto err_free;



	/* the newly created socket has to be in the same cgroup as its parent */

	mptcp_attach_cgroup(sk, sf->sk);
@@ -1686,15 +1684,12 @@ int mptcp_subflow_create_socket(struct sock *sk, unsigned short family, 
	get_net_track(net, &sf->sk->ns_tracker, GFP_KERNEL);

	sock_inuse_add(net, 1);

	err = tcp_set_ulp(sf->sk, "mptcp");

	if (err)

		goto err_free;



release_ssk:

	mptcp_sockopt_sync_locked(mptcp_sk(sk), sf->sk);

	release_sock(sf->sk);



	if (err) {

		sock_release(sf);

		return err;

	}



	/* the newly created socket really belongs to the owning MPTCP master

	 * socket, even if for additional subflows the allocation is performed

	 * by a kernel workqueue. Adjust inode references, so that the
@@ -1714,6 +1709,11 @@ int mptcp_subflow_create_socket(struct sock *sk, unsigned short family, 
	mptcp_subflow_ops_override(sf->sk);



	return 0;



err_free:

	release_sock(sf->sk);

	sock_release(sf);

	return err;

}



static struct mptcp_subflow_context *subflow_create_ctx(struct sock *sk,