| From 2177d0b08e421971e035672b70f3228d9485c650 Mon Sep 17 00:00:00 2001 |
| From: Matthieu Baerts <matthieu.baerts@tessares.net> |
| Date: Thu, 8 Jun 2023 18:38:49 +0200 |
| Subject: selftests: mptcp: pm nl: remove hardcoded default limits |
| |
| From: Matthieu Baerts <matthieu.baerts@tessares.net> |
| |
| commit 2177d0b08e421971e035672b70f3228d9485c650 upstream. |
| |
| Selftests are supposed to run on any kernels, including the old ones not |
| supporting all MPTCP features. |
| |
| One of them is the checks of the default limits returned by the MPTCP |
| in-kernel path-manager. The default values have been modified by commit |
| 72bcbc46a5c3 ("mptcp: increase default max additional subflows to 2"). |
| Instead of comparing with hardcoded values, we can get the default one |
| and compare with them. |
| |
| Note that if we expect to have the latest version, we continue to check |
| the hardcoded values to avoid unexpected behaviour changes. |
| |
| Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 |
| Fixes: eedbc685321b ("selftests: add PM netlink functional tests") |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/testing/selftests/net/mptcp/pm_netlink.sh | 12 +++++++----- |
| 1 file changed, 7 insertions(+), 5 deletions(-) |
| |
| --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh |
| +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh |
| @@ -73,8 +73,12 @@ check() |
| } |
| |
| check "ip netns exec $ns1 ./pm_nl_ctl dump" "" "defaults addr list" |
| -check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 0 |
| + |
| +default_limits="$(ip netns exec $ns1 ./pm_nl_ctl limits)" |
| +if mptcp_lib_expect_all_features; then |
| + check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 0 |
| subflows 2" "defaults limits" |
| +fi |
| |
| ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1 |
| ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.2 flags subflow dev lo |
| @@ -121,12 +125,10 @@ ip netns exec $ns1 ./pm_nl_ctl flush |
| check "ip netns exec $ns1 ./pm_nl_ctl dump" "" "flush addrs" |
| |
| ip netns exec $ns1 ./pm_nl_ctl limits 9 1 |
| -check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 0 |
| -subflows 2" "rcv addrs above hard limit" |
| +check "ip netns exec $ns1 ./pm_nl_ctl limits" "$default_limits" "rcv addrs above hard limit" |
| |
| ip netns exec $ns1 ./pm_nl_ctl limits 1 9 |
| -check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 0 |
| -subflows 2" "subflows above hard limit" |
| +check "ip netns exec $ns1 ./pm_nl_ctl limits" "$default_limits" "subflows above hard limit" |
| |
| ip netns exec $ns1 ./pm_nl_ctl limits 8 8 |
| check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 8 |
