This is a note to let you know that I've just added the patch titled
selftests: mptcp: join: stop transfer when check is done (part 2)
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
selftests-mptcp-join-stop-transfer-when-check-is-done-part-2.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 04b57c9e096a9479fe0ad31e3956e336fa589cb2 Mon Sep 17 00:00:00 2001
From: "Matthieu Baerts (NGI0)" <matttbe@xxxxxxxxxx>
Date: Wed, 31 Jan 2024 22:49:54 +0100
Subject: selftests: mptcp: join: stop transfer when check is done (part 2)
From: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
commit 04b57c9e096a9479fe0ad31e3956e336fa589cb2 upstream.
Since the "Fixes" commits mentioned below, the newly added "userspace
pm" subtests of mptcp_join selftests are launching the whole transfer in
the background, do the required checks, then wait for the end of
transfer.
There is no need to wait longer, especially because the checks at the
end of the transfer are ignored (which is fine). This saves quite a few
seconds on slow environments.
While at it, use 'mptcp_lib_kill_wait()' helper everywhere, instead of
on a specific one with 'kill_tests_wait()'.
Fixes: b2e2248f365a ("selftests: mptcp: userspace pm create id 0 subflow")
Fixes: e3b47e460b4b ("selftests: mptcp: userspace pm remove initial subflow")
Fixes: b9fb176081fb ("selftests: mptcp: userspace pm send RM_ADDR for ID 0")
Cc: stable@xxxxxxxxxxxxxxx
Reviewed-and-tested-by: Geliang Tang <geliang@xxxxxxxxxx>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20240131-upstream-net-20240131-mptcp-ci-issues-v1-9-4c1c11e571ff@xxxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -688,13 +688,6 @@ kill_events_pids()
mptcp_lib_kill_wait $evts_ns2_pid
}
-kill_tests_wait()
-{
- #shellcheck disable=SC2046
- kill -SIGUSR1 $(ip netns pids $ns2) $(ip netns pids $ns1)
- wait
-}
-
pm_nl_set_limits()
{
local ns=$1
@@ -3463,7 +3456,8 @@ endpoint_tests()
pm_nl_set_limits $ns2 2 2
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
speed=slow \
- run_tests $ns1 $ns2 10.0.1.1 2>/dev/null &
+ run_tests $ns1 $ns2 10.0.1.1 &
+ local tests_pid=$!
wait_mpj $ns1
pm_nl_check_endpoint "creation" \
@@ -3478,7 +3472,7 @@ endpoint_tests()
pm_nl_add_endpoint $ns2 10.0.2.2 flags signal
pm_nl_check_endpoint "modif is allowed" \
$ns2 10.0.2.2 id 1 flags signal
- kill_tests_wait
+ mptcp_lib_kill_wait $tests_pid
fi
if reset "delete and re-add" &&
@@ -3487,7 +3481,8 @@ endpoint_tests()
pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow
test_linkfail=4 speed=20 \
- run_tests $ns1 $ns2 10.0.1.1 2>/dev/null &
+ run_tests $ns1 $ns2 10.0.1.1 &
+ local tests_pid=$!
wait_mpj $ns2
chk_subflow_nr "before delete" 2
@@ -3502,7 +3497,7 @@ endpoint_tests()
wait_mpj $ns2
chk_subflow_nr "after re-add" 2
chk_mptcp_info subflows 1 subflows 1
- kill_tests_wait
+ mptcp_lib_kill_wait $tests_pid
fi
}
Patches currently in stable-queue which might be from matttbe@xxxxxxxxxx are
queue-6.6/mptcp-fix-more-tx-path-fields-initialization.patch
queue-6.6/selftests-mptcp-diag-fix-bash-warnings-on-older-kernels.patch
queue-6.6/selftests-mptcp-pm-nl-also-list-skipped-tests.patch
queue-6.6/selftests-mptcp-diag-unique-cestab-subtest-names.patch
queue-6.6/mptcp-userspace-pm-send-rm_addr-for-id-0.patch
queue-6.6/mptcp-fix-lockless-access-in-subflow-ulp-diag.patch
queue-6.6/mptcp-use-mptcp_set_state.patch
queue-6.6/selftests-mptcp-pm-nl-avoid-error-msg-on-older-kernels.patch
queue-6.6/selftests-mptcp-diag-unique-in-use-subtest-names.patch
queue-6.6/selftests-mptcp-join-stop-transfer-when-check-is-done-part-2.patch
queue-6.6/mptcp-add-currestab-mib-counter-support.patch
queue-6.6/mptcp-corner-case-locking-for-rx-path-fields-initial.patch
queue-6.6/mptcp-add-needs_id-for-netlink-appending-addr.patch
queue-6.6/selftests-mptcp-diag-check-currestab-counters.patch
queue-6.6/selftests-mptcp-join-stop-transfer-when-check-is-done-part-1.patch
queue-6.6/selftests-mptcp-add-mptcp_lib_get_counter.patch
queue-6.6/selftests-mptcp-simult-flows-fix-some-subtest-names.patch
queue-6.6/mptcp-fix-data-races-on-remote_id.patch
queue-6.6/selftests-mptcp-userspace_pm-unique-subtest-names.patch
queue-6.6/mptcp-fix-duplicate-subflow-creation.patch
queue-6.6/mptcp-fix-data-races-on-local_id.patch
queue-6.6/mptcp-add-needs_id-for-userspace-appending-addr.patch
