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 1) 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-1.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 31ee4ad86afd6ed6f4bb1b38c43011216080c42a Mon Sep 17 00:00:00 2001 From: "Matthieu Baerts (NGI0)" <matttbe@xxxxxxxxxx> Date: Wed, 31 Jan 2024 22:49:53 +0100 Subject: selftests: mptcp: join: stop transfer when check is done (part 1) From: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx> commit 31ee4ad86afd6ed6f4bb1b38c43011216080c42a upstream. Since the "Fixes" commit mentioned below, "userspace pm" subtests of mptcp_join selftests introduced in v6.5 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 in slow environments. Note that old versions will need commit bdbef0a6ff10 ("selftests: mptcp: add mptcp_lib_kill_wait") as well to get 'mptcp_lib_kill_wait()' helper. Fixes: 4369c198e599 ("selftests: mptcp: test userspace pm out of transfer") Cc: stable@xxxxxxxxxxxxxxx # 6.5.x: bdbef0a6ff10: selftests: mptcp: add mptcp_lib_kill_wait Cc: stable@xxxxxxxxxxxxxxx # 6.5.x 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-8-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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3430,7 +3430,7 @@ userspace_tests() chk_rm_nr 1 1 invert chk_mptcp_info subflows 0 subflows 0 kill_events_pids - wait $tests_pid + mptcp_lib_kill_wait $tests_pid fi # userspace pm create destroy subflow @@ -3449,7 +3449,7 @@ userspace_tests() chk_rm_nr 1 1 chk_mptcp_info subflows 0 subflows 0 kill_events_pids - wait $tests_pid + 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