[PATCH mptcp-next 0/2] mptcp: Squash-to patches for "mptcp: more fixes for the in-kernel PM"

[PATCH mptcp-next 0/2] mptcp: Squash-to patches for "mptcp: more fixes for the in-kernel PM"

[Matthieu Baerts (NGI0)]

These two small squash-to patches would avoid issues recently seen on
the Netdev CI when this series has been sent upstream.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Matthieu Baerts (NGI0) (2):
      Squash to "selftests: mptcp: join: check re-re-adding ID 0 endp"
      Squash to "selftests: mptcp: join: check re-re-adding ID 0 signal"

 tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
base-commit: a69c43e7eeeb5c959245dc2a20e6b41bc7afccb3
change-id: 20240827-selftests-mptcp-longer-tests-f3b30918add9

Best regards,
-- 
Matthieu Baerts (NGI0) <matttbe@kernel.org>

[PATCH mptcp-next 1/2] Squash to "selftests: mptcp: join: check re-re-adding ID 0 endp"

[Matthieu Baerts (NGI0)]

This will make "delete and re-add" MPTCP Join subtest longer.

This test is manipulating the endpoints while the connection runs in the
background. When all the manipulations are done, it stops (kills) the
connection. It is then fine to make the connection run for a longer time
by sending smaller chunks per batch, as it is anyway stopped when the
operations are over.

This modification is needed, because this test is doing more operations
now, and this causes the Netdev CI to fail, as reported by Jakub [1]. In
the logs [2], we can see that there is no more subflows for the
connections, plus we don't see the "read: Connection reset by peer"
message, telling us the connection has been killed. (Note that this
message is removed in "selftests: mptcp: join: mute errors when ran in
the background" patch, queued for net-next.)

We didn't see this error on our side, probably because we disable
CONFIG_SLUB_DEBUG_ON when using the debug kernel config, plus the Netdev
CI can be quite busy from time to time.

Link: https://lore.kernel.org/netdev/20240826192955.3dbb469d@kernel.org/ [1]
Link: https://netdev-3.bots.linux.dev/vmksft-mptcp-dbg/results/745102/1-mptcp-join-sh/stdout [2]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 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 321bc5caf7da..19abc3c1a7ae 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -3685,7 +3685,7 @@ endpoint_tests()
 		pm_nl_set_limits $ns2 0 3
 		pm_nl_add_endpoint $ns2 10.0.1.2 id 1 dev ns2eth1 flags subflow
 		pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow
-		{ test_linkfail=4 speed=20 \
+		{ test_linkfail=4 speed=5 \
 			run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
 		local tests_pid=$!
 

-- 
2.45.2

[PATCH mptcp-next 2/2] Squash to "selftests: mptcp: join: check re-re-adding ID 0 signal"

[Matthieu Baerts (NGI0)]

Just to align with the previous test (delete and re-add), here we do the
same for "delete re-add signal".

It doesn't seem to be an issue on the Netdev CI for the moment, but
better be safe than sorry. Plus, it doesn't change anything for the
test: the connection will run for longer, but it will be killed when all
operations have been done.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 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 19abc3c1a7ae..3564cd06643c 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -3762,7 +3762,7 @@ endpoint_tests()
 		# broadcast IP: no packet for this address will be received on ns1
 		pm_nl_add_endpoint $ns1 224.0.0.1 id 2 flags signal
 		pm_nl_add_endpoint $ns1 10.0.1.1 id 42 flags signal
-		{ test_linkfail=4 speed=20 \
+		{ test_linkfail=4 speed=5 \
 			run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
 		local tests_pid=$!
 

-- 
2.45.2

Re: [PATCH mptcp-next 0/2] mptcp: Squash-to patches for "mptcp: more fixes for the in-kernel PM"

[MPTCP CI]

Hi Matthieu,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal: Success! ✅
- KVM Validation: debug: Success! ✅
- KVM Validation: btf (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/10579504774

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/e5e931378c30
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=883825


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-normal

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)

Re: [PATCH mptcp-next 0/2] mptcp: Squash-to patches for "mptcp: more fixes for the in-kernel PM"

[Mat Martineau]

On Tue, 27 Aug 2024, Matthieu Baerts (NGI0) wrote:

> These two small squash-to patches would avoid issues recently seen on
> the Netdev CI when this series has been sent upstream.
>
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> ---
> Matthieu Baerts (NGI0) (2):
>      Squash to "selftests: mptcp: join: check re-re-adding ID 0 endp"
>      Squash to "selftests: mptcp: join: check re-re-adding ID 0 signal"

Hi Matthieu -

Both of these LGTM.

- Mat

>
> tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> ---
> base-commit: a69c43e7eeeb5c959245dc2a20e6b41bc7afccb3
> change-id: 20240827-selftests-mptcp-longer-tests-f3b30918add9
>
> Best regards,
> -- 
> Matthieu Baerts (NGI0) <matttbe@kernel.org>
>
>
>

Re: [PATCH mptcp-next 0/2] mptcp: Squash-to patches for "mptcp: more fixes for the in-kernel PM"

[Matthieu Baerts]

Hi Mat,

On 27/08/2024 22:09, Mat Martineau wrote:
> On Tue, 27 Aug 2024, Matthieu Baerts (NGI0) wrote:
> 
>> These two small squash-to patches would avoid issues recently seen on
>> the Netdev CI when this series has been sent upstream.
>>
>> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
>> ---
>> Matthieu Baerts (NGI0) (2):
>>      Squash to "selftests: mptcp: join: check re-re-adding ID 0 endp"
>>      Squash to "selftests: mptcp: join: check re-re-adding ID 0 signal"
> 
> Both of these LGTM.

Thank you for the quick review!

Now in our tree:

New patches for t/upstream-net and t/upstream:
- a3be3c7a08d5: "squashed" (with conflicts) in "selftests: mptcp: join:
check re-re-adding ID 0 endp"
- 59a371c37841: "squashed" (with conflicts) in "selftests: mptcp: join:
check re-re-adding ID 0 signal"
- 3e07a3bd7bfd: conflict in
t/selftests-mptcp-join-mute-errors-when-ran-in-the-background

Tests are now in progress:

- export-net:
https://github.com/multipath-tcp/mptcp_net-next/commit/a57f02c478c04a53ffd285d01d70908424ee4c3f/checks
- export:
https://github.com/multipath-tcp/mptcp_net-next/commit/c075d02b144c693f688166d40bbf4e087a094010/checks

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.