diff mbox series

[net-next] selftests/net: ensure mptcp is enabled in netns

Message ID 20250224094013.13159-1-liuhangbin@gmail.com (mailing list archive)
State New
Headers show
Series [net-next] selftests/net: ensure mptcp is enabled in netns | expand

Commit Message

Hangbin Liu Feb. 24, 2025, 9:40 a.m. UTC
Some distributions may not enable MPTCP by default. All other MPTCP tests
source mptcp_lib.sh to ensure MPTCP is enabled before testing. However,
the ip_local_port_range test is the only one that does not include this
step.

Let's also ensure MPTCP is enabled in netns for ip_local_port_range so
that it passes on all distributions.

Suggested-by: Davide Caratti <dcaratti@redhat.com>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
---
 tools/testing/selftests/net/ip_local_port_range.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Matthieu Baerts (NGI0) Feb. 24, 2025, 1:53 p.m. UTC | #1
Hi Hangbin, Davide,

On 24/02/2025 10:40, Hangbin Liu wrote:
> Some distributions may not enable MPTCP by default. All other MPTCP tests
> source mptcp_lib.sh to ensure MPTCP is enabled before testing. However,
> the ip_local_port_range test is the only one that does not include this
> step.

This modification is OK for me, but would it not be time to stop
patching the kernel of these distributions to disable MPTCP by default?

As far as I know, only one Linux distribution is doing that, and that's
the one supporting MPTCP the best :)
It was making sense when MPTCP was backported to older kernels, but now
that v6.12 is used as a new base, it probably no longer makes sense, no?

> Let's also ensure MPTCP is enabled in netns for ip_local_port_range so
> that it passes on all distributions.

Acked-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

Cheers,
Matt
Hangbin Liu Feb. 25, 2025, 12:37 p.m. UTC | #2
On Mon, Feb 24, 2025 at 02:53:13PM +0100, Matthieu Baerts wrote:
> Hi Hangbin, Davide,
> 
> On 24/02/2025 10:40, Hangbin Liu wrote:
> > Some distributions may not enable MPTCP by default. All other MPTCP tests
> > source mptcp_lib.sh to ensure MPTCP is enabled before testing. However,
> > the ip_local_port_range test is the only one that does not include this
> > step.
> 
> This modification is OK for me, but would it not be time to stop
> patching the kernel of these distributions to disable MPTCP by default?
> 
> As far as I know, only one Linux distribution is doing that, and that's
> the one supporting MPTCP the best :)

> It was making sense when MPTCP was backported to older kernels, but now
> that v6.12 is used as a new base, it probably no longer makes sense, no?

Hi Matthieu,

Thanks for your review. I can't control the decisions. I also hope
we don't need to do this in future :)

Regards
Hangbin
> 
> > Let's also ensure MPTCP is enabled in netns for ip_local_port_range so
> > that it passes on all distributions.
> 
> Acked-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

> 
> Cheers,
> Matt
> -- 
> Sponsored by the NGI0 Core fund.
>
patchwork-bot+netdevbpf@kernel.org Feb. 26, 2025, 3:10 a.m. UTC | #3
Hello:

This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Mon, 24 Feb 2025 09:40:13 +0000 you wrote:
> Some distributions may not enable MPTCP by default. All other MPTCP tests
> source mptcp_lib.sh to ensure MPTCP is enabled before testing. However,
> the ip_local_port_range test is the only one that does not include this
> step.
> 
> Let's also ensure MPTCP is enabled in netns for ip_local_port_range so
> that it passes on all distributions.
> 
> [...]

Here is the summary with links:
  - [net-next] selftests/net: ensure mptcp is enabled in netns
    https://git.kernel.org/netdev/net-next/c/0f58804080e3

You are awesome, thank you!
diff mbox series

Patch

diff --git a/tools/testing/selftests/net/ip_local_port_range.sh b/tools/testing/selftests/net/ip_local_port_range.sh
index 6c6ad346eaa0..4ff746db1256 100755
--- a/tools/testing/selftests/net/ip_local_port_range.sh
+++ b/tools/testing/selftests/net/ip_local_port_range.sh
@@ -2,4 +2,6 @@ 
 # SPDX-License-Identifier: GPL-2.0
 
 ./in_netns.sh \
-  sh -c 'sysctl -q -w net.ipv4.ip_local_port_range="40000 49999" && ./ip_local_port_range'
+  sh -c 'sysctl -q -w net.mptcp.enabled=1 && \
+         sysctl -q -w net.ipv4.ip_local_port_range="40000 49999" && \
+         ./ip_local_port_range'