This is a note to let you know that I've just added the patch titled
selftests: mptcp: userspace_pm: unique subtest names
to the 6.7-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-userspace_pm-unique-subtest-names.patch
and it can be found in the queue-6.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 2ef0d804c090658960c008446523863fd7e3541e Mon Sep 17 00:00:00 2001
From: "Matthieu Baerts (NGI0)" <matttbe@xxxxxxxxxx>
Date: Thu, 15 Feb 2024 19:25:38 +0100
Subject: selftests: mptcp: userspace_pm: unique subtest names
From: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
commit 2ef0d804c090658960c008446523863fd7e3541e upstream.
It is important to have a unique (sub)test name in TAP, because some CI
environments drop tests with duplicated names.
Some subtests from the userspace_pm selftest had the same names. That's
because different subflows are created (and deleted) between the same
pair of IP addresses.
Simply adding the destination port in the name is then enough to have
different names, because the destination port is always different.
Note that adding such info takes a bit more space, so we need to
increase a bit the width to print the name, simply to keep all the
'[ OK ]' aligned as before.
Fixes: f589234e1af0 ("selftests: mptcp: userspace_pm: format subtests results in TAP")
Cc: stable@xxxxxxxxxxxxxxx
Reviewed-by: Geliang Tang <geliang@xxxxxxxxxx>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/testing/selftests/net/mptcp/userspace_pm.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -75,7 +75,7 @@ print_test()
{
test_name="${1}"
- _printf "%-63s" "${test_name}"
+ _printf "%-68s" "${test_name}"
}
print_results()
@@ -555,7 +555,7 @@ verify_subflow_events()
local remid
local info
- info="${e_saddr} (${e_from}) => ${e_daddr} (${e_to})"
+ info="${e_saddr} (${e_from}) => ${e_daddr}:${e_dport} (${e_to})"
if [ "$e_type" = "$SUB_ESTABLISHED" ]
then
Patches currently in stable-queue which might be from matttbe@xxxxxxxxxx are
queue-6.7/mptcp-fix-more-tx-path-fields-initialization.patch
queue-6.7/selftests-mptcp-diag-fix-bash-warnings-on-older-kernels.patch
queue-6.7/selftests-mptcp-pm-nl-also-list-skipped-tests.patch
queue-6.7/selftests-mptcp-diag-unique-cestab-subtest-names.patch
queue-6.7/mptcp-fix-lockless-access-in-subflow-ulp-diag.patch
queue-6.7/mptcp-use-mptcp_set_state.patch
queue-6.7/selftests-mptcp-pm-nl-avoid-error-msg-on-older-kernels.patch
queue-6.7/selftests-mptcp-diag-unique-in-use-subtest-names.patch
queue-6.7/mptcp-add-currestab-mib-counter-support.patch
queue-6.7/mptcp-corner-case-locking-for-rx-path-fields-initial.patch
queue-6.7/mptcp-add-needs_id-for-netlink-appending-addr.patch
queue-6.7/selftests-mptcp-diag-check-currestab-counters.patch
queue-6.7/selftests-mptcp-simult-flows-fix-some-subtest-names.patch
queue-6.7/mptcp-fix-data-races-on-remote_id.patch
queue-6.7/selftests-mptcp-userspace_pm-unique-subtest-names.patch
queue-6.7/mptcp-fix-duplicate-subflow-creation.patch
queue-6.7/mptcp-fix-data-races-on-local_id.patch
queue-6.7/mptcp-add-needs_id-for-userspace-appending-addr.patch
