Commit 5de7796d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mptcp-more-selftest-coverage-and-code-cleanup-for-net-next' 

Mat Martineau says:

====================
mptcp: More selftest coverage and code cleanup for net-next

Patches 1-5 and 7-8 add selftest coverage (and an associated subflow
counter in the kernel) to validate the recently-updated handling of
subflows with ID 0.

Patch 6 renames a label in the userspace path manager for clarity.

Patches 9-11 and 13-15 factor out common selftest code by moving certain
functions to mptcp_lib.sh

Patch 12 makes sure the random data file generated for selftest
payloads has the intended size.

v3: https://lore.kernel.org/r/20231115-send-net-next-2023107-v3-0-1ef58145a882@kernel.org
v2: https://lore.kernel.org/r/20231114-send-net-next-2023107-v2-0-b650a477362c@kernel.org
v1: https://lore.kernel.org/r/20231027-send-net-next-2023107-v1-0-03eff9452957@kernel.org
====================

Link: https://lore.kernel.org/r/20231128-send-net-next-2023107-v4-0-8d6b94150f6b@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3d6d7549 9369777c

include/uapi/linux/mptcp.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ struct mptcp_info { 
	__u64	mptcpi_bytes_sent;

	__u64	mptcpi_bytes_received;

	__u64	mptcpi_bytes_acked;

	__u8	mptcpi_subflows_total;

};



/* MPTCP Reset reason codes, rfc8684 */

net/mptcp/pm_userspace.c

+4 −4
Original line number Diff line number Diff line
@@ -276,12 +276,12 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) 


	if (!mptcp_pm_is_userspace(msk)) {

		GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected");

		goto remove_err;

		goto out;

	}



	if (id_val == 0) {

		err = mptcp_userspace_pm_remove_id_zero_address(msk, info);

		goto remove_err;

		goto out;

	}



	lock_sock(sk);
@@ -296,7 +296,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) 
	if (!match) {

		GENL_SET_ERR_MSG(info, "address with specified id not found");

		release_sock(sk);

		goto remove_err;

		goto out;

	}



	list_move(&match->list, &free_list);
@@ -310,7 +310,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) 
	}



	err = 0;

 remove_err:

out:

	sock_put(sk);

	return err;

}

net/mptcp/protocol.h

+9 −0
Original line number Diff line number Diff line
@@ -1072,6 +1072,15 @@ static inline void __mptcp_do_fallback(struct mptcp_sock *msk) 
	set_bit(MPTCP_FALLBACK_DONE, &msk->flags);

}



static inline bool __mptcp_has_initial_subflow(const struct mptcp_sock *msk)

{

	struct sock *ssk = READ_ONCE(msk->first);



	return ssk && ((1 << inet_sk_state_load(ssk)) &

		       (TCPF_ESTABLISHED | TCPF_SYN_SENT |

			TCPF_SYN_RECV | TCPF_LISTEN));

}



static inline void mptcp_do_fallback(struct sock *ssk)

{

	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);

net/mptcp/sockopt.c

+2 −0
Original line number Diff line number Diff line
@@ -938,6 +938,8 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info) 
	info->mptcpi_bytes_sent = msk->bytes_sent;

	info->mptcpi_bytes_received = msk->bytes_received;

	info->mptcpi_bytes_retrans = msk->bytes_retrans;

	info->mptcpi_subflows_total = info->mptcpi_subflows +

		__mptcp_has_initial_subflow(msk);

	unlock_sock_fast(sk, slow);

}

EXPORT_SYMBOL_GPL(mptcp_diag_fill_info);

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

+3 −20
Original line number Diff line number Diff line
@@ -182,23 +182,6 @@ chk_msk_inuse() 
	__chk_nr get_msk_inuse $expected "$msg" 0

}



# $1: ns, $2: port

wait_local_port_listen()

{

	local listener_ns="${1}"

	local port="${2}"



	local port_hex i



	port_hex="$(printf "%04X" "${port}")"

	for i in $(seq 10); do

		ip netns exec "${listener_ns}" cat /proc/net/tcp | \

			awk "BEGIN {rc=1} {if (\$2 ~ /:${port_hex}\$/ && \$4 ~ /0A/) {rc=0; exit}} END {exit rc}" &&

			break

		sleep 0.1

	done

}



wait_connected()

{

	local listener_ns="${1}"
@@ -222,7 +205,7 @@ echo "a" | \ 
		ip netns exec $ns \

			./mptcp_connect -p 10000 -l -t ${timeout_poll} -w 20 \

				0.0.0.0 >/dev/null &

wait_local_port_listen $ns 10000

mptcp_lib_wait_local_port_listen $ns 10000

chk_msk_nr 0 "no msk on netns creation"

chk_msk_listen 10000
@@ -245,7 +228,7 @@ echo "a" | \ 
		ip netns exec $ns \

			./mptcp_connect -p 10001 -l -s TCP -t ${timeout_poll} -w 20 \

				0.0.0.0 >/dev/null &

wait_local_port_listen $ns 10001

mptcp_lib_wait_local_port_listen $ns 10001

echo "b" | \

	timeout ${timeout_test} \

		ip netns exec $ns \
@@ -266,7 +249,7 @@ for I in `seq 1 $NR_CLIENTS`; do 
				./mptcp_connect -p $((I+10001)) -l -w 20 \

					-t ${timeout_poll} 0.0.0.0 >/dev/null &

done

wait_local_port_listen $ns $((NR_CLIENTS + 10001))

mptcp_lib_wait_local_port_listen $ns $((NR_CLIENTS + 10001))



for I in `seq 1 $NR_CLIENTS`; do

	echo "b" | \