This is a note to let you know that I've just added the patch titled
selftests: mptcp: join: skip MPC backups tests if not supported
to the 6.1-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-skip-mpc-backups-tests-if-not-supported.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 632978f0a961b4591a05ba9e39eab24541d83e84 Mon Sep 17 00:00:00 2001
From: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
Date: Sat, 10 Jun 2023 18:11:49 +0200
Subject: selftests: mptcp: join: skip MPC backups tests if not supported
From: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
commit 632978f0a961b4591a05ba9e39eab24541d83e84 upstream.
Selftests are supposed to run on any kernels, including the old ones not
supporting all MPTCP features.
One of them is the support of sending an MP_PRIO signal for the initial
subflow, introduced by commit c157bbe776b7 ("mptcp: allow the in kernel
PM to set MPC subflow priority").
It is possible to look for "mptcp_subflow_send_ack" in kallsyms because
it was needed to introduce the mentioned feature. So we can know in
advance if the feature is supported instead of trying and accepting any
results.
Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368
Fixes: 914f6a59b10f ("selftests: mptcp: add MPC backup tests")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -2607,14 +2607,16 @@ backup_tests()
chk_prio_nr 1 1
fi
- if reset "mpc backup"; then
+ if reset "mpc backup" &&
+ continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
chk_join_nr 0 0 0
chk_prio_nr 0 1
fi
- if reset "mpc backup both sides"; then
+ if reset "mpc backup both sides" &&
+ continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow,backup
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
@@ -2622,14 +2624,16 @@ backup_tests()
chk_prio_nr 1 1
fi
- if reset "mpc switch to backup"; then
+ if reset "mpc switch to backup" &&
+ continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup
chk_join_nr 0 0 0
chk_prio_nr 0 1
fi
- if reset "mpc switch to backup both sides"; then
+ if reset "mpc switch to backup both sides" &&
+ continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup
Patches currently in stable-queue which might be from matthieu.baerts@xxxxxxxxxxxx are
queue-6.1/selftests-mptcp-join-fix-shellcheck-warnings.patch
queue-6.1/selftests-mptcp-join-support-rm_addr-for-used-endpoints-or-not.patch
queue-6.1/selftests-mptcp-pm-nl-skip-fullmesh-flag-checks-if-not-supported.patch
queue-6.1/selftests-mptcp-lib-skip-if-missing-symbol.patch
queue-6.1/selftests-mptcp-join-skip-fullmesh-flag-tests-if-not-supported.patch
queue-6.1/selftests-mptcp-join-skip-fastclose-tests-if-not-supported.patch
queue-6.1/selftests-mptcp-remove-duplicated-entries-in-usage.patch
queue-6.1/selftests-mptcp-sockopt-skip-getsockopt-checks-if-not-supported.patch
queue-6.1/selftests-mptcp-join-skip-backup-if-set-flag-on-id-not-supported.patch
queue-6.1/selftests-mptcp-userspace-pm-skip-if-ip-tool-is-unavailable.patch
queue-6.1/selftests-mptcp-join-helpers-to-skip-tests.patch
queue-6.1/selftests-mptcp-lib-skip-if-not-below-kernel-version.patch
queue-6.1/selftests-mptcp-userspace-pm-skip-if-not-supported.patch
queue-6.1/selftests-mptcp-join-skip-implicit-tests-if-not-supported.patch
queue-6.1/selftests-mptcp-sockopt-relax-expected-returned-size.patch
queue-6.1/selftests-mptcp-pm-nl-remove-hardcoded-default-limits.patch
queue-6.1/selftests-mptcp-join-skip-check-if-mib-counter-not-supported.patch
queue-6.1/selftests-mptcp-join-use-iptables-legacy-if-available.patch
queue-6.1/selftests-mptcp-join-support-local-endpoint-being-tracked-or-not.patch
queue-6.1/selftests-mptcp-connect-skip-transp-tests-if-not-supported.patch
queue-6.1/selftests-mptcp-join-skip-mpc-backups-tests-if-not-supported.patch
queue-6.1/selftests-mptcp-connect-skip-disconnect-tests-if-not-supported.patch
