5.15-stable patches

added patches:
	selftests-mptcp-diag-skip-if-mptcp-is-not-supported.patch
	selftests-mptcp-join-skip-if-mptcp-is-not-supported.patch
	selftests-mptcp-simult-flows-skip-if-mptcp-is-not-supported.patch

diff --git a/queue-5.15/selftests-mptcp-diag-skip-if-mptcp-is-not-supported.patch b/queue-5.15/selftests-mptcp-diag-skip-if-mptcp-is-not-supported.patch
new file mode 100644 (file)
index 0000000..fde84e0
--- /dev/null
+++ b/queue-5.15/selftests-mptcp-diag-skip-if-mptcp-is-not-supported.patch
@@ -0,0 +1,46 @@
+From 46565acdd29facbf418a11e4a3791b3c8967308d Mon Sep 17 00:00:00 2001
+From: Matthieu Baerts <matthieu.baerts@tessares.net>
+Date: Sun, 28 May 2023 19:35:30 +0200
+Subject: selftests: mptcp: diag: skip if MPTCP is not supported
+
+From: Matthieu Baerts <matthieu.baerts@tessares.net>
+
+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@vger.kernel.org
+Acked-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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"

diff --git a/queue-5.15/selftests-mptcp-join-skip-if-mptcp-is-not-supported.patch b/queue-5.15/selftests-mptcp-join-skip-if-mptcp-is-not-supported.patch
new file mode 100644 (file)
index 0000000..1573933
--- /dev/null
+++ b/queue-5.15/selftests-mptcp-join-skip-if-mptcp-is-not-supported.patch
@@ -0,0 +1,46 @@
+From 715c78a82e00f848f99ef76e6f6b89216ccba268 Mon Sep 17 00:00:00 2001
+From: Matthieu Baerts <matthieu.baerts@tessares.net>
+Date: Sun, 28 May 2023 19:35:29 +0200
+Subject: selftests: mptcp: join: skip if MPTCP is not supported
+
+From: Matthieu Baerts <matthieu.baerts@tessares.net>
+
+commit 715c78a82e00f848f99ef76e6f6b89216ccba268 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: b08fbf241064 ("selftests: add test-cases for MPTCP MP_JOIN")
+Cc: stable@vger.kernel.org
+Acked-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/testing/selftests/net/mptcp/mptcp_join.sh |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
++++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
+@@ -1,6 +1,8 @@
+ #!/bin/bash
+ # SPDX-License-Identifier: GPL-2.0
+ 
++. "$(dirname "${0}")/mptcp_lib.sh"
++
+ ret=0
+ sin=""
+ sinfail=""
+@@ -161,6 +163,8 @@ reset_with_allow_join_id0()
+       ip netns exec $ns2 sysctl -q net.mptcp.allow_join_initial_addr_port=$ns2_enable
+ }
+ 
++mptcp_lib_check_mptcp
++
+ ip -Version > /dev/null 2>&1
+ if [ $? -ne 0 ];then
+       echo "SKIP: Could not run test without ip tool"

diff --git a/queue-5.15/selftests-mptcp-simult-flows-skip-if-mptcp-is-not-supported.patch b/queue-5.15/selftests-mptcp-simult-flows-skip-if-mptcp-is-not-supported.patch
new file mode 100644 (file)
index 0000000..ff9dfa9
--- /dev/null
+++ b/queue-5.15/selftests-mptcp-simult-flows-skip-if-mptcp-is-not-supported.patch
@@ -0,0 +1,46 @@
+From 9161f21c74a1a0e7bb39eb84ea0c86b23c92fc87 Mon Sep 17 00:00:00 2001
+From: Matthieu Baerts <matthieu.baerts@tessares.net>
+Date: Sun, 28 May 2023 19:35:31 +0200
+Subject: selftests: mptcp: simult flows: skip if MPTCP is not supported
+
+From: Matthieu Baerts <matthieu.baerts@tessares.net>
+
+commit 9161f21c74a1a0e7bb39eb84ea0c86b23c92fc87 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: 1a418cb8e888 ("mptcp: simult flow self-tests")
+Cc: stable@vger.kernel.org
+Acked-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/testing/selftests/net/mptcp/simult_flows.sh |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
++++ b/tools/testing/selftests/net/mptcp/simult_flows.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)
+ ns1="ns1-$rndh"
+ ns2="ns2-$rndh"
+@@ -32,6 +34,8 @@ cleanup()
+       done
+ }
+ 
++mptcp_lib_check_mptcp
++
+ ip -Version > /dev/null 2>&1
+ if [ $? -ne 0 ];then
+       echo "SKIP: Could not run test without ip tool"

diff --git a/queue-5.15/series b/queue-5.15/series
index e9389e9991f7ccc13a77c2b60520c5dc8d155f8c..55aff3b549164adccf3d441a9bdff0395b385615 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -152,3 +152,6 @@ drm-rcar-stop-using-imply-for-dependencies.patch
 scsi-dpt_i2o-remove-broken-pass-through-ioctl-i2ousercmd.patch
 scsi-dpt_i2o-do-not-process-completions-with-invalid-addresses.patch
 drm-amdgpu-gfx10-disable-gfxoff-before-disabling-powergating.patch
+selftests-mptcp-diag-skip-if-mptcp-is-not-supported.patch
+selftests-mptcp-simult-flows-skip-if-mptcp-is-not-supported.patch
+selftests-mptcp-join-skip-if-mptcp-is-not-supported.patch