Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 70F8F12BF25 for ; Tue, 2 Apr 2024 14:12:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712067141; cv=none; b=DgDhbFEfIrx1gx4tons8+5gZ56D4ph2ktNCcoLwu8Bi+k9Ickqr4yj5thrvssdvqRgtghj5PDKAkCZwth4arMW57WZBEKIw9Otn9EGSNLxqlmN2XyERzI1SIrYeGCuLXntamDTsRMxItHqdBtm1uIs0JcLsNynBjZQkpxv9Cw1c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712067141; c=relaxed/simple; bh=x9uZHjCGyhvPK2vpuh/qBTLawZyc6cbJNVfAZETSDhg=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=TdzqXjZme1TFP5c439GjsKkhsX4tZaSSJaG9HiLFWUfM7fKUiazy8VdNlmYtRQbPs7fw/yWzHsWd0+gKdWNIY+qOvdA6ZzLguJE89pmuCXZzaX/gouSuMMaAbn5wyEKeiK6M2dIY48IP3VDhe4p/n91ZQGWZsBzppk2bO0+9h/g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Z2ntMARx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Z2ntMARx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51E79C43394; Tue, 2 Apr 2024 14:12:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712067140; bh=x9uZHjCGyhvPK2vpuh/qBTLawZyc6cbJNVfAZETSDhg=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=Z2ntMARxGZBYraTJI4yEJMy/T83B8nxvOmog3TbCn51H7msVEwnTrf4q2ttZRQK5T 6ipK0ZVud1p3I5OG4BY/1esOQon1yh3wFuCG/OEXRFgdL1XnaZ4OqNYAHzj0NvExCd PToDygN8BwaJREUXVtgPiiio3KL4ZsuFiVh7IWa6KsVAHaBGiong5H2LIgGywQN9ZN RPDrFq2o3GkyUL1CBleJb9sFhdctxaVNwNe40rxrapN18274NP2e9NndPKwAclZoZx rAenA98eUYv9xlisLpH31HD0MPbWnIGwBuZc5gJzSoOS68Au9iUU+jI01579PAT6Ar rt3xNBm7iGNcw== Message-ID: <5eb5e389-a98f-41f3-b8c6-7e4e33b1d054@kernel.org> Date: Tue, 2 Apr 2024 16:12:17 +0200 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Subject: Re: [PATCH mptcp-next v5 2/2] selftests: mptcp: test last time mptcp_info Content-Language: en-GB To: Geliang Tang , mptcp@lists.linux.dev Cc: Geliang Tang References: From: Matthieu Baerts Autocrypt: addr=matttbe@kernel.org; keydata= xsFNBFXj+ekBEADxVr99p2guPcqHFeI/JcFxls6KibzyZD5TQTyfuYlzEp7C7A9swoK5iCvf YBNdx5Xl74NLSgx6y/1NiMQGuKeu+2BmtnkiGxBNanfXcnl4L4Lzz+iXBvvbtCbynnnqDDqU c7SPFMpMesgpcu1xFt0F6bcxE+0ojRtSCZ5HDElKlHJNYtD1uwY4UYVGWUGCF/+cY1YLmtfb WdNb/SFo+Mp0HItfBC12qtDIXYvbfNUGVnA5jXeWMEyYhSNktLnpDL2gBUCsdbkov5VjiOX7 CRTkX0UgNWRjyFZwThaZADEvAOo12M5uSBk7h07yJ97gqvBtcx45IsJwfUJE4hy8qZqsA62A nTRflBvp647IXAiCcwWsEgE5AXKwA3aL6dcpVR17JXJ6nwHHnslVi8WesiqzUI9sbO/hXeXw TDSB+YhErbNOxvHqCzZEnGAAFf6ges26fRVyuU119AzO40sjdLV0l6LE7GshddyazWZf0iac nEhX9NKxGnuhMu5SXmo2poIQttJuYAvTVUNwQVEx/0yY5xmiuyqvXa+XT7NKJkOZSiAPlNt6 VffjgOP62S7M9wDShUghN3F7CPOrrRsOHWO/l6I/qJdUMW+MHSFYPfYiFXoLUZyPvNVCYSgs 3oQaFhHapq1f345XBtfG3fOYp1K2wTXd4ThFraTLl8PHxCn4ywARAQABzSRNYXR0aGlldSBC YWVydHMgPG1hdHR0YmVAa2VybmVsLm9yZz7CwZEEEwEIADsCGwMFCwkIBwIGFQoJCAsCBBYC AwECHgECF4AWIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZUDpDAIZAQAKCRD2t4JPQmmgcz33 EACjROM3nj9FGclR5AlyPUbAq/txEX7E0EFQCDtdLPrjBcLAoaYJIQUV8IDCcPjZMJy2ADp7 /zSwYba2rE2C9vRgjXZJNt21mySvKnnkPbNQGkNRl3TZAinO1Ddq3fp2c/GmYaW1NWFSfOmw MvB5CJaN0UK5l0/drnaA6Hxsu62V5UnpvxWgexqDuo0wfpEeP1PEqMNzyiVPvJ8bJxgM8qoC cpXLp1Rq/jq7pbUycY8GeYw2j+FVZJHlhL0w0Zm9CFHThHxRAm1tsIPc+oTorx7haXP+nN0J iqBXVAxLK2KxrHtMygim50xk2QpUotWYfZpRRv8dMygEPIB3f1Vi5JMwP4M47NZNdpqVkHrm jvcNuLfDgf/vqUvuXs2eA2/BkIHcOuAAbsvreX1WX1rTHmx5ud3OhsWQQRVL2rt+0p1DpROI 3Ob8F78W5rKr4HYvjX2Inpy3WahAm7FzUY184OyfPO/2zadKCqg8n01mWA9PXxs84bFEV2mP VzC5j6K8U3RNA6cb9bpE5bzXut6T2gxj6j+7TsgMQFhbyH/tZgpDjWvAiPZHb3sV29t8XaOF BwzqiI2AEkiWMySiHwCCMsIH9WUH7r7vpwROko89Tk+InpEbiphPjd7qAkyJ+tNIEWd1+MlX ZPtOaFLVHhLQ3PLFLkrU3+Yi3tXqpvLE3gO3LM7BTQRV4/npARAA5+u/Sx1n9anIqcgHpA7l 5SUCP1e/qF7n5DK8LiM10gYglgY0XHOBi0S7vHppH8hrtpizx+7t5DBdPJgVtR6SilyK0/mp 9nWHDhc9rwU3KmHYgFFsnX58eEmZxz2qsIY8juFor5r7kpcM5dRR9aB+HjlOOJJgyDxcJTwM 1ey4L/79P72wuXRhMibN14SX6TZzf+/XIOrM6TsULVJEIv1+NdczQbs6pBTpEK/G2apME7vf mjTsZU26Ezn+LDMX16lHTmIJi7Hlh7eifCGGM+g/AlDV6aWKFS+sBbwy+YoS0Zc3Yz8zrdbi Kzn3kbKd+99//mysSVsHaekQYyVvO0KD2KPKBs1S/ImrBb6XecqxGy/y/3HWHdngGEY2v2IP Qox7mAPznyKyXEfG+0rrVseZSEssKmY01IsgwwbmN9ZcqUKYNhjv67WMX7tNwiVbSrGLZoqf Xlgw4aAdnIMQyTW8nE6hH/Iwqay4S2str4HZtWwyWLitk7N+e+vxuK5qto4AxtB7VdimvKUs x6kQO5F3YWcC3vCXCgPwyV8133+fIR2L81R1L1q3swaEuh95vWj6iskxeNWSTyFAVKYYVskG V+OTtB71P1XCnb6AJCW9cKpC25+zxQqD2Zy0dK3u2RuKErajKBa/YWzuSaKAOkneFxG3LJIv Hl7iqPF+JDCjB5sAEQEAAcLBXwQYAQIACQUCVeP56QIbDAAKCRD2t4JPQmmgc5VnD/9YgbCr HR1FbMbm7td54UrYvZV/i7m3dIQNXK2e+Cbv5PXf19ce3XluaE+wA8D+vnIW5mbAAiojt3Mb 6p0WJS3QzbObzHNgAp3zy/L4lXwc6WW5vnpWAzqXFHP8D9PTpqvBALbXqL06smP47JqbyQxj Xf7D2rrPeIqbYmVY9da1KzMOVf3gReazYa89zZSdVkMojfWsbq05zwYU+SCWS3NiyF6QghbW voxbFwX1i/0xRwJiX9NNbRj1huVKQuS4W7rbWA87TrVQPXUAdkyd7FRYICNW+0gddysIwPoa KrLfx3Ba6Rpx0JznbrVOtXlihjl4KV8mtOPjYDY9u+8x412xXnlGl6AC4HLu2F3ECkamY4G6 UxejX+E6vW6Xe4n7H+rEX5UFgPRdYkS1TA/X3nMen9bouxNsvIJv7C6adZmMHqu/2azX7S7I vrxxySzOw9GxjoVTuzWMKWpDGP8n71IFeOot8JuPZtJ8omz+DZel+WCNZMVdVNLPOd5frqOv mpz0VhFAlNTjU1Vy0CnuxX3AM51J8dpdNyG0S8rADh6C8AKCDOfUstpq28/6oTaQv7QZdge0 JY6dglzGKnCi/zsmp2+1w559frz4+IC7j/igvJGX4KDDKUs0mlld8J2u2sBXv7CGxdzQoHaz lzVbFe7fduHbABmYz9cefQpO7wDE/Q== Organization: NGI0 Core In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi Geliang, On 02/04/2024 14:52, Geliang Tang wrote: > From: Geliang Tang > > This patch adds a new helper chk_msk_info() to show the counters in > mptcp_info of the given info, and check that the timestamps move > forward. Use it to show newly added last_data_sent, last_data_recv > and last_ack_recv in mptcp_info in chk_last_time_info(). > > Signed-off-by: Geliang Tang > --- > tools/testing/selftests/net/mptcp/diag.sh | 51 +++++++++++++++++++++++ > 1 file changed, 51 insertions(+) > > diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh > index bc97ab33a00e..911920f3edbb 100755 > --- a/tools/testing/selftests/net/mptcp/diag.sh > +++ b/tools/testing/selftests/net/mptcp/diag.sh > @@ -200,6 +200,56 @@ chk_msk_cestab() > "${expected}" "${msg}" "" > } > > +msk_info_get_value() > +{ > + local port="${1}" > + local info="${2}" > + > + ss -N "${ns}" -inHM dport "${port}" | \ > + mptcp_lib_get_info_value "${info}" "${info}" > +} > + > +chk_msk_info() > +{ > + local port="${1}" > + local info="${2}" > + local cnt="${3}" > + local now delta_ms=250 > + > + now=$(msk_info_get_value "${port}" "${info}") > + > + mptcp_lib_print_title "....chk ${info}" One small detail: here the title printed here ... > + if { [ -z "${cnt}" ] || [ -z "${now}" ]; } && > + ! mptcp_lib_expect_all_features; then > + mptcp_lib_pr_skip "Feature probably not supported" > + mptcp_lib_result_skip "${info}" ... and the title used in the TAP format here ... > + elif [ "$((cnt + delta_ms))" -lt "${now}" ]; then > + mptcp_lib_pr_ok > + mptcp_lib_result_pass "${info}" ... here ... > + else > + mptcp_lib_pr_fail "value of ${info} changed by $((now - cnt))ms," \ > + "expected at least ${delta_ms}ms" > + mptcp_lib_result_fail "${info}" ... and here are different: Output: (...) # 06 after MPC handshake [ OK ] # 07 ....chk last_data_sent [ OK ] # 08 ....chk last_data_recv [ OK ] # 09 ....chk last_ack_recv [ OK ] # 10 ....chk remote_key [ OK ] # 11 ....chk no fallback [ OK ] # 12 ....chk 2 msk in use [ OK ] # 13 ....chk 2 cestab [ OK ] # 14 ....chk 2->0 msk in use after flush [ OK ] # 15 ....chk 2->0 cestab after flush [ OK ] (...) TAP: (...) # ok 6 - diag: after MPC handshake # ok 7 - diag: last_data_sent # ok 8 - diag: last_data_recv # ok 9 - diag: last_ack_recv # ok 10 - diag: ....chk remote_key # ok 11 - diag: ....chk no fallback # ok 12 - diag: ....chk 2 msk in use # ok 13 - diag: ....chk 2 cestab # ok 14 - diag: ....chk 2->0 msk in use after flush # ok 15 - diag: ....chk 2->0 cestab after flush (...) apart from that, the rest looks good to me. Reviewed-by: Matthieu Baerts (NGI0) If there are no other modifications needed after Mat's review, I can also fix that when applying the patches. > + ret=${KSFT_FAIL} > + fi > +} > + > +chk_last_time_info() > +{ > + local port="${1}" > + local data_sent data_recv ack_recv > + > + data_sent=$(msk_info_get_value "${port}" "last_data_sent") > + data_recv=$(msk_info_get_value "${port}" "last_data_recv") > + ack_recv=$(msk_info_get_value "${port}" "last_ack_recv") > + > + sleep 0.5 (while at it, maybe good to add a comment here) sleep 0.5 # wait to check after if the timestamps are bigger (and above) local delta_ms=250 # half what we waited before, just to be sure > + > + chk_msk_info "${port}" "last_data_sent" "${data_sent}" > + chk_msk_info "${port}" "last_data_recv" "${data_recv}" > + chk_msk_info "${port}" "last_ack_recv" "${ack_recv}" > +} > + > wait_connected() > { > local listener_ns="${1}" > @@ -233,6 +283,7 @@ echo "b" | \ > 127.0.0.1 >/dev/null & > wait_connected $ns 10000 > chk_msk_nr 2 "after MPC handshake " > +chk_last_time_info 10000 > chk_msk_remote_key_nr 2 "....chk remote_key" > chk_msk_fallback_nr 0 "....chk no fallback" > chk_msk_inuse 2 Cheers, Matt -- Sponsored by the NGI0 Core fund.