Skip to contentSkip to conversation

mptcp: create subflow for newly added address and testcases

PATCH Superseded Geliang Tang 4 participants 11 messages Dec 18, 2020 – Jan 5, 2021

Subsystems (3)

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Geliang Tang

author
#0 lore raw

v2 cover mptcp: create subflow for newly added address and testcases

v2:
- drop the unused addr parameter in mptcp_nl_add_subflow_or_signal_addr
- use the pernet *_max values in mptcp_pm_create_subflow_or_signal_addr
instead of the per-msk values.

Address issue 19 "let PM netlink update live sockets on local addresses list change". The removed addresses part of this issue is done, this patchset only implemented the added addresses part.

Geliang Tang (3):
mptcp: create subflow or signal addr for newly added address
selftests: mptcp: use minus value for removing address numbers
selftests: mptcp: add testcases for newly added addresses

 net/mptcp/pm_netlink.c                        |  43 ++++++--
 .../testing/selftests/net/mptcp/mptcp_join.sh | 101 +++++++++++++++---
 2 files changed, 123 insertions(+), 21 deletions(-)
Signature · 1 line
2.29.2
author
#1 lore raw

PATCH v2 1/3 mptcp: create subflow or signal addr for newly added address

Currently, when a new MPTCP endpoint is added, the existing MPTCP sockets are not affected.

This patch implemented a new function mptcp_nl_add_subflow_or_signal_addr, invoked when an address is added from PM netlink. This function traversed the MPTCP sockets list and invoked mptcp_pm_create_subflow_or_signal_addr to try to create a subflow or signal an address for the newly added address, if local constraint allows that.

Signed-off-by Geliang Tang <geliangtang(a)gmail.com>
---
 net/mptcp/pm_netlink.c | 43 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)
net/mptcp/pm_netlink.c +37 -6
index 9c688023f494..96993ded911c 100644
@@ -316,17 +316,21 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk)
 	struct mptcp_addr_info remote = { 0 };
 	struct sock *sk = (struct sock *)msk;
 	struct mptcp_pm_addr_entry *local;
+	unsigned int add_addr_signal_max;
+	unsigned int local_addr_max;
 	struct pm_nl_pernet *pernet;
 
 	pernet = net_generic(sock_net(sk), pm_nl_pernet_id);
+	add_addr_signal_max = READ_ONCE(pernet->add_addr_signal_max);
+	local_addr_max = READ_ONCE(pernet->local_addr_max);
 
 	pr_debug("local %d:%d signal %d:%d subflows %d:%d\n",
-		 msk->pm.local_addr_used, msk->pm.local_addr_max,
-		 msk->pm.add_addr_signaled, msk->pm.add_addr_signal_max,
+		 msk->pm.local_addr_used, local_addr_max,
+		 msk->pm.add_addr_signaled, add_addr_signal_max,
 		 msk->pm.subflows, msk->pm.subflows_max);
 
 	/* check first for announce */
-	if (msk->pm.add_addr_signaled < msk->pm.add_addr_signal_max) {
+	if (msk->pm.add_addr_signaled < add_addr_signal_max) {
 		local = select_signal_address(pernet,
 					      msk->pm.add_addr_signaled);
 
@@ -338,14 +342,14 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk)
 			}
 		} else {
 			/* pick failed, avoid fourther attempts later */
-			msk->pm.local_addr_used = msk->pm.add_addr_signal_max;
+			msk->pm.local_addr_used = add_addr_signal_max;
 		}
 
 		check_work_pending(msk);
 	}
 
 	/* check if should create a new subflow */
-	if (msk->pm.local_addr_used < msk->pm.local_addr_max &&
+	if (msk->pm.local_addr_used < local_addr_max &&
 	    msk->pm.subflows < msk->pm.subflows_max) {
 		remote_address((struct sock_common *)sk, &remote);
 
@@ -361,7 +365,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk)
 		}
 
 		/* lookup failed, avoid fourther attempts later */
-		msk->pm.local_addr_used = msk->pm.local_addr_max;
+		msk->pm.local_addr_used = local_addr_max;
 		check_work_pending(msk);
 	}
 }
@@ -793,6 +797,31 @@ static struct pm_nl_pernet *genl_info_pm_nl(struct genl_info *info)
 	return net_generic(genl_info_net(info), pm_nl_pernet_id);
 }
 
+static int mptcp_nl_add_subflow_or_signal_addr(struct net *net)
+{
+	struct mptcp_sock *msk;
+	long s_slot = 0, s_num = 0;
+
+	while ((msk = mptcp_token_iter_next(net, &s_slot, &s_num)) != NULL) {
+		struct sock *sk = (struct sock *)msk;
+
+		if (!READ_ONCE(msk->fully_established))
+			goto next;
+
+		lock_sock(sk);
+		spin_lock_bh(&msk->pm.lock);
+		mptcp_pm_create_subflow_or_signal_addr(msk);
+		spin_unlock_bh(&msk->pm.lock);
+		release_sock(sk);
+
+next:
+		sock_put(sk);
+		cond_resched();
+	}
+
+	return 0;
+}
+
 static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info)
 {
 	struct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR];
@@ -818,6 +847,8 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info)
 		return ret;
 	}
 
+	mptcp_nl_add_subflow_or_signal_addr(sock_net(skb->sk));
+
 	return 0;
 }
 
Signature · 1 line
2.29.2
author
#2 lore raw

PATCH v2 2/3 selftests: mptcp: use minus value for removing address numbers

This patch changed the remoing addresses numbers to minus value, left the plus one for the adding addresses numbers.

Signed-off-by Geliang Tang <geliangtang(a)gmail.com>
---
 .../testing/selftests/net/mptcp/mptcp_join.sh | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +17 -15
index a9baed7ce837..cbc48ed5b267 100755
@@ -209,8 +209,8 @@ do_transfer()
 	srv_proto="$4"
 	connect_addr="$5"
 	test_link_fail="$6"
-	rm_nr_ns1="$7"
-	rm_nr_ns2="$8"
+	addr_nr_ns1="$7"
+	addr_nr_ns2="$8"
 	speed="$9"
 	bkup="${10}"
 
@@ -264,7 +264,8 @@ do_transfer()
 	fi
 	cpid=$!
 
-	if [ $rm_nr_ns1 -gt 0 ]; then
+	if [ $addr_nr_ns1 -lt 0 ]; then
+		let rm_nr_ns1=-addr_nr_ns1
 		if [ $rm_nr_ns1 -lt 8 ]; then
 			counter=1
 			sleep 1
@@ -281,7 +282,8 @@ do_transfer()
 		fi
 	fi
 
-	if [ $rm_nr_ns2 -gt 0 ]; then
+	if [ $addr_nr_ns2 -lt 0 ]; then
+		let rm_nr_ns2=-addr_nr_ns2
 		if [ $rm_nr_ns2 -lt 8 ]; then
 			counter=1
 			sleep 1
@@ -368,8 +370,8 @@ run_tests()
 	connector_ns="$2"
 	connect_addr="$3"
 	test_linkfail="${4:-0}"
-	rm_nr_ns1="${5:-0}"
-	rm_nr_ns2="${6:-0}"
+	addr_nr_ns1="${5:-0}"
+	addr_nr_ns2="${6:-0}"
 	speed="${7:-fast}"
 	bkup="${8:-""}"
 	lret=0
@@ -386,7 +388,7 @@ run_tests()
 	fi
 
 	do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} \
-		${test_linkfail} ${rm_nr_ns1} ${rm_nr_ns2} ${speed} ${bkup}
+		${test_linkfail} ${addr_nr_ns1} ${addr_nr_ns2} ${speed} ${bkup}
 	lret=$?
 
 	if [ "$test_linkfail" -eq 1 ];then
@@ -677,7 +679,7 @@ reset
 ip netns exec $ns1 ./pm_nl_ctl limits 0 1
 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 10.0.1.1 0 0 1 slow
+run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow
 chk_join_nr "remove single subflow" 1 1 1
 chk_rm_nr 1 1
 
@@ -687,7 +689,7 @@ ip netns exec $ns1 ./pm_nl_ctl limits 0 2
 ip netns exec $ns2 ./pm_nl_ctl limits 0 2
 ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow
 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
-run_tests $ns1 $ns2 10.0.1.1 0 0 2 slow
+run_tests $ns1 $ns2 10.0.1.1 0 0 -2 slow
 chk_join_nr "remove multiple subflows" 2 2 2
 chk_rm_nr 2 2
 
@@ -696,7 +698,7 @@ reset
 ip netns exec $ns1 ./pm_nl_ctl limits 0 1
 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
 ip netns exec $ns2 ./pm_nl_ctl limits 1 1
-run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow
+run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow
 chk_join_nr "remove single address" 1 1 1
 chk_add_nr 1 1
 chk_rm_nr 0 0
@@ -707,7 +709,7 @@ ip netns exec $ns1 ./pm_nl_ctl limits 0 2
 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
 ip netns exec $ns2 ./pm_nl_ctl limits 1 2
 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
-run_tests $ns1 $ns2 10.0.1.1 0 1 1 slow
+run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow
 chk_join_nr "remove subflow and signal" 2 2 2
 chk_add_nr 1 1
 chk_rm_nr 1 1
@@ -719,7 +721,7 @@ ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
 ip netns exec $ns2 ./pm_nl_ctl limits 1 3
 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
 ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow
-run_tests $ns1 $ns2 10.0.1.1 0 1 2 slow
+run_tests $ns1 $ns2 10.0.1.1 0 -1 -2 slow
 chk_join_nr "remove subflows and signal" 3 3 3
 chk_add_nr 1 1
 chk_rm_nr 2 2
@@ -731,7 +733,7 @@ ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
 ip netns exec $ns2 ./pm_nl_ctl limits 1 3
 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
 ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow
-run_tests $ns1 $ns2 10.0.1.1 0 8 8 slow
+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
@@ -774,7 +776,7 @@ reset
 ip netns exec $ns1 ./pm_nl_ctl limits 0 1
 ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal
 ip netns exec $ns2 ./pm_nl_ctl limits 1 1
-run_tests $ns1 $ns2 dead:beef:1::1 0 1 0 slow
+run_tests $ns1 $ns2 dead:beef:1::1 0 -1 0 slow
 chk_join_nr "remove single address IPv6" 1 1 1
 chk_add_nr 1 1
 chk_rm_nr 0 0
@@ -785,7 +787,7 @@ ip netns exec $ns1 ./pm_nl_ctl limits 0 2
 ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal
 ip netns exec $ns2 ./pm_nl_ctl limits 1 2
 ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 flags subflow
-run_tests $ns1 $ns2 dead:beef:1::1 0 1 1 slow
+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
Signature · 1 line
2.29.2
author
#3 lore raw

PATCH v2 3/3 selftests: mptcp: add testcases for newly added addresses

This patch added the testcases to create subflows or signal addresses for the newly added IPv4 or IPv6 addresses.

Signed-off-by Geliang Tang <geliangtang(a)gmail.com>
---
 .../testing/selftests/net/mptcp/mptcp_join.sh | 73 ++++++++++++++++++-
 1 file changed, 71 insertions(+), 2 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +71 -2
index cbc48ed5b267..ef0b008c09c6 100755
@@ -264,7 +264,23 @@ do_transfer()
 	fi
 	cpid=$!
 
-	if [ $addr_nr_ns1 -lt 0 ]; then
+	if [ $addr_nr_ns1 -gt 0 ]; then
+		let add_nr_ns1=addr_nr_ns1
+		counter=2
+		sleep 1
+		while [ $add_nr_ns1 -gt 0 ]; do
+			local addr
+			if is_v6 "${connect_addr}"; then
+				addr="dead:beef:$counter::1"
+			else
+				addr="10.0.$counter.1"
+			fi
+			ip netns exec $ns1 ./pm_nl_ctl add $addr flags signal
+			let counter+=1
+			let add_nr_ns1-=1
+		done
+		sleep 1
+	elif [ $addr_nr_ns1 -lt 0 ]; then
 		let rm_nr_ns1=-addr_nr_ns1
 		if [ $rm_nr_ns1 -lt 8 ]; then
 			counter=1
@@ -282,7 +298,23 @@ do_transfer()
 		fi
 	fi
 
-	if [ $addr_nr_ns2 -lt 0 ]; then
+	if [ $addr_nr_ns2 -gt 0 ]; then
+		let add_nr_ns2=addr_nr_ns2
+		counter=3
+		sleep 1
+		while [ $add_nr_ns2 -gt 0 ]; do
+			local addr
+			if is_v6 "${connect_addr}"; then
+				addr="dead:beef:$counter::2"
+			else
+				addr="10.0.$counter.2"
+			fi
+			ip netns exec $ns2 ./pm_nl_ctl add $addr flags subflow
+			let counter+=1
+			let add_nr_ns2-=1
+		done
+		sleep 1
+	elif [ $addr_nr_ns2 -lt 0 ]; then
 		let rm_nr_ns2=-addr_nr_ns2
 		if [ $rm_nr_ns2 -lt 8 ]; then
 			counter=1
@@ -738,6 +770,43 @@ chk_join_nr "flush subflows and signal" 3 3 3
 chk_add_nr 1 1
 chk_rm_nr 2 2
 
+# add single subflow
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 1
+ip netns exec $ns2 ./pm_nl_ctl limits 0 1
+run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow
+chk_join_nr "add single subflow" 1 1 1
+
+# add signal address
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 1
+ip netns exec $ns2 ./pm_nl_ctl limits 1 1
+run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow
+chk_join_nr "add signal address" 1 1 1
+chk_add_nr 1 1
+
+# add multiple subflows
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 2
+ip netns exec $ns2 ./pm_nl_ctl limits 0 2
+run_tests $ns1 $ns2 10.0.1.1 0 0 2 slow
+chk_join_nr "add multiple subflows" 2 2 2
+
+# add multiple subflows IPv6
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 2
+ip netns exec $ns2 ./pm_nl_ctl limits 0 2
+run_tests $ns1 $ns2 dead:beef:1::1 0 0 2 slow
+chk_join_nr "add multiple subflows IPv6" 2 2 2
+
+# add multiple addresses IPv6
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 2
+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
+
 # subflow IPv6
 reset
 ip netns exec $ns1 ./pm_nl_ctl limits 0 1
Signature · 1 line
2.29.2
#8 lore raw
In reply to Geliang Tang
Quoted 5 lines · Geliang Tang

v2:
- drop the unused addr parameter in mptcp_nl_add_subflow_or_signal_addr
- use the pernet *_max values in mptcp_pm_create_subflow_or_signal_addr instead of the per-msk values.

Paolo, do you think the per-msk add_addr_signal_max and local_addr_max are still needed? It's not clear to me what having pernet and per-msk copies of those values will help accomplish.

Quoted 6 lines

Address issue 19 "let PM netlink update live sockets on local addresses list change". The removed addresses part of this issue is done, this patchset only implemented the added addresses part.

Quoted 11 lines

Geliang Tang (3):
mptcp: create subflow or signal addr for newly added address
selftests: mptcp: use minus value for removing address numbers
selftests: mptcp: add testcases for newly added addresses

net/mptcp/pm_netlink.c | 43 ++++++--
.../testing/selftests/net/mptcp/mptcp_join.sh | 101 +++++++++++++++---

2 files changed, 123 insertions(+), 21 deletions(-)
Signature · 1 line
2.29.2

--
Mat Martineau
Intel

#9 lore raw
Quoted 11 lines · Mat Martineau
Quoted 5 lines · Geliang Tang

v2:
- drop the unused addr parameter in mptcp_nl_add_subflow_or_signal_addr
- use the pernet *_max values in mptcp_pm_create_subflow_or_signal_addr instead of the per-msk values.

Paolo, do you think the per-msk add_addr_signal_max and local_addr_max are still needed? It's not clear to me what having pernet and per-msk copies of those values will help accomplish.

Well, that was likely overdesign on my side. I thought it would be easier and/or faster have the limit avail in each msk. It looks like it's not really the case. I think the same consideration applies to ' local_addr_max' and 'subflows_max' so I guess we can drop all the 'pm.*max' fields.

(in a separate patch)

Thanks!

Paolo

#4 lore raw

[MPTCP] Re: [MPTCP][PATCH v2 mptcp-next 3/3] selftests: mptcp: add testcases for newly added addresses

In reply to Geliang Tang
Quoted 96 lines · Geliang Tang

This patch added the testcases to create subflows or signal addresses for the newly added IPv4 or IPv6 addresses.

Signed-off-by Geliang Tang <geliangtang(a)gmail.com>
---
 .../testing/selftests/net/mptcp/mptcp_join.sh | 73 ++++++++++++++++++-
 1 file changed, 71 insertions(+), 2 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +64 -2
index cbc48ed5b267..ef0b008c09c6 100755
@@ -264,7 +264,23 @@ do_transfer()
 	fi
 	cpid=$!
 
-	if [ $addr_nr_ns1 -lt 0 ]; then
+	if [ $addr_nr_ns1 -gt 0 ]; then
+		let add_nr_ns1=addr_nr_ns1
+		counter=2
+		sleep 1
+		while [ $add_nr_ns1 -gt 0 ]; do
+			local addr
+			if is_v6 "${connect_addr}"; then
+				addr="dead:beef:$counter::1"
+			else
+				addr="10.0.$counter.1"
+			fi
+			ip netns exec $ns1 ./pm_nl_ctl add $addr flags signal
+			let counter+=1
+			let add_nr_ns1-=1
+		done
+		sleep 1
+	elif [ $addr_nr_ns1 -lt 0 ]; then
 		let rm_nr_ns1=-addr_nr_ns1
 		if [ $rm_nr_ns1 -lt 8 ]; then
 			counter=1
@@ -282,7 +298,23 @@ do_transfer()
 		fi
 	fi
 
-	if [ $addr_nr_ns2 -lt 0 ]; then
+	if [ $addr_nr_ns2 -gt 0 ]; then
+		let add_nr_ns2=addr_nr_ns2
+		counter=3
+		sleep 1
+		while [ $add_nr_ns2 -gt 0 ]; do
+			local addr
+			if is_v6 "${connect_addr}"; then
+				addr="dead:beef:$counter::2"
+			else
+				addr="10.0.$counter.2"
+			fi
+			ip netns exec $ns2 ./pm_nl_ctl add $addr flags subflow
+			let counter+=1
+			let add_nr_ns2-=1
+		done
+		sleep 1
+	elif [ $addr_nr_ns2 -lt 0 ]; then
 		let rm_nr_ns2=-addr_nr_ns2
 		if [ $rm_nr_ns2 -lt 8 ]; then
 			counter=1
@@ -738,6 +770,43 @@ chk_join_nr "flush subflows and signal" 3 3 3
 chk_add_nr 1 1
 chk_rm_nr 2 2
 
+# add single subflow
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 1
+ip netns exec $ns2 ./pm_nl_ctl limits 0 1
+run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow
+chk_join_nr "add single subflow" 1 1 1
+
+# add signal address
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 1
+ip netns exec $ns2 ./pm_nl_ctl limits 1 1
+run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow
+chk_join_nr "add signal address" 1 1 1
+chk_add_nr 1 1
+
+# add multiple subflows
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 2
+ip netns exec $ns2 ./pm_nl_ctl limits 0 2
+run_tests $ns1 $ns2 10.0.1.1 0 0 2 slow
+chk_join_nr "add multiple subflows" 2 2 2
+
+# add multiple subflows IPv6
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 2
+ip netns exec $ns2 ./pm_nl_ctl limits 0 2
+run_tests $ns1 $ns2 dead:beef:1::1 0 0 2 slow
+chk_join_nr "add multiple subflows IPv6" 2 2 2
+
+# add multiple addresses IPv6

tools/testing/selftests/net/mptcp/mptcp_join.sh chk_join_nr "flush subflows and signal" 3 3 3 · line 812

Quoted 10 lines
tools/testing/selftests/net/mptcp/mptcp_join.sh +7 -0
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 2
+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
+
 # subflow IPv6
 reset
 ip netns exec $ns1 ./pm_nl_ctl limits 0 1

The new tests are all good!

Side note: I fear that mptcp_join.sh is becoming too big, containing many different/quite unrelated tests.

Perhaps we could split it in smaller chunk ?!? e.g. all subflows only test, all other addr related tests, syncookies

/P

#5 lore raw

[MPTCP] Re: [MPTCP][PATCH v2 mptcp-next 3/3] selftests: mptcp: add testcases for newly added addresses

Quoted 6 lines · Paolo Abeni
Quoted 5 lines · Geliang Tang

This patch added the testcases to create subflows or signal addresses for the newly added IPv4 or IPv6 addresses.

Signed-off-by Geliang Tang <geliangtang(a)gmail.com>

---

[...]

Quoted 5 lines

Side note: I fear that mptcp_join.sh is becoming too big, containing many different/quite unrelated tests.

Perhaps we could split it in smaller chunk ?!? e.g. all subflows only test, all other addr related tests, syncookies

also, it would be nice to allow running a single test item in standalone (I had a small patch for that somewhere, let me see if I can find it :) )

we might also think about decommissioning pm_nl_ctl and use iproute2 instead, wdyt?

Signature · 1 line
davide
author
#10 lore raw
In reply to Paolo Abeni

Hi Paolo,

Quoted 14 lines · Paolo Abeni <pabeni(a)redhat.com> 于2020年12月22日周二 下午5:48写道:
Quoted 11 lines · Mat Martineau
Quoted 5 lines · Geliang Tang

v2:
- drop the unused addr parameter in mptcp_nl_add_subflow_or_signal_addr
- use the pernet *_max values in mptcp_pm_create_subflow_or_signal_addr instead of the per-msk values.

Paolo, do you think the per-msk add_addr_signal_max and local_addr_max are still needed? It's not clear to me what having pernet and per-msk copies of those values will help accomplish.

Quoted 8 lines

Well, that was likely overdesign on my side. I thought it would be easier and/or faster have the limit avail in each msk. It looks like it's not really the case. I think the same consideration applies to ' local_addr_max' and 'subflows_max' so I guess we can drop all the 'pm.*max' fields.

(in a separate patch)

Thanks for your suggestion, I'll write a new patch to drop those *max fields.

-Geliang

Quoted 4 lines

Thanks!

Paolo

author
#6 lore raw

[MPTCP] Re: [MPTCP][PATCH v2 mptcp-next 3/3] selftests: mptcp: add testcases for newly added addresses

In reply to Paolo Abeni

Hi Paolo,

Quoted 112 lines · Paolo Abeni <pabeni(a)redhat.com> 于2020年12月22日周二 下午5:56写道:
Quoted 96 lines · Geliang Tang

This patch added the testcases to create subflows or signal addresses for the newly added IPv4 or IPv6 addresses.

Signed-off-by Geliang Tang <geliangtang(a)gmail.com>
---
 .../testing/selftests/net/mptcp/mptcp_join.sh | 73 ++++++++++++++++++-
 1 file changed, 71 insertions(+), 2 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +64 -2
index cbc48ed5b267..ef0b008c09c6 100755
@@ -264,7 +264,23 @@ do_transfer()
      fi
      cpid=$!
 
-     if [ $addr_nr_ns1 -lt 0 ]; then
+     if [ $addr_nr_ns1 -gt 0 ]; then
+             let add_nr_ns1=addr_nr_ns1
+             counter=2
+             sleep 1
+             while [ $add_nr_ns1 -gt 0 ]; do
+                     local addr
+                     if is_v6 "${connect_addr}"; then
+                             addr="dead:beef:$counter::1"
+                     else
+                             addr="10.0.$counter.1"
+                     fi
+                     ip netns exec $ns1 ./pm_nl_ctl add $addr flags signal
+                     let counter+=1
+                     let add_nr_ns1-=1
+             done
+             sleep 1
+     elif [ $addr_nr_ns1 -lt 0 ]; then
              let rm_nr_ns1=-addr_nr_ns1
              if [ $rm_nr_ns1 -lt 8 ]; then
                      counter=1
@@ -282,7 +298,23 @@ do_transfer()
              fi
      fi
 
-     if [ $addr_nr_ns2 -lt 0 ]; then
+     if [ $addr_nr_ns2 -gt 0 ]; then
+             let add_nr_ns2=addr_nr_ns2
+             counter=3
+             sleep 1
+             while [ $add_nr_ns2 -gt 0 ]; do
+                     local addr
+                     if is_v6 "${connect_addr}"; then
+                             addr="dead:beef:$counter::2"
+                     else
+                             addr="10.0.$counter.2"
+                     fi
+                     ip netns exec $ns2 ./pm_nl_ctl add $addr flags subflow
+                     let counter+=1
+                     let add_nr_ns2-=1
+             done
+             sleep 1
+     elif [ $addr_nr_ns2 -lt 0 ]; then
              let rm_nr_ns2=-addr_nr_ns2
              if [ $rm_nr_ns2 -lt 8 ]; then
                      counter=1
@@ -738,6 +770,43 @@ chk_join_nr "flush subflows and signal" 3 3 3
 chk_add_nr 1 1
 chk_rm_nr 2 2
 
+# add single subflow
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 1
+ip netns exec $ns2 ./pm_nl_ctl limits 0 1
+run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow
+chk_join_nr "add single subflow" 1 1 1
+
+# add signal address
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 1
+ip netns exec $ns2 ./pm_nl_ctl limits 1 1
+run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow
+chk_join_nr "add signal address" 1 1 1
+chk_add_nr 1 1
+
+# add multiple subflows
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 2
+ip netns exec $ns2 ./pm_nl_ctl limits 0 2
+run_tests $ns1 $ns2 10.0.1.1 0 0 2 slow
+chk_join_nr "add multiple subflows" 2 2 2
+
+# add multiple subflows IPv6
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 2
+ip netns exec $ns2 ./pm_nl_ctl limits 0 2
+run_tests $ns1 $ns2 dead:beef:1::1 0 0 2 slow
+chk_join_nr "add multiple subflows IPv6" 2 2 2
+
+# add multiple addresses IPv6

tools/testing/selftests/net/mptcp/mptcp_join.sh chk_join_nr "flush subflows and signal" 3 3 3 · line 812

Quoted 10 lines
tools/testing/selftests/net/mptcp/mptcp_join.sh +7 -0
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 2
+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
+
 # subflow IPv6
 reset
 ip netns exec $ns1 ./pm_nl_ctl limits 0 1

The new tests are all good!

Quoted 5 lines

Side note: I fear that mptcp_join.sh is becoming too big, containing many different/quite unrelated tests.

Perhaps we could split it in smaller chunk ?!? e.g. all subflows only test, all other addr related tests, syncookies

Thanks for your suggestion, I'll write a patch to split mptcp_join.sh script.

-Geliang

Quoted 3 lines

/P

author
#7 lore raw

[MPTCP] Re: [MPTCP][PATCH v2 mptcp-next 3/3] selftests: mptcp: add testcases for newly added addresses

Hi Paolo,

Quoted 116 lines · Geliang Tang <geliangtang(a)gmail.com> 于2020年12月23日周三 下午6:41写道:

Hi Paolo,

Quoted 112 lines · Paolo Abeni <pabeni(a)redhat.com> 于2020年12月22日周二 下午5:56写道:
Quoted 96 lines · Geliang Tang

This patch added the testcases to create subflows or signal addresses for the newly added IPv4 or IPv6 addresses.

Signed-off-by Geliang Tang <geliangtang(a)gmail.com>
---
 .../testing/selftests/net/mptcp/mptcp_join.sh | 73 ++++++++++++++++++-
 1 file changed, 71 insertions(+), 2 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +64 -2
index cbc48ed5b267..ef0b008c09c6 100755
@@ -264,7 +264,23 @@ do_transfer()
      fi
      cpid=$!
 
-     if [ $addr_nr_ns1 -lt 0 ]; then
+     if [ $addr_nr_ns1 -gt 0 ]; then
+             let add_nr_ns1=addr_nr_ns1
+             counter=2
+             sleep 1
+             while [ $add_nr_ns1 -gt 0 ]; do
+                     local addr
+                     if is_v6 "${connect_addr}"; then
+                             addr="dead:beef:$counter::1"
+                     else
+                             addr="10.0.$counter.1"
+                     fi
+                     ip netns exec $ns1 ./pm_nl_ctl add $addr flags signal
+                     let counter+=1
+                     let add_nr_ns1-=1
+             done
+             sleep 1
+     elif [ $addr_nr_ns1 -lt 0 ]; then
              let rm_nr_ns1=-addr_nr_ns1
              if [ $rm_nr_ns1 -lt 8 ]; then
                      counter=1
@@ -282,7 +298,23 @@ do_transfer()
              fi
      fi
 
-     if [ $addr_nr_ns2 -lt 0 ]; then
+     if [ $addr_nr_ns2 -gt 0 ]; then
+             let add_nr_ns2=addr_nr_ns2
+             counter=3
+             sleep 1
+             while [ $add_nr_ns2 -gt 0 ]; do
+                     local addr
+                     if is_v6 "${connect_addr}"; then
+                             addr="dead:beef:$counter::2"
+                     else
+                             addr="10.0.$counter.2"
+                     fi
+                     ip netns exec $ns2 ./pm_nl_ctl add $addr flags subflow
+                     let counter+=1
+                     let add_nr_ns2-=1
+             done
+             sleep 1
+     elif [ $addr_nr_ns2 -lt 0 ]; then
              let rm_nr_ns2=-addr_nr_ns2
              if [ $rm_nr_ns2 -lt 8 ]; then
                      counter=1
@@ -738,6 +770,43 @@ chk_join_nr "flush subflows and signal" 3 3 3
 chk_add_nr 1 1
 chk_rm_nr 2 2
 
+# add single subflow
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 1
+ip netns exec $ns2 ./pm_nl_ctl limits 0 1
+run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow
+chk_join_nr "add single subflow" 1 1 1
+
+# add signal address
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 1
+ip netns exec $ns2 ./pm_nl_ctl limits 1 1
+run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow
+chk_join_nr "add signal address" 1 1 1
+chk_add_nr 1 1
+
+# add multiple subflows
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 2
+ip netns exec $ns2 ./pm_nl_ctl limits 0 2
+run_tests $ns1 $ns2 10.0.1.1 0 0 2 slow
+chk_join_nr "add multiple subflows" 2 2 2
+
+# add multiple subflows IPv6
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 2
+ip netns exec $ns2 ./pm_nl_ctl limits 0 2
+run_tests $ns1 $ns2 dead:beef:1::1 0 0 2 slow
+chk_join_nr "add multiple subflows IPv6" 2 2 2
+
+# add multiple addresses IPv6

tools/testing/selftests/net/mptcp/mptcp_join.sh chk_join_nr "flush subflows and signal" 3 3 3 · line 812

Quoted 10 lines
tools/testing/selftests/net/mptcp/mptcp_join.sh +7 -0
+reset
+ip netns exec $ns1 ./pm_nl_ctl limits 0 2
+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
+
 # subflow IPv6
 reset
 ip netns exec $ns1 ./pm_nl_ctl limits 0 1

The new tests are all good!

Quoted 7 lines
Quoted 5 lines

Side note: I fear that mptcp_join.sh is becoming too big, containing many different/quite unrelated tests.

Perhaps we could split it in smaller chunk ?!? e.g. all subflows only test, all other addr related tests, syncookies

Thanks for your suggestion, I'll write a patch to split mptcp_join.sh script.

I have just sent out a patch named "selftests: mptcp: add command line arguments for mptcp_join.sh" into ML to split mptcp_join.sh. Please give me some suggestions about it.

Thanks.

-Geliang

Quoted 6 lines

-Geliang

Quoted 3 lines

/P