[PATCH mptcp-net] selftests: mptcp: fix MP_FAIL test-case

Paolo Abeni posted 1 patch 3 years, 4 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/multipath-tcp/mptcp_net-next tags/patchew/a4e7a052279a027da6721d59dbd293b0bb7e08cf.1651248223.git.pabeni@redhat.com
Maintainers: Matthieu Baerts <matthieu.baerts@tessares.net>, Paolo Abeni <pabeni@redhat.com>, Mat Martineau <mathew.j.martineau@linux.intel.com>, Jakub Kicinski <kuba@kernel.org>, "David S. Miller" <davem@davemloft.net>, Shuah Khan <shuah@kernel.org>
There is a newer version of this series
tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH mptcp-net] selftests: mptcp: fix MP_FAIL test-case
Posted by Paolo Abeni 3 years, 4 months ago
The mentioned tests sometimes fails because the data
transfer completes before any packet is sent on the 2nd
link (the failing one).

Address the issue reducing the "virtual" b/w available
on the primary link.

Fixes: bfd4cdbe7032 ("selftests: mptcp: add MP_FAIL reset testcase")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
together with the previous patch this fixes issues/265 for
good here. I'm not adding the Close tag due to the mentioned
dep, which may take a different/longer route
---
 tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index a98fee834950..0d65295c1b33 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -2734,7 +2734,7 @@ 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
+		tc -n $ns2 qdisc add dev ns2eth1 root netem rate 10mbit delay 5
 		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
-- 
2.35.1


Re: [PATCH mptcp-net] selftests: mptcp: fix MP_FAIL test-case
Posted by Mat Martineau 3 years, 4 months ago
On Fri, 29 Apr 2022, Paolo Abeni wrote:

> The mentioned tests sometimes fails because the data
> transfer completes before any packet is sent on the 2nd
> link (the failing one).
>
> Address the issue reducing the "virtual" b/w available
> on the primary link.
>
> Fixes: bfd4cdbe7032 ("selftests: mptcp: add MP_FAIL reset testcase")
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> ---
> together with the previous patch this fixes issues/265 for
> good here. I'm not adding the Close tag due to the mentioned
> dep, which may take a different/longer route
> ---
> tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> index a98fee834950..0d65295c1b33 100755
> --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> @@ -2734,7 +2734,7 @@ 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
> +		tc -n $ns2 qdisc add dev ns2eth1 root netem rate 10mbit delay 5

The "MP_FAIL MP_RST" test still fails within a couple of minutes on my 
desktop with this change. I changed 10mbit to 1mbit and so far it is still 
running. You ok with slowing it down even more?

> 		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
> -- 
> 2.35.1
>
>
>

--
Mat Martineau
Intel

Re: [PATCH mptcp-net] selftests: mptcp: fix MP_FAIL test-case
Posted by Paolo Abeni 3 years, 4 months ago
Hello,

On Fri, 2022-04-29 at 12:46 -0700, Mat Martineau wrote:
> On Fri, 29 Apr 2022, Paolo Abeni wrote:
> 
> > The mentioned tests sometimes fails because the data
> > transfer completes before any packet is sent on the 2nd
> > link (the failing one).
> > 
> > Address the issue reducing the "virtual" b/w available
> > on the primary link.
> > 
> > Fixes: bfd4cdbe7032 ("selftests: mptcp: add MP_FAIL reset testcase")
> > Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> > ---
> > together with the previous patch this fixes issues/265 for
> > good here. I'm not adding the Close tag due to the mentioned
> > dep, which may take a different/longer route
> > ---
> > tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> > index a98fee834950..0d65295c1b33 100755
> > --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> > +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> > @@ -2734,7 +2734,7 @@ 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
> > +		tc -n $ns2 qdisc add dev ns2eth1 root netem rate 10mbit delay 5
> 
> The "MP_FAIL MP_RST" test still fails within a couple of minutes on my 
> desktop with this change. I changed 10mbit to 1mbit and so far it is still 
> running. You ok with slowing it down even more?

[sorry I almost missed this comment]. Just to be sure, is such test
running on top of the pedit patch? (we need both of them). Otherwise no
objection to reduce the rate even more.

Thanks!

Paolo



Re: [PATCH mptcp-net] selftests: mptcp: fix MP_FAIL test-case
Posted by Mat Martineau 3 years, 4 months ago
On Tue, 3 May 2022, Paolo Abeni wrote:

> Hello,
>
> On Fri, 2022-04-29 at 12:46 -0700, Mat Martineau wrote:
>> On Fri, 29 Apr 2022, Paolo Abeni wrote:
>>
>>> The mentioned tests sometimes fails because the data
>>> transfer completes before any packet is sent on the 2nd
>>> link (the failing one).
>>>
>>> Address the issue reducing the "virtual" b/w available
>>> on the primary link.
>>>
>>> Fixes: bfd4cdbe7032 ("selftests: mptcp: add MP_FAIL reset testcase")
>>> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
>>> ---
>>> together with the previous patch this fixes issues/265 for
>>> good here. I'm not adding the Close tag due to the mentioned
>>> dep, which may take a different/longer route
>>> ---
>>> tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
>>> index a98fee834950..0d65295c1b33 100755
>>> --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
>>> +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
>>> @@ -2734,7 +2734,7 @@ 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
>>> +		tc -n $ns2 qdisc add dev ns2eth1 root netem rate 10mbit delay 5
>>
>> The "MP_FAIL MP_RST" test still fails within a couple of minutes on my
>> desktop with this change. I changed 10mbit to 1mbit and so far it is still
>> running. You ok with slowing it down even more?
>
> [sorry I almost missed this comment]. Just to be sure, is such test
> running on top of the pedit patch? (we need both of them). Otherwise no
> objection to reduce the rate even more.
>

Yes, I was testing with both patches applied.

--
Mat Martineau
Intel

Re: [PATCH mptcp-net] selftests: mptcp: fix MP_FAIL test-case
Posted by Mat Martineau 3 years, 4 months ago
On Fri, 29 Apr 2022, Paolo Abeni wrote:

> The mentioned tests sometimes fails because the data
> transfer completes before any packet is sent on the 2nd
> link (the failing one).
>
> Address the issue reducing the "virtual" b/w available
> on the primary link.
>
> Fixes: bfd4cdbe7032 ("selftests: mptcp: add MP_FAIL reset testcase")
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> ---
> together with the previous patch this fixes issues/265 for
> good here. I'm not adding the Close tag due to the mentioned
> dep, which may take a different/longer route
> ---
> tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> index a98fee834950..0d65295c1b33 100755
> --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> @@ -2734,7 +2734,7 @@ 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
> +		tc -n $ns2 qdisc add dev ns2eth1 root netem rate 10mbit delay 5
> 		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
> -- 
> 2.35.1
>
>
>

I'm assuming this patch is supposed to be tagged for mptcp-next, since 
fail_tests() is not in the net branch?


--
Mat Martineau
Intel