[PATCH mptcp-net 0/2] selftests: mptcp: connect: cover alt modes

[PATCH mptcp-net 0/2] selftests: mptcp: connect: cover alt modes

[Matthieu Baerts (NGI0)]

mptcp_connect.sh can be executed manually with "-m <MODE>" and "-C".

These modes should be validated, but they are not when the selftests are
executed via the kselftest helpers. To fix that, new test programs have
been added, simply calling mptcp_connect.sh with the right parameters.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Matthieu Baerts (NGI0) (2):
      selftests: mptcp: connect: also cover alt modes
      selftests: mptcp: connect: also cover checksum

 tools/testing/selftests/net/mptcp/Makefile                  | 3 ++-
 tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh | 4 ++++
 tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh     | 4 ++++
 tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh | 4 ++++
 4 files changed, 14 insertions(+), 1 deletion(-)
---
base-commit: df15676c95d593e64720b86babe913924c3d5649
change-id: 20250708-selftests-mptcp-connect-modes-5d7aa9e1158d

Best regards,
-- 
Matthieu Baerts (NGI0) <matttbe@kernel.org>

[PATCH mptcp-net 1/2] selftests: mptcp: connect: also cover alt modes

[Matthieu Baerts (NGI0)]

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")
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     | 4 ++++
 tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/selftests/net/mptcp/Makefile
index e47788bfa671313f21d5ba95821121cdc3e5d2c7..c6b030babba8cf888101d6af44f3e56fe5ab831b 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 0000000000000000000000000000000000000000..09bde1303bf79198fe9f7890cbe89901859d78e8
--- /dev/null
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+
+"$(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 0000000000000000000000000000000000000000..c50d08481581f0f8997c6f4f2174d606150bfa6a
--- /dev/null
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+
+"$(dirname "${0}")/mptcp_connect.sh" -m sendfile "${@}"

-- 
2.48.1

[PATCH mptcp-net 2/2] selftests: mptcp: connect: also cover checksum

[Matthieu Baerts (NGI0)]

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")
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 | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/selftests/net/mptcp/Makefile
index c6b030babba8cf888101d6af44f3e56fe5ab831b..4c7e51336ab25c662f02719f1632fa2d27d148f1 100644
--- a/tools/testing/selftests/net/mptcp/Makefile
+++ b/tools/testing/selftests/net/mptcp/Makefile
@@ -5,7 +5,7 @@ top_srcdir = ../../../../..
 CFLAGS += -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES)
 
 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 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_checksum.sh b/tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh
new file mode 100755
index 0000000000000000000000000000000000000000..569340d4f00ae2e4655b30220bcfce695549a686
--- /dev/null
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+
+"$(dirname "${0}")/mptcp_connect.sh" -C "${@}"

-- 
2.48.1

Re: [PATCH mptcp-net 0/2] selftests: mptcp: connect: cover alt modes

[Geliang Tang]

Hi Matt,

On Tue, 2025-07-08 at 19:37 +0200, Matthieu Baerts (NGI0) wrote:
> mptcp_connect.sh can be executed manually with "-m <MODE>" and "-C".
> 
> These modes should be validated, but they are not when the selftests
> are
> executed via the kselftest helpers. To fix that, new test programs
> have
> been added, simply calling mptcp_connect.sh with the right
> parameters.
> 
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

LGTM!

Reviewed-by: Geliang Tang <geliang@kernel.org>

Thanks,
-Geliang

> ---
> Matthieu Baerts (NGI0) (2):
>       selftests: mptcp: connect: also cover alt modes
>       selftests: mptcp: connect: also cover checksum
> 
>  tools/testing/selftests/net/mptcp/Makefile                  | 3 ++-
>  tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh | 4 ++++
>  tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh     | 4 ++++
>  tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh | 4 ++++
>  4 files changed, 14 insertions(+), 1 deletion(-)
> ---
> base-commit: df15676c95d593e64720b86babe913924c3d5649
> change-id: 20250708-selftests-mptcp-connect-modes-5d7aa9e1158d
> 
> Best regards,

Re: [PATCH mptcp-net 0/2] selftests: mptcp: connect: cover alt modes

[Matthieu Baerts]

Hi Geliang,

On 09/07/2025 09:36, Geliang Tang wrote:
> Hi Matt,
> 
> On Tue, 2025-07-08 at 19:37 +0200, Matthieu Baerts (NGI0) wrote:
>> mptcp_connect.sh can be executed manually with "-m <MODE>" and "-C".
>>
>> These modes should be validated, but they are not when the selftests
>> are
>> executed via the kselftest helpers. To fix that, new test programs
>> have
>> been added, simply calling mptcp_connect.sh with the right
>> parameters.
>>
>> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> 
> LGTM!
> 
> Reviewed-by: Geliang Tang <geliang@kernel.org>

Thank you, applied!

New patches for t/upstream-net and t/upstream:
- 6d62c20d77d9: selftests: mptcp: connect: also cover alt modes
- c3fbf767eb3b: selftests: mptcp: connect: also cover checksum
- Results: 6bd3385eb1f8..e8a7c6b2c828 (export-net)
- Results: 5cdb68fbc7ee..0f11bd74a704 (export)

Tests are now in progress:

- export-net:
https://github.com/multipath-tcp/mptcp_net-next/commit/8cc3145e7535dd60f02cad008912e1b513adecdd/checks
- export:
https://github.com/multipath-tcp/mptcp_net-next/commit/f0042bb4116cfe555f220715588193479b841dbc/checks

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.