This is a note to let you know that I've just added the patch titled
selftests: mptcp: diag: skip if MPTCP is not supported
to the 5.15-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-diag-skip-if-mptcp-is-not-supported.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 46565acdd29facbf418a11e4a3791b3c8967308d Mon Sep 17 00:00:00 2001
From: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
Date: Sun, 28 May 2023 19:35:30 +0200
Subject: selftests: mptcp: diag: skip if MPTCP is not supported
From: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
commit 46565acdd29facbf418a11e4a3791b3c8967308d upstream.
Selftests are supposed to run on any kernels, including the old ones not
supporting MPTCP.
A new check is then added to make sure MPTCP is supported. If not, the
test stops and is marked as "skipped".
Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368
Fixes: df62f2ec3df6 ("selftests/mptcp: add diag interface tests")
Cc: stable@xxxxxxxxxxxxxxx
Acked-by: Paolo Abeni <pabeni@xxxxxxxxxx>
Signed-off-by: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
Signed-off-by: Paolo Abeni <pabeni@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/testing/selftests/net/mptcp/diag.sh | 4 ++++
1 file changed, 4 insertions(+)
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -1,6 +1,8 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
+. "$(dirname "${0}")/mptcp_lib.sh"
+
rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
ns="ns1-$rndh"
ksft_skip=4
@@ -25,6 +27,8 @@ cleanup()
ip netns del $ns
}
+mptcp_lib_check_mptcp
+
ip -Version > /dev/null 2>&1
if [ $? -ne 0 ];then
echo "SKIP: Could not run test without ip tool"
Patches currently in stable-queue which might be from matthieu.baerts@xxxxxxxxxxxx are
queue-5.15/selftests-mptcp-connect-skip-if-mptcp-is-not-supported.patch
queue-5.15/selftests-mptcp-sockopt-skip-if-mptcp-is-not-supported.patch
queue-5.15/selftests-mptcp-simult-flows-skip-if-mptcp-is-not-supported.patch
queue-5.15/selftests-mptcp-join-skip-if-mptcp-is-not-supported.patch
queue-5.15/selftests-mptcp-pm-nl-skip-if-mptcp-is-not-supported.patch
queue-5.15/selftests-mptcp-diag-skip-if-mptcp-is-not-supported.patch
