Commit 4a432e06 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mptcp-miscellaneous-refactoring-and-small-fixes' 

Mat Martineau says:

====================
mptcp: Miscellaneous refactoring and small fixes

Patches 1-3 do some refactoring to more consistently handle sock casts,
and to remove some duplicate code. No functional changes.

Patch 4 corrects a variable name in a self test, but does not change
functionality since the same value gets used due to bash's
scoping rules.

Patch 5 rewords a comment.
====================

Link: https://lore.kernel.org/r/20221110232322.125068-1-mathew.j.martineau@linux.intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f4c4ca70 4373bf4b

net/mptcp/pm_userspace.c

+2 −2
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct genl_info *info) 
		goto create_err;

	}



	sk = &msk->sk.icsk_inet.sk;

	sk = (struct sock *)msk;

	lock_sock(sk);



	err = __mptcp_subflow_connect(sk, &addr_l, &addr_r);
@@ -403,7 +403,7 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct genl_info *info) 
		goto destroy_err;

	}



	sk = &msk->sk.icsk_inet.sk;

	sk = (struct sock *)msk;

	lock_sock(sk);

	ssk = mptcp_nl_find_ssk(msk, &addr_l, &addr_r);

	if (ssk) {

net/mptcp/protocol.c

+13 −21
Original line number Diff line number Diff line
@@ -1602,7 +1602,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags) 
		__mptcp_check_send_data_fin(sk);

}



static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk)

static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk, bool first)

{

	struct mptcp_sock *msk = mptcp_sk(sk);

	struct mptcp_sendmsg_info info = {
@@ -1611,7 +1611,6 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk) 
	struct mptcp_data_frag *dfrag;

	struct sock *xmit_ssk;

	int len, copied = 0;

	bool first = true;



	info.flags = 0;

	while ((dfrag = mptcp_send_head(sk))) {
@@ -1621,11 +1620,10 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk) 
		while (len > 0) {

			int ret = 0;



			/* the caller already invoked the packet scheduler,

			 * check for a different subflow usage only after

			/* check for a different subflow usage only after

			 * spooling the first chunk of data

			 */

			xmit_ssk = first ? ssk : mptcp_subflow_get_send(mptcp_sk(sk));

			xmit_ssk = first ? ssk : mptcp_subflow_get_send(msk);

			if (!xmit_ssk)

				goto out;

			if (xmit_ssk != ssk) {
@@ -2275,7 +2273,7 @@ bool __mptcp_retransmit_pending_data(struct sock *sk) 
	struct mptcp_data_frag *cur, *rtx_head;

	struct mptcp_sock *msk = mptcp_sk(sk);



	if (__mptcp_check_fallback(mptcp_sk(sk)))

	if (__mptcp_check_fallback(msk))

		return false;



	if (tcp_rtx_and_write_queues_empty(sk))
@@ -2456,7 +2454,7 @@ static bool mptcp_check_close_timeout(const struct sock *sk) 
static void mptcp_check_fastclose(struct mptcp_sock *msk)

{

	struct mptcp_subflow_context *subflow, *tmp;

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

	struct sock *sk = (struct sock *)msk;



	if (likely(!READ_ONCE(msk->rcv_fastclose)))

		return;
@@ -2618,7 +2616,7 @@ static void mptcp_do_fastclose(struct sock *sk) 
static void mptcp_worker(struct work_struct *work)

{

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

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

	struct sock *sk = (struct sock *)msk;

	unsigned long fail_tout;

	int state;
@@ -2949,7 +2947,7 @@ bool __mptcp_close(struct sock *sk, long timeout) 


	sock_hold(sk);

	pr_debug("msk=%p state=%d", sk, sk->sk_state);

	if (mptcp_sk(sk)->token)

	if (msk->token)

		mptcp_event(MPTCP_EVENT_CLOSED, msk, NULL, GFP_KERNEL);



	if (sk->sk_state == TCP_CLOSE) {
@@ -3008,8 +3006,8 @@ static int mptcp_disconnect(struct sock *sk, int flags) 
	mptcp_stop_timer(sk);

	sk_stop_timer(sk, &sk->sk_timer);



	if (mptcp_sk(sk)->token)

		mptcp_event(MPTCP_EVENT_CLOSED, mptcp_sk(sk), NULL, GFP_KERNEL);

	if (msk->token)

		mptcp_event(MPTCP_EVENT_CLOSED, msk, NULL, GFP_KERNEL);



	/* msk->subflow is still intact, the following will not free the first

	 * subflow
@@ -3220,17 +3218,11 @@ void __mptcp_check_push(struct sock *sk, struct sock *ssk) 
	if (!mptcp_send_head(sk))

		return;



	if (!sock_owned_by_user(sk)) {

		struct sock *xmit_ssk = mptcp_subflow_get_send(mptcp_sk(sk));



		if (xmit_ssk == ssk)

			__mptcp_subflow_push_pending(sk, ssk);

		else if (xmit_ssk)

			mptcp_subflow_delegate(mptcp_subflow_ctx(xmit_ssk), MPTCP_DELEGATE_SEND);

	} else {

	if (!sock_owned_by_user(sk))

		__mptcp_subflow_push_pending(sk, ssk, false);

	else

		__set_bit(MPTCP_PUSH_PENDING, &mptcp_sk(sk)->cb_flags);

}

}



#define MPTCP_FLAGS_PROCESS_CTX_NEED (BIT(MPTCP_PUSH_PENDING) | \

				      BIT(MPTCP_RETRANSMIT) | \
@@ -3320,7 +3312,7 @@ void mptcp_subflow_process_delegated(struct sock *ssk) 
	if (test_bit(MPTCP_DELEGATE_SEND, &subflow->delegated_status)) {

		mptcp_data_lock(sk);

		if (!sock_owned_by_user(sk))

			__mptcp_subflow_push_pending(sk, ssk);

			__mptcp_subflow_push_pending(sk, ssk, true);

		else

			__set_bit(MPTCP_PUSH_PENDING, &mptcp_sk(sk)->cb_flags);

		mptcp_data_unlock(sk);

net/mptcp/sockopt.c

+2 −2
Original line number Diff line number Diff line
@@ -987,7 +987,7 @@ static int mptcp_getsockopt_tcpinfo(struct mptcp_sock *msk, char __user *optval, 
				    int __user *optlen)

{

	struct mptcp_subflow_context *subflow;

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

	struct sock *sk = (struct sock *)msk;

	unsigned int sfcount = 0, copied = 0;

	struct mptcp_subflow_data sfd;

	char __user *infoptr;
@@ -1078,8 +1078,8 @@ static void mptcp_get_sub_addrs(const struct sock *sk, struct mptcp_subflow_addr 
static int mptcp_getsockopt_subflow_addrs(struct mptcp_sock *msk, char __user *optval,

					  int __user *optlen)

{

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

	struct mptcp_subflow_context *subflow;

	struct sock *sk = (struct sock *)msk;

	unsigned int sfcount = 0, copied = 0;

	struct mptcp_subflow_data sfd;

	char __user *addrptr;

net/mptcp/token.c

+2 −2
Original line number Diff line number Diff line
@@ -287,8 +287,8 @@ EXPORT_SYMBOL_GPL(mptcp_token_get_sock); 
 * This function returns the first mptcp connection structure found inside the

 * token container starting from the specified position, or NULL.

 *

 * On successful iteration, the iterator is move to the next position and the

 * the acquires a reference to the returned socket.

 * On successful iteration, the iterator is moved to the next position and

 * a reference to the returned socket is acquired.

 */

struct mptcp_sock *mptcp_token_iter_next(const struct net *net, long *s_slot,

					 long *s_num)

tools/testing/selftests/net/mptcp/simult_flows.sh

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ do_transfer() 


	timeout ${timeout_test} \

		ip netns exec ${ns3} \

			./mptcp_connect -jt ${timeout_poll} -l -p $port -T $time \

			./mptcp_connect -jt ${timeout_poll} -l -p $port -T $max_time \

				0.0.0.0 < "$sin" > "$sout" &

	local spid=$!
@@ -181,7 +181,7 @@ do_transfer() 


	timeout ${timeout_test} \

		ip netns exec ${ns1} \

			./mptcp_connect -jt ${timeout_poll} -p $port -T $time \

			./mptcp_connect -jt ${timeout_poll} -p $port -T $max_time \

				10.0.3.3 < "$cin" > "$cout" &

	local cpid=$!