On Tue, Jul 29, 2025 at 04:32:21PM +0200, Matthieu Baerts wrote:
Hi Sasha,
On 29/07/2025 16:20, Sasha Levin wrote:
From: "Matthieu Baerts (NGI0)" matttbe@kernel.org
[ Upstream commit 37848a456fc38c191aedfe41f662cc24db8c23d9 ]
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-8230ddd8245... Signed-off-by: Jakub Kicinski kuba@kernel.org [ Drop userspace_pm.sh from TEST_PROGS ]
Thank you for having fixed the conflicts.
Is it possible to hold this one for the moment? Yesterday, I was looking at this conflict, and when testing the same resolution as yours, I noticed mptcp_connect_sendfile.sh was failing on v5.15.y. I will investigate that.
Please also note that this patch here will conflict with another you sent a few hours ago:
https://lore.kernel.org/20250729034856.2353329-1-sashal@kernel.org
When the issues are fixed, I can send both of them again if that's OK for you.
Thats perfect, I'll skip backports for there. Thanks!