From: Geliang Tang <tanggeliang@kylinos.cn>

Just like set_limits() helper, this patch adds another one get_limits() to
show the limits.

Usage:
        Set limits - set_limits $ns $addrs $subflows
        Get limits - get_limits $ns

Use this new helper in pm_netlink.sh to replace all 'pm_nl_ctl limits'
commands.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 tools/testing/selftests/net/mptcp/mptcp_lib.sh  | 10 ++++++++++
 tools/testing/selftests/net/mptcp/pm_netlink.sh | 10 +++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index c402cc994902..813d6406ccc3 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -532,3 +532,13 @@ mptcp_lib_format_limits() {
 		printf "accept %d\nsubflows %d\n" "${accept}" "${subflows}"
 	fi
 }
+
+mptcp_lib_pm_nl_get_limits() {
+	local ns=${1}
+
+	if mptcp_lib_is_ip_mptcp; then
+		ip -n "${ns}" mptcp limits
+	else
+		ip netns exec "${ns}" ./pm_nl_ctl limits
+	fi
+}
diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testing/selftests/net/mptcp/pm_netlink.sh
index 02c92edca8bb..87ea4973235d 100755
--- a/tools/testing/selftests/net/mptcp/pm_netlink.sh
+++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh
@@ -69,9 +69,9 @@ check()
 
 check "ip netns exec $ns1 ./pm_nl_ctl dump" "" "defaults addr list"
 
-default_limits="$(ip netns exec $ns1 ./pm_nl_ctl limits)"
+default_limits="$(mptcp_lib_pm_nl_get_limits "${ns1}")"
 if mptcp_lib_expect_all_features; then
-	check "ip netns exec $ns1 ./pm_nl_ctl limits" \
+	check "mptcp_lib_pm_nl_get_limits ${ns1}" \
 		"$(mptcp_lib_format_limits 0 2)" "defaults limits"
 fi
 
@@ -120,13 +120,13 @@ 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 2>/dev/null
-check "ip netns exec $ns1 ./pm_nl_ctl limits" "$default_limits" "rcv addrs above hard limit"
+check "mptcp_lib_pm_nl_get_limits ${ns1}" "${default_limits}" "rcv addrs above hard limit"
 
 ip netns exec $ns1 ./pm_nl_ctl limits 1 9 2>/dev/null
-check "ip netns exec $ns1 ./pm_nl_ctl limits" "$default_limits" "subflows above hard limit"
+check "mptcp_lib_pm_nl_get_limits ${ns1}" "${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" \
+check "mptcp_lib_pm_nl_get_limits ${ns1}" \
 	"$(mptcp_lib_format_limits 8 8)" "set limits"
 
 ip netns exec $ns1 ./pm_nl_ctl flush
-- 
2.40.1

Hi Geliang,

On 17/03/2024 01:58, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> Just like set_limits() helper, this patch adds another one get_limits() to
> show the limits.
> 
> Usage:
>         Set limits - set_limits $ns $addrs $subflows
>         Get limits - get_limits $ns
> 
> Use this new helper in pm_netlink.sh to replace all 'pm_nl_ctl limits'
> commands.
> 
> Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
> ---
>  tools/testing/selftests/net/mptcp/mptcp_lib.sh  | 10 ++++++++++
>  tools/testing/selftests/net/mptcp/pm_netlink.sh | 10 +++++-----
>  2 files changed, 15 insertions(+), 5 deletions(-)
> 
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
> index c402cc994902..813d6406ccc3 100644
> --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
> @@ -532,3 +532,13 @@ mptcp_lib_format_limits() {
>  		printf "accept %d\nsubflows %d\n" "${accept}" "${subflows}"
>  	fi
>  }
> +
> +mptcp_lib_pm_nl_get_limits() {

See my comment from patch 3/12: could be kept in pm_netlink.sh with a
shorter name and without 'ns'.

  check "get_limits" "${default_limits}" "rcv addrs above hard limit"

> +	local ns=${1}
> +
> +	if mptcp_lib_is_ip_mptcp; then
> +		ip -n "${ns}" mptcp limits
> +	else
> +		ip netns exec "${ns}" ./pm_nl_ctl limits
> +	fi
> +}
Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.