* [PATCH mptcp-next 1/2] Squash to "selftests: mptcp: add the MP_FAIL testcases"
2022-04-01 15:31 [PATCH mptcp-next 0/2] split MP_FAIL testcases Geliang Tang
@ 2022-04-01 15:31 ` Geliang Tang
2022-04-01 15:31 ` [PATCH mptcp-next 2/2] selftests: mptcp: add MP_FAIL reset testcase Geliang Tang
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Geliang Tang @ 2022-04-01 15:31 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Drop the multiple subflows testcase, make this patch for the infinite
mapping only. Split the multiple subflows testcase into a new patch.
Please update the subject and commit log:
'''
selftests: mptcp: add infinite map testcase
Add the single subflow test case for MP_FAIL, to test the infinite
mapping case. Use the test_linkfail value to make 128KB test files.
Add a new function reset_with_fail(), in it use 'iptables' and 'tc
action pedit' rules to produce the bit flips to trigger the checksum
failures. Set validate_checksum to enable checksums for the MP_FAIL
tests without passing the '-C' argument. Set check_invert flag to
enable the invert bytes check for the output data in check_transfer().
Instead of the file mismatch error, this test prints out the inverted
bytes.
Add a new function pedit_action_pkts() to get the numbers of the packets
edited by the tc pedit actions. Print this numbers to the output.
Also add the needed kernel configures in the selftests config file.
'''
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 375b087edc7b..c7a26c40663f 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -2698,16 +2698,6 @@ pedit_action_pkts()
fail_tests()
{
- # multiple subflows
- if reset_with_fail "MP_FAIL MP_RST" 2; then
- tc -n $ns2 qdisc add dev ns2eth1 root netem rate 20mbit delay 1
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 10.0.2.2 dev ns2eth2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1 1024
- chk_join_nr 1 1 1 +1 +0 1 1 0 "$(pedit_action_pkts)"
- fi
-
# single subflow
if reset_with_fail "Infinite map" 1; then
run_tests $ns1 $ns2 10.0.1.1 128
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH mptcp-next 2/2] selftests: mptcp: add MP_FAIL reset testcase
2022-04-01 15:31 [PATCH mptcp-next 0/2] split MP_FAIL testcases Geliang Tang
2022-04-01 15:31 ` [PATCH mptcp-next 1/2] Squash to "selftests: mptcp: add the MP_FAIL testcases" Geliang Tang
@ 2022-04-01 15:31 ` Geliang Tang
2022-04-01 17:43 ` selftests: mptcp: add MP_FAIL reset testcase: Tests Results MPTCP CI
2022-04-01 23:14 ` [PATCH mptcp-next 0/2] split MP_FAIL testcases Mat Martineau
2022-04-02 10:44 ` Matthieu Baerts
3 siblings, 1 reply; 6+ messages in thread
From: Geliang Tang @ 2022-04-01 15:31 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Add the multiple subflows test case for MP_FAIL, to test the MP_FAIL
reset case. Use the test_linkfail value to make 1024KB test files.
Invoke reset_with_fail() to use 'iptables' and 'tc action pedit' rules
to produce the bit flips to trigger the checksum failures on ns2eth2.
Add delays on ns2eth1 to make sure more data can translate on ns2eth2.
The check_invert flag is enabled in reset_with_fail(), so this test
prints out the inverted bytes, instead of the file mismatch errors.
Invoke pedit_action_pkts() to get the numbers of the packets edited
by the tc pedit actions, and print this numbers to the output.
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index c7a26c40663f..14fd24459a5d 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -2704,6 +2704,16 @@ fail_tests()
chk_join_nr 0 0 0 +1 +0 1 0 1 "$(pedit_action_pkts)"
chk_fail_nr 1 -1 invert
fi
+
+ # multiple subflows
+ if reset_with_fail "MP_FAIL MP_RST" 2; then
+ tc -n $ns2 qdisc add dev ns2eth1 root netem rate 20mbit delay 1
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 10.0.2.2 dev ns2eth2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1 1024
+ chk_join_nr 1 1 1 +1 +0 1 1 0 "$(pedit_action_pkts)"
+ fi
}
userspace_tests()
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH mptcp-next 0/2] split MP_FAIL testcases
2022-04-01 15:31 [PATCH mptcp-next 0/2] split MP_FAIL testcases Geliang Tang
2022-04-01 15:31 ` [PATCH mptcp-next 1/2] Squash to "selftests: mptcp: add the MP_FAIL testcases" Geliang Tang
2022-04-01 15:31 ` [PATCH mptcp-next 2/2] selftests: mptcp: add MP_FAIL reset testcase Geliang Tang
@ 2022-04-01 23:14 ` Mat Martineau
2022-04-02 10:44 ` Matthieu Baerts
3 siblings, 0 replies; 6+ messages in thread
From: Mat Martineau @ 2022-04-01 23:14 UTC (permalink / raw)
To: Geliang Tang; +Cc: mptcp
On Fri, 1 Apr 2022, Geliang Tang wrote:
> Split MP_FAIL testcases into two patches:
>
> selftests: mptcp: add infinite map testcase
> selftests: mptcp: add MP_FAIL reset testcase
>
> The former can be upstreaming with the infinite map series, the latter
> stays on the export branch, waiting for the dropping bad data patches,
> and the fix for issue #265.
>
> Geliang Tang (2):
> Squash to "selftests: mptcp: add the MP_FAIL testcases"
> selftests: mptcp: add MP_FAIL reset testcase
>
> tools/testing/selftests/net/mptcp/mptcp_join.sh | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> --
> 2.34.1
Fine with me to split the commit, thanks Geliang.
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH mptcp-next 0/2] split MP_FAIL testcases
2022-04-01 15:31 [PATCH mptcp-next 0/2] split MP_FAIL testcases Geliang Tang
` (2 preceding siblings ...)
2022-04-01 23:14 ` [PATCH mptcp-next 0/2] split MP_FAIL testcases Mat Martineau
@ 2022-04-02 10:44 ` Matthieu Baerts
3 siblings, 0 replies; 6+ messages in thread
From: Matthieu Baerts @ 2022-04-02 10:44 UTC (permalink / raw)
To: Geliang Tang, Mat Martineau; +Cc: mptcp
Hi Geliang, Mat,
On 01/04/2022 17:31, Geliang Tang wrote:
> Split MP_FAIL testcases into two patches:
>
> selftests: mptcp: add infinite map testcase
> selftests: mptcp: add MP_FAIL reset testcase
>
> The former can be upstreaming with the infinite map series, the latter
> stays on the export branch, waiting for the dropping bad data patches,
> and the fix for issue #265.
Thank you for the patches and the reviews!
Now in our tree (feat. for net-next-next):
New patches for t/upstream:
- 0da1606b57c1: "squashed" patch 1/2 in "selftests: mptcp: add the
MP_FAIL testcases"
- d703a6233117: tg:msg: update requested by Geliang
- Results: c56ab3a9d998..aba96189ad1a (export)
- 4c7ac3a904ee: selftests: mptcp: add MP_FAIL reset testcase
- Results: aba96189ad1a..463bac3cb3eb (export)
Builds and tests are now in progress:
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220402T104349
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 6+ messages in thread