* [PATCH net 1/3] selftests: mptcp: join: restrict fullmesh endp on 1st sf
2024-09-10 19:06 [PATCH net 0/3] selftests: mptcp: misc. small fixes Matthieu Baerts (NGI0)
@ 2024-09-10 19:06 ` Matthieu Baerts (NGI0)
2024-09-10 19:06 ` [PATCH net 2/3] selftests: mptcp: include lib.sh file Matthieu Baerts (NGI0)
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Matthieu Baerts (NGI0) @ 2024-09-10 19:06 UTC (permalink / raw)
To: mptcp, Mat Martineau, Geliang Tang, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Shuah Khan
Cc: netdev, linux-kselftest, linux-kernel, Matthieu Baerts (NGI0),
stable
A new endpoint using the IP of the initial subflow has been recently
added to increase the code coverage. But it breaks the test when using
old kernels not having commit 86e39e04482b ("mptcp: keep track of local
endpoint still available for each msk"), e.g. on v5.15.
Similar to commit d4c81bbb8600 ("selftests: mptcp: join: support local
endpoint being tracked or not"), it is possible to add the new endpoint
conditionally, by checking if "mptcp_pm_subflow_check_next" is present
in kallsyms: this is not directly linked to the commit introducing this
symbol but for the parent one which is linked anyway. So we can know in
advance what will be the expected behaviour, and add the new endpoint
only when it makes sense to do so.
Fixes: 4878f9f8421f ("selftests: mptcp: join: validate fullmesh endp on 1st sf")
Cc: stable@vger.kernel.org
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index a4762c49a878..cde041c93906 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -3064,7 +3064,9 @@ fullmesh_tests()
pm_nl_set_limits $ns1 1 3
pm_nl_set_limits $ns2 1 3
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,fullmesh
+ if mptcp_lib_kallsyms_has "mptcp_pm_subflow_check_next$"; then
+ pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,fullmesh
+ fi
fullmesh=1 speed=slow \
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 3 3 3
--
2.45.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH net 2/3] selftests: mptcp: include lib.sh file
2024-09-10 19:06 [PATCH net 0/3] selftests: mptcp: misc. small fixes Matthieu Baerts (NGI0)
2024-09-10 19:06 ` [PATCH net 1/3] selftests: mptcp: join: restrict fullmesh endp on 1st sf Matthieu Baerts (NGI0)
@ 2024-09-10 19:06 ` Matthieu Baerts (NGI0)
2024-09-10 19:06 ` [PATCH net 3/3] selftests: mptcp: include net_helper.sh file Matthieu Baerts (NGI0)
2024-09-11 22:30 ` [PATCH net 0/3] selftests: mptcp: misc. small fixes patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: Matthieu Baerts (NGI0) @ 2024-09-10 19:06 UTC (permalink / raw)
To: mptcp, Mat Martineau, Geliang Tang, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Shuah Khan
Cc: netdev, linux-kselftest, linux-kernel, Matthieu Baerts (NGI0)
The lib.sh file from the parent directory is used by the MPTCP selftests
and it needs to be present when running the tests.
This file then needs to be listed in the Makefile to be included when
exporting or installing the tests, e.g. with:
make -C tools/testing/selftests \
TARGETS=net/mptcp \
install INSTALL_PATH=$KSFT_INSTALL_PATH
cd $KSFT_INSTALL_PATH
./run_kselftest.sh -c net/mptcp
Fixes: f265d3119a29 ("selftests: mptcp: lib: use setup/cleanup_ns helpers")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
tools/testing/selftests/net/mptcp/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/selftests/net/mptcp/Makefile
index 7b936a926859..68924053a1e6 100644
--- a/tools/testing/selftests/net/mptcp/Makefile
+++ b/tools/testing/selftests/net/mptcp/Makefile
@@ -11,6 +11,8 @@ TEST_GEN_FILES = mptcp_connect pm_nl_ctl mptcp_sockopt mptcp_inq
TEST_FILES := mptcp_lib.sh settings
+TEST_INCLUDES := ../lib.sh
+
EXTRA_CLEAN := *.pcap
include ../../lib.mk
--
2.45.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH net 3/3] selftests: mptcp: include net_helper.sh file
2024-09-10 19:06 [PATCH net 0/3] selftests: mptcp: misc. small fixes Matthieu Baerts (NGI0)
2024-09-10 19:06 ` [PATCH net 1/3] selftests: mptcp: join: restrict fullmesh endp on 1st sf Matthieu Baerts (NGI0)
2024-09-10 19:06 ` [PATCH net 2/3] selftests: mptcp: include lib.sh file Matthieu Baerts (NGI0)
@ 2024-09-10 19:06 ` Matthieu Baerts (NGI0)
2024-09-11 22:30 ` [PATCH net 0/3] selftests: mptcp: misc. small fixes patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: Matthieu Baerts (NGI0) @ 2024-09-10 19:06 UTC (permalink / raw)
To: mptcp, Mat Martineau, Geliang Tang, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Shuah Khan
Cc: netdev, linux-kselftest, linux-kernel, Matthieu Baerts (NGI0)
Similar to the previous commit, the net_helper.sh file from the parent
directory is used by the MPTCP selftests and it needs to be present when
running the tests.
This file then needs to be listed in the Makefile to be included when
exporting or installing the tests, e.g. with:
make -C tools/testing/selftests \
TARGETS=net/mptcp \
install INSTALL_PATH=$KSFT_INSTALL_PATH
cd $KSFT_INSTALL_PATH
./run_kselftest.sh -c net/mptcp
Fixes: 1af3bc912eac ("selftests: mptcp: lib: use wait_local_port_listen helper")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
tools/testing/selftests/net/mptcp/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/selftests/net/mptcp/Makefile
index 68924053a1e6..5d796622e730 100644
--- a/tools/testing/selftests/net/mptcp/Makefile
+++ b/tools/testing/selftests/net/mptcp/Makefile
@@ -11,7 +11,7 @@ TEST_GEN_FILES = mptcp_connect pm_nl_ctl mptcp_sockopt mptcp_inq
TEST_FILES := mptcp_lib.sh settings
-TEST_INCLUDES := ../lib.sh
+TEST_INCLUDES := ../lib.sh ../net_helper.sh
EXTRA_CLEAN := *.pcap
--
2.45.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH net 0/3] selftests: mptcp: misc. small fixes
2024-09-10 19:06 [PATCH net 0/3] selftests: mptcp: misc. small fixes Matthieu Baerts (NGI0)
` (2 preceding siblings ...)
2024-09-10 19:06 ` [PATCH net 3/3] selftests: mptcp: include net_helper.sh file Matthieu Baerts (NGI0)
@ 2024-09-11 22:30 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-09-11 22:30 UTC (permalink / raw)
To: Matthieu Baerts
Cc: mptcp, martineau, geliang, davem, edumazet, kuba, pabeni, shuah,
netdev, linux-kselftest, linux-kernel, stable
Hello:
This series was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Tue, 10 Sep 2024 21:06:35 +0200 you wrote:
> Here are some various fixes for the MPTCP selftests.
>
> Patch 1 fixes a recently modified test to continue to work as expected
> on older kernels. This is a fix for a recent fix that can be backported
> up to v5.15.
>
> Patch 2 and 3 include dependences when exporting or installing the
> tests. Two fixes for v6.11-rc1.
>
> [...]
Here is the summary with links:
- [net,1/3] selftests: mptcp: join: restrict fullmesh endp on 1st sf
https://git.kernel.org/netdev/net/c/49ac6f05ace5
- [net,2/3] selftests: mptcp: include lib.sh file
https://git.kernel.org/netdev/net/c/1a5a2d19e827
- [net,3/3] selftests: mptcp: include net_helper.sh file
https://git.kernel.org/netdev/net/c/c66c08e51b55
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread