5.10-stable patches

added patches:
	selftests-mptcp-connect-also-cover-alt-modes.patch

diff --git a/queue-5.10/selftests-mptcp-connect-also-cover-alt-modes.patch b/queue-5.10/selftests-mptcp-connect-also-cover-alt-modes.patch
new file mode 100644 (file)
index 0000000..77ad3b6
--- /dev/null
+++ b/queue-5.10/selftests-mptcp-connect-also-cover-alt-modes.patch
@@ -0,0 +1,59 @@
+From 37848a456fc38c191aedfe41f662cc24db8c23d9 Mon Sep 17 00:00:00 2001
+From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
+Date: Tue, 15 Jul 2025 20:43:28 +0200
+Subject: selftests: mptcp: connect: also cover alt modes
+
+From: Matthieu Baerts (NGI0) <matttbe@kernel.org>
+
+commit 37848a456fc38c191aedfe41f662cc24db8c23d9 upstream.
+
+The "mmap" and "sendfile" alternate modes for mptcp_connect.sh/.c are
+available from the beginning, but only tested when mptcp_connect.sh is
+manually launched with "-m mmap" or "-m sendfile", not via the
+kselftests helpers.
+
+The MPTCP CI was manually running "mptcp_connect.sh -m mmap", but not
+"-m sendfile". Plus other CIs, especially the ones validating the stable
+releases, were not validating these alternate modes.
+
+To make sure these modes are validated by these CIs, add two new test
+programs executing mptcp_connect.sh with the alternate modes.
+
+Fixes: 048d19d444be ("mptcp: add basic kselftest for mptcp")
+Cc: stable@vger.kernel.org
+Reviewed-by: Geliang Tang <geliang@kernel.org>
+Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
+Link: https://patch.msgid.link/20250715-net-mptcp-sft-connect-alt-v2-1-8230ddd82454@kernel.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+[ Drop userspace_pm.sh from TEST_PROGS ]
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+[ Drop mptcp_sockopt.sh from TEST_PROGS, and drop "sendfile" which is
+  not supported in this version. ]
+Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/testing/selftests/net/mptcp/Makefile              |    3 ++-
+ tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh |    5 +++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+ create mode 100755 tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh
+
+--- a/tools/testing/selftests/net/mptcp/Makefile
++++ b/tools/testing/selftests/net/mptcp/Makefile
+@@ -5,7 +5,8 @@ KSFT_KHDR_INSTALL := 1
+ 
+ CFLAGS =  -Wall -Wl,--no-as-needed -O2 -g  -I$(top_srcdir)/usr/include
+ 
+-TEST_PROGS := mptcp_connect.sh pm_netlink.sh mptcp_join.sh diag.sh \
++TEST_PROGS := mptcp_connect.sh mptcp_connect_mmap.sh \
++            pm_netlink.sh mptcp_join.sh diag.sh \
+             simult_flows.sh
+ 
+ TEST_GEN_FILES = mptcp_connect pm_nl_ctl
+--- /dev/null
++++ b/tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh
+@@ -0,0 +1,5 @@
++#!/bin/bash
++# SPDX-License-Identifier: GPL-2.0
++
++MPTCP_LIB_KSFT_TEST="$(basename "${0}" .sh)" \
++      "$(dirname "${0}")/mptcp_connect.sh" -m mmap "${@}"

diff --git a/queue-5.10/series b/queue-5.10/series
index 118c34a3ca2597c955d08cf43a37879bbbd093b7..bb545c708bb5c3a65c4a03767291901675232c18 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -398,3 +398,4 @@ drm-amd-display-fix-fractional-fb-divider-in-set_pixel_clock_v3.patch
 drm-amd-display-fix-dp-audio-dto1-clock-source-on-dce-6.patch
 drm-amd-display-find-first-crtc-and-its-line-time-in-dce110_fill_display_configs.patch
 drm-amd-display-fill-display-clock-and-vblank-time-in-dce110_fill_display_configs.patch
+selftests-mptcp-connect-also-cover-alt-modes.patch