From: Geliang Tang <tanggeliang@kylinos.cn>

Commands 'ss -M' are used in script mptcp_join.sh to display only MPTCP
sockets. So it must be checked if ss tool supports MPTCP in this script.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 5935b1fcfadb..d797b27b7626 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -162,6 +162,11 @@ check_tools()
 		exit $ksft_skip
 	fi
 
+	if ! ss -h | grep -q MPTCP; then
+		echo "SKIP: ss tool does not support MPTCP"
+		exit $ksft_skip
+	fi
+
 	if ! "${iptables}" -V &> /dev/null; then
 		echo "SKIP: Could not run all tests without ${iptables} tool"
 		exit $ksft_skip
-- 
2.40.1

Hi Geliang,

On 19/02/2024 09:22, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> Commands 'ss -M' are used in script mptcp_join.sh to display only MPTCP
> sockets. So it must be checked if ss tool supports MPTCP in this script.

Thank you for the update, I will queue it for -net, with:

Fixes: e274f7154008 ("selftests: mptcp: add subflow limits test-cases")
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

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

Hi Geliang,

On 19/02/2024 09:52, Matthieu Baerts wrote:
> Hi Geliang,
> 
> On 19/02/2024 09:22, Geliang Tang wrote:
>> From: Geliang Tang <tanggeliang@kylinos.cn>
>>
>> Commands 'ss -M' are used in script mptcp_join.sh to display only MPTCP
>> sockets. So it must be checked if ss tool supports MPTCP in this script.
> 
> Thank you for the update, I will queue it for -net, with:
> 
> Fixes: e274f7154008 ("selftests: mptcp: add subflow limits test-cases")
> Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

Just did:

New patches for t/upstream-net and t/upstream:
- ee636468e74e: selftests: mptcp: join: add ss mptcp support check
- Results: 22c802d10725..43a48b2f8697 (export-net)
- 05d22fbbbb38: conflict in t/selftests-mptcp-stop-forcing-iptables-legacy
- Results: d5aedc5b25ce..1642cc21aa85 (export)

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