FAILED: patch "[PATCH] selftests: mptcp: connect: also cover alt modes" failed to apply to 5.15-stable tree

List overview All Threads
Download

newer

older

[PATCH v3 1/5] drm/xe/bo: fix...

[PATCH 0/3] phy: qcom: edp: Add...

gregkh＠linuxfoundation.org

28 Jul 2025 28 Jul '25

1:48 p.m.

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 37848a456fc38c191aedfe41f662cc24db8c23d9 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2025072839-wildly-gala-e85f@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..

Possible dependencies:

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

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: [PATCH] selftests: mptcp: connect: also cover alt modes

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.

diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/selftests/net/mptcp/Makefile index e47788bfa671..c6b030babba8 100644 --- a/tools/testing/selftests/net/mptcp/Makefile +++ b/tools/testing/selftests/net/mptcp/Makefile @@ -4,7 +4,8 @@ top_srcdir = ../../../../..

CFLAGS += -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES)

-TEST_PROGS := mptcp_connect.sh pm_netlink.sh mptcp_join.sh diag.sh \ +TEST_PROGS := mptcp_connect.sh mptcp_connect_mmap.sh mptcp_connect_sendfile.sh \ + pm_netlink.sh mptcp_join.sh diag.sh \ simult_flows.sh mptcp_sockopt.sh userspace_pm.sh

TEST_GEN_FILES = mptcp_connect pm_nl_ctl mptcp_sockopt mptcp_inq mptcp_diag diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh b/tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh new file mode 100755 index 000000000000..5dd30f9394af --- /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/tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh b/tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh new file mode 100755 index 000000000000..1d16fb1cc9bb --- /dev/null +++ b/tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.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 sendfile "${@}"

Show replies by date

Sasha Levin

29 Jul 29 Jul

2:20 p.m.

New subject: [PATCH 5.15.y] selftests: mptcp: connect: also cover alt modes

From: "Matthieu Baerts (NGI0)" matttbe@kernel.org

[ Upstream commit 37848a456fc38c191aedfe41f662cc24db8c23d9 ]

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 ] Signed-off-by: Sasha Levin sashal@kernel.org --- tools/testing/selftests/net/mptcp/Makefile | 3 ++- tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh | 5 +++++ tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh create mode 100755 tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh

diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/selftests/net/mptcp/Makefile index 1db5f507d983..ffae6cc66e28 100644 --- 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_GEN_FILES = mptcp_connect pm_nl_ctl diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh b/tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh new file mode 100755 index 000000000000..5dd30f9394af --- /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/tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh b/tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh new file mode 100755 index 000000000000..1d16fb1cc9bb --- /dev/null +++ b/tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.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 sendfile "${@}"

-- 2.39.5

Matthieu Baerts

2:32 p.m.

New subject: [PATCH 5.15.y] selftests: mptcp: connect: also cover alt modes

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.

Cheers, Matt

-- Sponsored by the NGI0 Core fund.

Sasha Levin

2:36 p.m.

New subject: [PATCH 5.15.y] selftests: mptcp: connect: also cover alt modes

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!

-- Thanks, Sasha

Matthieu Baerts (NGI0)

30 Jul 30 Jul

10:28 a.m.

New subject: [PATCH 5.15.y 0/3] mptcp: fix recent failed backports (20250728)

Greg recently reported 2 patches that could not be applied without conflicts in v5.15:

- 37848a456fc3 ("selftests: mptcp: connect: also cover alt modes") - fdf0f60a2bb0 ("selftests: mptcp: connect: also cover checksum")

The first one has been resolved by Sasha in [1].

An additional backport was needed to fix issues when running the new sendfile test:

- df9e03aec3b1 ("selftests: mptcp: make sendfile selftest work")

Conflicts have been resolved, and documented in each patch.

Link: https://lore.kernel.org/20250729142019.2718195-1-sashal@kernel.org [1]

Florian Westphal (1): selftests: mptcp: make sendfile selftest work

Matthieu Baerts (NGI0) (2): selftests: mptcp: connect: also cover alt modes selftests: mptcp: connect: also cover checksum

tools/testing/selftests/net/mptcp/Makefile | 3 ++- .../selftests/net/mptcp/mptcp_connect.c | 26 ++++++++++++------- .../net/mptcp/mptcp_connect_checksum.sh | 5 ++++ .../selftests/net/mptcp/mptcp_connect_mmap.sh | 5 ++++ .../net/mptcp/mptcp_connect_sendfile.sh | 5 ++++ 5 files changed, 34 insertions(+), 10 deletions(-) create mode 100755 tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh create mode 100755 tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh create mode 100755 tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh

-- 2.50.0

Matthieu Baerts (NGI0)

10:28 a.m.

New subject: [PATCH 5.15.y 1/3] selftests: mptcp: make sendfile selftest work

From: Florian Westphal fw@strlen.de

commit df9e03aec3b14970df05b72d54f8ac9da3ab29e1 upstream.

When the selftest got added, sendfile() on mptcp sockets returned -EOPNOTSUPP, so running 'mptcp_connect.sh -m sendfile' failed immediately.

This is no longer the case, but the script fails anyway due to timeout. Let the receiver know once the sender has sent all data, just like with '-m mmap' mode.

v2: need to respect cfg_wait too, as pm_userspace.sh relied on -m sendfile to keep the connection open (Mat Martineau)

Fixes: 048d19d444be ("mptcp: add basic kselftest for mptcp") Reported-by: Xiumei Mu xmu@redhat.com Reviewed-by: Mat Martineau mathew.j.martineau@linux.intel.com Signed-off-by: Florian Westphal fw@strlen.de Signed-off-by: Mat Martineau mathew.j.martineau@linux.intel.com Signed-off-by: David S. Miller davem@davemloft.net Signed-off-by: Matthieu Baerts (NGI0) matttbe@kernel.org --- .../selftests/net/mptcp/mptcp_connect.c | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c index 95e81d557b08..d505c6cba668 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -451,6 +451,18 @@ static void set_nonblock(int fd) fcntl(fd, F_SETFL, flags | O_NONBLOCK); }

+static void shut_wr(int fd) +{ + /* Close our write side, ev. give some time + * for address notification and/or checking + * the current status + */ + if (cfg_wait) + usleep(cfg_wait); + + shutdown(fd, SHUT_WR); +} + static int copyfd_io_poll(int infd, int peerfd, int outfd, bool *in_closed_after_out) { struct pollfd fds = { @@ -528,14 +540,7 @@ static int copyfd_io_poll(int infd, int peerfd, int outfd, bool *in_closed_after /* ... and peer also closed already */ break;

- /* ... but we still receive. - * Close our write side, ev. give some time - * for address notification and/or checking - * the current status - */ - if (cfg_wait) - usleep(cfg_wait); - shutdown(peerfd, SHUT_WR); + shut_wr(peerfd); } else { if (errno == EINTR) continue; @@ -666,7 +671,7 @@ static int copyfd_io_mmap(int infd, int peerfd, int outfd, if (err) return err;

- shutdown(peerfd, SHUT_WR); + shut_wr(peerfd);

err = do_recvfile(peerfd, outfd); *in_closed_after_out = true; @@ -690,6 +695,9 @@ static int copyfd_io_sendfile(int infd, int peerfd, int outfd, err = do_sendfile(infd, peerfd, size); if (err) return err; + + shut_wr(peerfd); + err = do_recvfile(peerfd, outfd); *in_closed_after_out = true; }

-- 2.50.0

Sasha Levin

4:28 p.m.

New subject: [PATCH 5.15.y 1/3] selftests: mptcp: make sendfile selftest work

[ Sasha's backport helper bot ]

Hi,

✅ All tests passed successfully. No issues detected. No action required from the submitter.

The upstream commit SHA1 provided is correct: df9e03aec3b14970df05b72d54f8ac9da3ab29e1

WARNING: Author mismatch between patch and upstream commit: Backport author: Matthieu Baerts (NGI0) matttbe@kernel.org Commit author: Florian Westphal fw@strlen.de

Status in newer kernel trees: 6.15.y | Present (exact SHA1) 6.12.y | Present (exact SHA1) 6.6.y | Present (exact SHA1) 6.1.y | Present (exact SHA1)

Note: The patch differs from the upstream commit: --- 1: df9e03aec3b1 ! 1: 2b0b67ac1f24 selftests: mptcp: make sendfile selftest work @@ Metadata ## Commit message ## selftests: mptcp: make sendfile selftest work

+ commit df9e03aec3b14970df05b72d54f8ac9da3ab29e1 upstream. + When the selftest got added, sendfile() on mptcp sockets returned -EOPNOTSUPP, so running 'mptcp_connect.sh -m sendfile' failed immediately. @@ Commit message Signed-off-by: Florian Westphal fw@strlen.de Signed-off-by: Mat Martineau mathew.j.martineau@linux.intel.com Signed-off-by: David S. Miller davem@davemloft.net + Signed-off-by: Matthieu Baerts (NGI0) matttbe@kernel.org

## tools/testing/selftests/net/mptcp/mptcp_connect.c ## -@@ tools/testing/selftests/net/mptcp/mptcp_connect.c: static void set_nonblock(int fd, bool nonblock) - fcntl(fd, F_SETFL, flags & ~O_NONBLOCK); +@@ tools/testing/selftests/net/mptcp/mptcp_connect.c: static void set_nonblock(int fd) + fcntl(fd, F_SETFL, flags | O_NONBLOCK); }

+static void shut_wr(int fd)

---

Results of testing on various branches:

| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | 5.15 | Success | Success |

Matthieu Baerts (NGI0)

10:28 a.m.

New subject: [PATCH 5.15.y 2/3] selftests: mptcp: connect: also cover alt modes

[ Upstream commit 37848a456fc38c191aedfe41f662cc24db8c23d9 ]

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 ] Signed-off-by: Sasha Levin sashal@kernel.org Signed-off-by: Matthieu Baerts (NGI0) matttbe@kernel.org --- tools/testing/selftests/net/mptcp/Makefile | 3 ++- tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh | 5 +++++ tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh create mode 100755 tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh

CFLAGS = -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include

-- 2.50.0

Sasha Levin

4:28 p.m.

New subject: [PATCH 5.15.y 2/3] selftests: mptcp: connect: also cover alt modes

[ Sasha's backport helper bot ]

Hi,

Summary of potential issues: ℹ️ This is part 2/3 of a series ⚠️ Could not find matching upstream commit

The claimed upstream commit SHA1 (37848a456fc38c191aedfe41f662cc24db8c23d9) was not found.

NOTE: These results are for this patch alone. Full series testing will be performed when all parts are received.

Results of testing on various branches:

| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | 5.15 | Success | Success |

Matthieu Baerts

4:41 p.m.

New subject: [PATCH 5.15.y 2/3] selftests: mptcp: connect: also cover alt modes

Hi Sasha,

On 30/07/2025 18:28, Sasha Levin wrote:

...

[ Sasha's backport helper bot ]

Hi,

Summary of potential issues: ℹ️ This is part 2/3 of a series ⚠️ Could not find matching upstream commit

The claimed upstream commit SHA1 (37848a456fc38c191aedfe41f662cc24db8c23d9) was not found.

Is there maybe an issue with your bot? The SHA1 looks correct:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...

Also the same as the one mentioned in Greg's email:

https://lore.kernel.org/2025072839-wildly-gala-e85f@gregkh

...

NOTE: These results are for this patch alone. Full series testing will be performed when all parts are received.

Results of testing on various branches:

| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | 5.15 | Success | Success |

Cheers, Matt

-- Sponsored by the NGI0 Core fund.

Sasha Levin

31 Jul 31 Jul

1:09 a.m.

New subject: [PATCH 5.15.y 2/3] selftests: mptcp: connect: also cover alt modes

On Wed, Jul 30, 2025 at 06:41:19PM +0200, Matthieu Baerts wrote:

...

Hi Sasha,

On 30/07/2025 18:28, Sasha Levin wrote:

...
[ Sasha's backport helper bot ]

Hi,

Summary of potential issues: ℹ️ This is part 2/3 of a series ⚠️ Could not find matching upstream commit

The claimed upstream commit SHA1 (37848a456fc38c191aedfe41f662cc24db8c23d9) was not found.

Is there maybe an issue with your bot? The SHA1 looks correct:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...

Also the same as the one mentioned in Greg's email:

https://lore.kernel.org/2025072839-wildly-gala-e85f@gregkh

The SHA1 is correct, but it wasn't in Linus's tree until earlier today via 8be4d31cb8aa ("Merge tag 'net-next-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next").

-- Thanks, Sasha

Matthieu Baerts

9:28 a.m.

New subject: [PATCH 5.15.y 2/3] selftests: mptcp: connect: also cover alt modes

Hi Sasha,

Thank you for your reply!

On 31/07/2025 03:09, Sasha Levin wrote:

...

On Wed, Jul 30, 2025 at 06:41:19PM +0200, Matthieu Baerts wrote:

...
Hi Sasha,

On 30/07/2025 18:28, Sasha Levin wrote:

...
[ Sasha's backport helper bot ]

Hi,

Summary of potential issues: ℹ️ This is part 2/3 of a series ⚠️ Could not find matching upstream commit

The claimed upstream commit SHA1 (37848a456fc38c191aedfe41f662cc24db8c23d9) was not found.

Is there maybe an issue with your bot? The SHA1 looks correct:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/ commit/?id=37848a456fc38c191aedfe41f662cc24db8c23d9

Also the same as the one mentioned in Greg's email:

https://lore.kernel.org/2025072839-wildly-gala-e85f@gregkh

The SHA1 is correct, but it wasn't in Linus's tree until earlier today via 8be4d31cb8aa ("Merge tag 'net-next-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next").

If I'm not mistaken, the commit was part of a previous pull request via 407c114c983f ("Merge tag 'net-6.16-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net"), and was part of the v6.16 release.

But that's OK, a detail I suppose, despite what the bot said yesterday, the SHA1's here and in the other patches are correct :)

Cheers, Matt

-- Sponsored by the NGI0 Core fund.

Matthieu Baerts (NGI0)

30 Jul 30 Jul

10:28 a.m.

New subject: [PATCH 5.15.y 3/3] selftests: mptcp: connect: also cover checksum

commit fdf0f60a2bb02ba581d9e71d583e69dd0714a521 upstream.

The checksum mode has been added a while ago, but it is only validated when manually launching mptcp_connect.sh with "-C".

The different CIs were then not validating these MPTCP Connect tests with checksum enabled. To make sure they do, add a new test program executing mptcp_connect.sh with the checksum mode.

Fixes: 94d66ba1d8e4 ("selftests: mptcp: enable checksum in mptcp_connect.sh") 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-2-8230ddd8245... Signed-off-by: Jakub Kicinski kuba@kernel.org [ Conflict in Makefile, in the context, because userspace_pm.sh test has been introduced later, in commit 3ddabc433670 ("selftests: mptcp: validate userspace PM tests by default"), which is not in this version. ] Signed-off-by: Matthieu Baerts (NGI0) matttbe@kernel.org --- tools/testing/selftests/net/mptcp/Makefile | 2 +- tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh

diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/selftests/net/mptcp/Makefile index ffae6cc66e28..1c9c3fbb39ee 100644 --- a/tools/testing/selftests/net/mptcp/Makefile +++ b/tools/testing/selftests/net/mptcp/Makefile @@ -6,7 +6,7 @@ KSFT_KHDR_INSTALL := 1 CFLAGS = -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include

TEST_PROGS := mptcp_connect.sh mptcp_connect_mmap.sh mptcp_connect_sendfile.sh \ - pm_netlink.sh mptcp_join.sh diag.sh \ + mptcp_connect_checksum.sh pm_netlink.sh mptcp_join.sh diag.sh \ simult_flows.sh mptcp_sockopt.sh

TEST_GEN_FILES = mptcp_connect pm_nl_ctl diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh b/tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh new file mode 100755 index 000000000000..ce93ec2f107f --- /dev/null +++ b/tools/testing/selftests/net/mptcp/mptcp_connect_checksum.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" -C "${@}"

-- 2.50.0

Sasha Levin

4:28 p.m.

New subject: [PATCH 5.15.y 3/3] selftests: mptcp: connect: also cover checksum

[ Sasha's backport helper bot ]

Hi,

Summary of potential issues: ℹ️ This is part 3/3 of a series ⚠️ Could not find matching upstream commit

The claimed upstream commit SHA1 (fdf0f60a2bb02ba581d9e71d583e69dd0714a521) was not found.

NOTE: These results are for this patch alone. Full series testing will be performed when all parts are received.

Results of testing on various branches:

| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | 5.15 | Success | Success |

days inactive

days old

linux-stable-mirror@lists.linaro.org

13 comments

participants

tags (0)

participants (4)

gregkh＠linuxfoundation.org
Matthieu Baerts
Matthieu Baerts (NGI0)
Sasha Levin