Commit 74c05b9f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mptcp-misc-updates-for-tests-lock-annotation' 

Mat Martineau says:

====================
mptcp: Misc. updates for tests & lock annotation

Here are two fixes we've collected in the mptcp tree.

Patch 1 refactors a MPTCP selftest script to allow running a subset of
the tests.

Patch 2 adds some locking & might_sleep assertations.
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 502c65af 3abc05d9

net/mptcp/pm.c

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, 


	pr_debug("msk=%p, local_id=%d", msk, addr->id);



	lockdep_assert_held(&msk->pm.lock);



	if (add_addr) {

		pr_warn("addr_signal error, add_addr=%d", add_addr);

		return -EINVAL;

net/mptcp/pm_netlink.c

+13 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ select_local_address(const struct pm_nl_pernet *pernet, 
	struct mptcp_pm_addr_entry *entry, *ret = NULL;

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



	msk_owned_by_me(msk);



	rcu_read_lock();

	__mptcp_flush_join_list(msk);

	list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) {
@@ -246,6 +248,8 @@ lookup_anno_list_by_saddr(struct mptcp_sock *msk, 
{

	struct mptcp_pm_add_entry *entry;



	lockdep_assert_held(&msk->pm.lock);



	list_for_each_entry(entry, &msk->pm.anno_list, list) {

		if (addresses_equal(&entry->addr, addr, true))

			return entry;
@@ -342,6 +346,8 @@ static bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, 
	struct sock *sk = (struct sock *)msk;

	struct net *net = sock_net(sk);



	lockdep_assert_held(&msk->pm.lock);



	if (lookup_anno_list_by_saddr(msk, &entry->addr))

		return false;
@@ -496,6 +502,9 @@ void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk) 
{

	struct mptcp_subflow_context *subflow;



	msk_owned_by_me(msk);

	lockdep_assert_held(&msk->pm.lock);



	if (!mptcp_pm_should_add_signal(msk))

		return;
@@ -566,6 +575,8 @@ void mptcp_pm_nl_rm_addr_received(struct mptcp_sock *msk) 


	pr_debug("address rm_id %d", msk->pm.rm_id);



	msk_owned_by_me(msk);



	if (!msk->pm.rm_id)

		return;
@@ -601,6 +612,8 @@ void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, u8 rm_id) 


	pr_debug("subflow rm_id %d", rm_id);



	msk_owned_by_me(msk);



	if (!rm_id)

		return;

net/mptcp/protocol.c

+4 −0
Original line number Diff line number Diff line
@@ -2187,6 +2187,8 @@ static void __mptcp_close_subflow(struct mptcp_sock *msk) 
{

	struct mptcp_subflow_context *subflow, *tmp;



	might_sleep();



	list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {

		struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
@@ -2529,6 +2531,8 @@ static void __mptcp_destroy_sock(struct sock *sk) 


	pr_debug("msk=%p", msk);



	might_sleep();



	/* dispose the ancillatory tcp socket, if any */

	if (msk->subflow) {

		iput(SOCK_INODE(msk->subflow));

net/mptcp/protocol.h

+5 −0
Original line number Diff line number Diff line
@@ -288,6 +288,11 @@ struct mptcp_sock { 
#define mptcp_for_each_subflow(__msk, __subflow)			\

	list_for_each_entry(__subflow, &((__msk)->conn_list), node)



static inline void msk_owned_by_me(const struct mptcp_sock *msk)

{

	sock_owned_by_me((const struct sock *)msk);

}



static inline struct mptcp_sock *mptcp_sk(const struct sock *sk)

{

	return (struct mptcp_sock *)sk;

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

+590 −478
Original line number Diff line number Diff line
@@ -680,26 +680,19 @@ chk_prio_nr() 
	fi

}



sin=$(mktemp)

sout=$(mktemp)

cin=$(mktemp)

cinsent=$(mktemp)

cout=$(mktemp)

init

make_file "$cin" "client" 1

make_file "$sin" "server" 1

trap cleanup EXIT



subflows_tests()

{

	reset

	run_tests $ns1 $ns2 10.0.1.1

	chk_join_nr "no JOIN" "0" "0" "0"



# subflow limted by client

	# subflow limited by client

	reset

	ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow

	run_tests $ns1 $ns2 10.0.1.1

	chk_join_nr "single subflow, limited by client" 0 0 0



# subflow limted by server

	# subflow limited by server

	reset

	ip netns exec $ns2 ./pm_nl_ctl limits 0 1

	ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
@@ -731,7 +724,10 @@ ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow 
	ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow

	run_tests $ns1 $ns2 10.0.1.1

	chk_join_nr "multiple subflows, limited by server" 2 2 1

}



signal_address_tests()

{

	# add_address, unused

	reset

	ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
@@ -771,7 +767,10 @@ ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow 
	run_tests $ns1 $ns2 10.0.1.1

	chk_join_nr "multiple subflows and signal" 3 3 3

	chk_add_nr 1 1

}



link_failure_tests()

{

	# accept and use add_addr with additional subflows and link loss

	reset

	ip netns exec $ns1 ./pm_nl_ctl limits 0 3
@@ -782,7 +781,10 @@ ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow 
	run_tests $ns1 $ns2 10.0.1.1 1

	chk_join_nr "multiple flows, signal, link failure" 3 3 3

	chk_add_nr 1 1

}



add_addr_timeout_tests()

{

	# add_addr timeout

	reset_with_add_addr_timeout

	ip netns exec $ns1 ./pm_nl_ctl limits 0 1
@@ -792,6 +794,18 @@ run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow 
	chk_join_nr "signal address, ADD_ADDR timeout" 1 1 1

	chk_add_nr 4 0



	# add_addr timeout IPv6

	reset_with_add_addr_timeout 6

	ip netns exec $ns1 ./pm_nl_ctl limits 0 1

	ip netns exec $ns2 ./pm_nl_ctl limits 1 1

	ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal

	run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow

	chk_join_nr "signal address, ADD_ADDR6 timeout" 1 1 1

	chk_add_nr 4 0

}



remove_tests()

{

	# single subflow, remove

	reset

	ip netns exec $ns1 ./pm_nl_ctl limits 0 1
@@ -855,7 +869,10 @@ run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow 
	chk_join_nr "flush subflows and signal" 3 3 3

	chk_add_nr 1 1

	chk_rm_nr 2 2

}



add_tests()

{

	# add single subflow

	reset

	ip netns exec $ns1 ./pm_nl_ctl limits 0 1
@@ -892,7 +909,10 @@ ip netns exec $ns2 ./pm_nl_ctl limits 2 2 
	run_tests $ns1 $ns2 dead:beef:1::1 0 2 0 slow

	chk_join_nr "add multiple addresses IPv6" 2 2 2

	chk_add_nr 2 2

}



ipv6_tests()

{

	# subflow IPv6

	reset

	ip netns exec $ns1 ./pm_nl_ctl limits 0 1
@@ -917,15 +937,6 @@ run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow 
	chk_join_nr "single address IPv6" 1 1 1

	chk_add_nr 1 1



# add_addr timeout IPv6

reset_with_add_addr_timeout 6

ip netns exec $ns1 ./pm_nl_ctl limits 0 1

ip netns exec $ns2 ./pm_nl_ctl limits 1 1

ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal

run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow

chk_join_nr "signal address, ADD_ADDR6 timeout" 1 1 1

chk_add_nr 4 0



	# single address IPv6, remove

	reset

	ip netns exec $ns1 ./pm_nl_ctl limits 0 1
@@ -946,7 +957,10 @@ run_tests $ns1 $ns2 dead:beef:1::1 0 -1 -1 slow 
	chk_join_nr "remove subflow and signal IPv6" 2 2 2

	chk_add_nr 1 1

	chk_rm_nr 1 1

}



v4mapped_tests()

{

	# subflow IPv4-mapped to IPv4-mapped

	reset

	ip netns exec $ns1 ./pm_nl_ctl limits 0 1
@@ -1021,7 +1035,10 @@ ip netns exec $ns2 ./pm_nl_ctl limits 0 1 
	ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow

	run_tests $ns1 $ns2 dead:beef:1::1

	chk_join_nr "no JOIN with diff families v6-v4" 0 0 0

}



backup_tests()

{

	# single subflow, backup

	reset

	ip netns exec $ns1 ./pm_nl_ctl limits 0 1
@@ -1040,7 +1057,10 @@ run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup 
	chk_join_nr "single address, backup" 1 1 1

	chk_add_nr 1 1

	chk_prio_nr 1 0

}



add_addr_ports_tests()

{

	# signal address with port

	reset

	ip netns exec $ns1 ./pm_nl_ctl limits 0 1
@@ -1112,7 +1132,10 @@ ip netns exec $ns2 ./pm_nl_ctl limits 2 2 
	run_tests $ns1 $ns2 10.0.1.1

	chk_join_nr "multiple addresses with ports" 2 2 2

	chk_add_nr 2 2 2

}



syncookies_tests()

{

	# single subflow, syncookies

	reset_with_cookies

	ip netns exec $ns1 ./pm_nl_ctl limits 0 1
@@ -1168,5 +1191,94 @@ ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow 
	run_tests $ns1 $ns2 10.0.1.1

	chk_join_nr "subflows and signal w. cookies" 3 3 3

	chk_add_nr 1 1

}



all_tests()

{

	subflows_tests

	signal_address_tests

	link_failure_tests

	add_addr_timeout_tests

	remove_tests

	add_tests

	ipv6_tests

	v4mapped_tests

	backup_tests

	add_addr_ports_tests

	syncookies_tests

}



usage()

{

	echo "mptcp_join usage:"

	echo "  -f subflows_tests"

	echo "  -s signal_address_tests"

	echo "  -l link_failure_tests"

	echo "  -t add_addr_timeout_tests"

	echo "  -r remove_tests"

	echo "  -a add_tests"

	echo "  -6 ipv6_tests"

	echo "  -4 v4mapped_tests"

	echo "  -b backup_tests"

	echo "  -p add_addr_ports_tests"

	echo "  -c syncookies_tests"

	echo "  -h help"

}



sin=$(mktemp)

sout=$(mktemp)

cin=$(mktemp)

cinsent=$(mktemp)

cout=$(mktemp)

init

make_file "$cin" "client" 1

make_file "$sin" "server" 1

trap cleanup EXIT



if [ -z $1 ]; then

	all_tests

	exit $ret

fi



while getopts 'fsltra64bpch' opt; do

	case $opt in

		f)

			subflows_tests

			;;

		s)

			signal_address_tests

			;;

		l)

			link_failure_tests

			;;

		t)

			add_addr_timeout_tests

			;;

		r)

			remove_tests

			;;

		a)

			add_tests

			;;

		6)

			ipv6_tests

			;;

		4)

			v4mapped_tests

			;;

		b)

			backup_tests

			;;

		p)

			add_addr_ports_tests

			;;

		c)

			syncookies_tests

			;;

		h | *)

			usage

			;;

	esac

done



exit $ret