From nobody Tue May 14 08:35:12 2024 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 9259153398 for ; Fri, 9 Feb 2024 17:29:09 +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=1707499750; cv=none; b=n/YTacrT6EX49sCANCyjnGl4ylIBfRcK1FoqxBeVYORwkrNKHpZD5poNWcuwDLPm8MN7CldR2RMhM7mVk4ZSoRmFPTCUYuDJBMh3ieeWnvEiFCQsF1dDAm9S6N0kQxL+AJk+4sFHQtN+VCbhRlDLQrW1WgGkE56KIEOgxOKDufE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707499750; c=relaxed/simple; bh=Q+fM5Jv0a7jv0DaPovnuTii8KGP901zqYpen7P6m3L0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gnx98ck4HoyP+oOaP/n0RFBaQdV16Np1cAa8Zrm6fXjJDz5B5bHAGbl+Bh5PcKOuVOeLRCL8eHuXH3r2hMCR8DvHLz2r+vbCcB69foezVcTOm786eDvqZdHaLn4oIFPb7uiwm7eCkgbiwfD7SNv0N7fl76+RBzrp3a5nCMMdFbA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hpIk/oCt; 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="hpIk/oCt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85B31C43394; Fri, 9 Feb 2024 17:29:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707499749; bh=Q+fM5Jv0a7jv0DaPovnuTii8KGP901zqYpen7P6m3L0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hpIk/oCtmz9am2UKWwipP3c3mPWEF5AV3tIgRfLuBxOsU0q2hyFBsPNBRWfFvwI5u KihZDpSwOq52+s+lRHhvHmjHgiOKWw12aay7k8km7fgQw6biODTuoN0Pl2rG7CXpBR mfmYnRKjYD9MGG6fL2SgZTw8pS1VWWcIR1JfVHT32HvOSR2u9GI3fg2GCw+RBuKkcL HwWHuF21WeezPwgh/s65tHjnxgOUloSgLMeiIxWXrLwj7yfMsS4dpwYu4z3mejOGnl LDDUzPG1vTT1iXXxGkEH3QVatzWSJiy5VXFvM3f/QQ4ECg/qit0+Qxmm4QOlyksk22 oZEff+yVpDLhA== From: "Matthieu Baerts (NGI0)" Date: Fri, 09 Feb 2024 18:28:39 +0100 Subject: [PATCH mptcp-net 1/5] selftests: mptcp: simult flows: fix some subtest names Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240209-selftests-mptcp-uniq-title-v1-1-e4fb3a3b5f66@kernel.org> References: <20240209-selftests-mptcp-uniq-title-v1-0-e4fb3a3b5f66@kernel.org> In-Reply-To: <20240209-selftests-mptcp-uniq-title-v1-0-e4fb3a3b5f66@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=1072; i=matttbe@kernel.org; h=from:subject:message-id; bh=Q+fM5Jv0a7jv0DaPovnuTii8KGP901zqYpen7P6m3L0=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBlxmDiEB+vVMHz0kMV4OIWpMvd3DRBbO4zTinmU dcAIt316EqJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZcZg4gAKCRD2t4JPQmmg c2yCEACbRj2lYx4qhgVkSTHn72qbYTDAisKKI0W09FIJ3pR8KLvhNtBLea2dY5PNO70dA+n7lbK s2F6zczSBx3hiPe791i06teBrEeVfzToJkmSFWvWbjatxiQY5NaZ6yVFgNRjocxcYRmPURI+XFf Cydoa9PLIPOTxjHmZPYy0iStvH2llWrDcDMyfvODFbQ7cXMxxtOqulVvc2i+X/FfLIxeuVVzR7e 6TTaICWaEDwHdny5nK8C2vh7RjvJx0EsDLJ4DX+uRJpPx1RxC916r43j7rBi8ut5dWUcJ3KwHy+ WeRXQYRkFZsD8UOWBG8ITkw/CZpNe8XbeW+XYdSO7h2Gu8X9N0GtgqVJapMkGxP6cOWH/3jmBfL UrzM9Dl2CkXUV7VRrwug0eTCFeFlYS7lZOsDn8O3RxKJIAtioTJt7SG0q9B+1CvEKR+wAQOiZjE yInzTmjHGjUkn0cmdBawmLI+m0xY3bPT8NsO6MFahjBBpNdMpu45j5fWNSZLU1H+e0YoXKPlgI3 t3mJ0Ujham2eu+Pj0yfAob+lj9jrn62FnyCwDQwaUHgVat/Ysu2OY4iC9eKYvZG4p7GZ8hZX5YM 0iARTG7SoJSwFrcKp90dEWWUQuB359wsN0ID/K4iuaqvtoX4156PXGeDOeS+gHsPiS1g8bAZlPd bHOKizXpS+qA6qA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 The selftest was correctly recording all the results, but the 'reverse direction' part was missing in the name when needed. It is important to have a unique (sub)test name in TAP, because some CI environments drop tests with duplicated name. Fixes: 675d99338e7a ("selftests: mptcp: simult flows: format subtests resul= ts in TAP") Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/mptcp/simult_flows.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 619be0e1acf5..f377ef01970b 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -250,7 +250,8 @@ run_test() [ $bail -eq 0 ] || exit $ret fi =20 - printf "%-60s" "$msg - reverse direction" + msg=3D"${msg} - reverse direction" + printf "%-60s" "${msg}" do_transfer $large $small $time lret=3D$? mptcp_lib_result_code "${lret}" "${msg}" --=20 2.43.0 From nobody Tue May 14 08:35:12 2024 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 3A7DF53398 for ; Fri, 9 Feb 2024 17:29:10 +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=1707499750; cv=none; b=MzW92yNUWy8Q4sa8a04+8yIQjMly0MdndDqFimLrfzubM7IuetwaMDWfRYePOH3YwN5Fs/bdgey0D/YkSK08XduUgAKd9ELgUNSC6nMh+JFgosDxLN0wFTY2/tQqZYLDrCL0O04+NX+jT30ruCVp8kTN7lxA0wnn4BW3WtEZO04= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707499750; c=relaxed/simple; bh=hvG/nPNAxX7rVhtHd425COQSVnzV+hvk6AfbCjxEcxY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OViYcDCWv4CZP8WhaqgyOurqX1SFEmLNTIh0x7TmFR6HB+GNvASG2+Fmg1+KPtdGy1NrSB/Xg5rPrc5+kWEjAD4IVWsqFwe0kJhH+8iQ6Gh0mLWp4e2ivxNpZ/BqVVNA6vKs2RIEOqQdnx3C5LaFhEqzeTbER0M0NKxMbwuljSo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fTNtxsHg; 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="fTNtxsHg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 832E6C433C7; Fri, 9 Feb 2024 17:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707499750; bh=hvG/nPNAxX7rVhtHd425COQSVnzV+hvk6AfbCjxEcxY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=fTNtxsHgsLiKXWpwharFjX2zFq7AKZi/1JvkWPsx+Gb+38XSBgfFVswCm1EPE4TSe Xv8tDIOpiAXnKlbpY/VwzT8V+lI/7mQog5iMIZGX5uV9VyKL3z2Aofc8Cf/MUSYK4v icl0BZSSLI802DhK6rucE+9tYrAnXbjB9qggqvHmA/ULanImDJ6K++aNI7pzFkdiUG qKP+CFcbd75GfwQlRCCymNxTr1d030d213SLG5Zld0hHW5879V1LZ5yVNJrt/G9wiS EP+8LWILP6SydgTgwASIwk7qp+cUQE6iTH6yj7UDY5w+2gNgNngYUGFdAeoENhAPST 1yMyFBFkC6wOQ== From: "Matthieu Baerts (NGI0)" Date: Fri, 09 Feb 2024 18:28:40 +0100 Subject: [PATCH mptcp-net 2/5] selftests: mptcp: userspace_pm: unique subtest names Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240209-selftests-mptcp-uniq-title-v1-2-e4fb3a3b5f66@kernel.org> References: <20240209-selftests-mptcp-uniq-title-v1-0-e4fb3a3b5f66@kernel.org> In-Reply-To: <20240209-selftests-mptcp-uniq-title-v1-0-e4fb3a3b5f66@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=1556; i=matttbe@kernel.org; h=from:subject:message-id; bh=hvG/nPNAxX7rVhtHd425COQSVnzV+hvk6AfbCjxEcxY=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBlxmDjFd7RA6XQHgJMwhhHbaaq+U6mF87Z6VH07 MCLi6z5Zu2JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZcZg4wAKCRD2t4JPQmmg c8S1EAChWzpm7tYv3eKy/8MEm3mGp2rYzhnH9wYT/ApNEIvbvODRPhkN8+6NpyxI7kX83Uo9R2d q434fXocb06WwbCUs6nFB184SoFhE0z6MP9UvWiDvRam9UKrEbYPzjFGoYhYB9HiXD+EPJ8yx6w Txz/1wz9mOh7kgnxP6EYCGMiYAfwTuR+AlIcVToh1qOWPURTHfuXWBXg+N1Zr7pdp4SEz5y4b8p LgpVZnXHy1uaSpBKoP83yPqCfkdlYLbjWrpuc29iSNENrK1l4tJqKS8pRIjAtKUjqo8OSW0RYPp CLFJLml4H0Ag2s5vVZCxdIGDtzQG/f71EdpgAkJ05OGf9GW6mET5gG01QAoAtbMBHTS2Np+R8ha KPghVfuJU6fERyyiciE7jCahxExxBZfM+GUBWNhEoWT7faxvq1nx1pyPd7R8o8h+HFlF69lFJ1F Q/7RFGmlmmHEsTrKITyYfK5VJsU8SunLQvMjnl2X7Z3LNNfbbh47gX96vG2bl8CK247od2IY1aC ufk5Tg1BLBabiC2hdQtDf5x+uaYGpxoABMlnaRifhPsEGxiIdQFXR/gm6V/QqgP0WQNQyBjoqKz ESEtFNFA5huzbN/wngF08GuC1uOasftZWFgJv+zaDcN62UadDSg3lQsBTbSYKWtYVgUxPoK5jOt oxxgofTiUfv775A== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 It is important to have a unique (sub)test name in TAP, because some CI environments drop tests with duplicated names. Some subtests from the userspace_pm selftest had the same names. That's because different subflows are created (and deleted) between the same pair of IP addresses. Simply adding the destination port in the name is then enough to have different names, because the destination port is always different. Note that adding such info takes a bit more space, so we need to increase a bit the width to print the name, simply to keep all the '[ OK ]' aligned as before. Fixes: f589234e1af0 ("selftests: mptcp: userspace_pm: format subtests resul= ts in TAP") Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/mptcp/userspace_pm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 6167837f48e1..1b94a75604fe 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -75,7 +75,7 @@ print_test() { test_name=3D"${1}" =20 - _printf "%-63s" "${test_name}" + _printf "%-68s" "${test_name}" } =20 print_results() @@ -542,7 +542,7 @@ verify_subflow_events() local remid local info =20 - info=3D"${e_saddr} (${e_from}) =3D> ${e_daddr} (${e_to})" + info=3D"${e_saddr} (${e_from}) =3D> ${e_daddr}:${e_dport} (${e_to})" =20 if [ "$e_type" =3D "$SUB_ESTABLISHED" ] then --=20 2.43.0 From nobody Tue May 14 08:35:12 2024 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 733FB53398 for ; Fri, 9 Feb 2024 17:29:11 +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=1707499751; cv=none; b=OjBZkBRG/Yc6KLXI+oTue1BuJVpQgacsVW4dcYhuxMBTihse3XPG/DideDMxMySf2R8V7TQdD9SQSyviFxj7wuEcykBrr+YOYTLDNBgr0t2fJxm2HmYj/UIPjFGPLpwbnfzAJ5lQEUkPVm3XfCqpLhun1Z+YU2K4tQWZOZ2wf7E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707499751; c=relaxed/simple; bh=jt6BRU6kB+BNM6U9SsE6L+qv0YlY3DHoLO63SZYWVLg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AQyspBuo5lIBEYQ24PjWCIYsfC8PkzK0quBbZhQZklKx5liXu2lPLoa548ZZ+Y5ZzDMjd8DeqeejA+pYFbAfNhCfTDyq2+C8KG6+rntMA45wjRCJMZzMHjxVxQqNM0dhnadR3ScKiPeGyTdyOEdNxoWcaxDvmUYn+N1facE1S4E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ahEErO+f; 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="ahEErO+f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80390C433C7; Fri, 9 Feb 2024 17:29:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707499751; bh=jt6BRU6kB+BNM6U9SsE6L+qv0YlY3DHoLO63SZYWVLg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ahEErO+fVBFfuro496l8v3lrQ+ZMhgtJFeHxvRazZhYErpdcN57ykA7NIwu9XBvuz D/ni6k5+88002aVkv1UsV+Apbh9Ne1I4wj9FcGfOIFEMuyLYslkWBpx0khB+jyKDX1 jFEpQaQtYJjqhwrp6Vg+61Nbjw+5c0c6BuW11lAUpEs5k75yX2AX1aAD8AoIQZgNF2 Tn+Kpoo5WtILU+IVVxdWE44bKWSZp1udZ+TdFAcEQW+DpAmqzNbynYrPSop0j72+Vm qsgAsHWz83E5r4iz5+u2Yuc76Njq/pWErFwhDSpEqRiqIINGuC5e6+/whT+7yypGli gzCwBaoNnZ7qw== From: "Matthieu Baerts (NGI0)" Date: Fri, 09 Feb 2024 18:28:41 +0100 Subject: [PATCH mptcp-net 3/5] selftests: mptcp: diag: unique 'in use' subtest names Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240209-selftests-mptcp-uniq-title-v1-3-e4fb3a3b5f66@kernel.org> References: <20240209-selftests-mptcp-uniq-title-v1-0-e4fb3a3b5f66@kernel.org> In-Reply-To: <20240209-selftests-mptcp-uniq-title-v1-0-e4fb3a3b5f66@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=2606; i=matttbe@kernel.org; h=from:subject:message-id; bh=jt6BRU6kB+BNM6U9SsE6L+qv0YlY3DHoLO63SZYWVLg=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBlxmDjIMtipQQYht1fWZZ8FzooUygS4NbC/lSBE P/tqnnu9hyJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZcZg4wAKCRD2t4JPQmmg c2WYD/oCrzeAQWODlHTLyyFwrAgg9UV2yZbia9JJglQzK4o+nVINf0ykLn5XklziWKoqW9noM5E ho5nj9E5F93zLB3XilJzhvp2e5dGT4j9UwLizLu1aOlt4wzmN3uxyoJzgTo4BOygW7UE7gwbBsV XcN63qzDlFeHRZuH/InvCflPEs4XjZELqZx5gmrIsWnmsE5F4gQQ7faD5jsSE0PLLWkCm0dqbKC 2SL77knGQT0TLjO2I1TuEd4871+gjqGMOIr2yaa1zyBxXMZstvVUyjhidVq/qToCVULE5Htoa/i Nfmp1478s5Y2Dp2A4Bh3c8BUPMFJ5Dl2OVwXuSY2zceL+a3/6w1SNxt1aRdeWpX+rewPjkNHAcE +OHnVks++rQ5lr4F1BxePHASzigYd+titufIF0lvC1S4YL+p7hYRoscsf4lGf0TWgABeYs1CkSb 1FDABFCn1lOCQOb/EY/t4wm1xuH/cBAk2MZXkVMDALRP6rxDcJLYhFIDODGtE85u3AL2S8ulD+d /u0blT2V6j3pCLtLGaGAJBQ678JCvb9gGJ7yxlyAwjrSYBjFmwh3Ld2qUZGqUlUelNZ94sJ4J3K M4dn/4fdrkCOl1p2/0fGndNNkPXpCRpoQikTGzBfa3sZ1WUAB/kq5BPpa2ZNpGBypkFMb/IDzXg J+mtAXx9swkYCAw== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 It is important to have a unique (sub)test name in TAP, because some CI environments drop tests with duplicated name. Some 'in use' subtests from the diag selftest had the same names, e.g.: chk 0 msk in use after flush Now the previous value is taken, to have different names, e.g.: chk 2->0 msk in use after flush While at it, avoid repeating the full message, declare it once in the helper. Fixes: ce9902573652 ("selftests: mptcp: diag: format subtests results in TA= P") Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 04fcb8a077c9..7e7e40601c6b 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -166,9 +166,13 @@ chk_msk_listen() chk_msk_inuse() { local expected=3D$1 - local msg=3D"$2" + local msg=3D"....chk ${2:-${expected}} msk in use" local listen_nr =20 + if [ "${expected}" -eq 0 ]; then + msg=3D"${msg} after flush" + fi + listen_nr=3D$(ss -N "${ns}" -Ml | grep -c LISTEN) expected=3D$((expected + listen_nr)) =20 @@ -179,7 +183,7 @@ chk_msk_inuse() sleep 0.1 done =20 - __chk_nr get_msk_inuse $expected "$msg" 0 + __chk_nr get_msk_inuse $expected "${msg}" 0 } =20 # $1: cestab nr @@ -227,11 +231,11 @@ wait_connected $ns 10000 chk_msk_nr 2 "after MPC handshake " chk_msk_remote_key_nr 2 "....chk remote_key" chk_msk_fallback_nr 0 "....chk no fallback" -chk_msk_inuse 2 "....chk 2 msk in use" +chk_msk_inuse 2 chk_msk_cestab 2 flush_pids =20 -chk_msk_inuse 0 "....chk 0 msk in use after flush" +chk_msk_inuse 0 "2->0" chk_msk_cestab 0 =20 echo "a" | \ @@ -247,11 +251,11 @@ echo "b" | \ 127.0.0.1 >/dev/null & wait_connected $ns 10001 chk_msk_fallback_nr 1 "check fallback" -chk_msk_inuse 1 "....chk 1 msk in use" +chk_msk_inuse 1 chk_msk_cestab 1 flush_pids =20 -chk_msk_inuse 0 "....chk 0 msk in use after flush" +chk_msk_inuse 0 "1->0" chk_msk_cestab 0 =20 NR_CLIENTS=3D100 @@ -273,11 +277,11 @@ for I in `seq 1 $NR_CLIENTS`; do done =20 wait_msk_nr $((NR_CLIENTS*2)) "many msk socket present" -chk_msk_inuse $((NR_CLIENTS*2)) "....chk many msk in use" +chk_msk_inuse $((NR_CLIENTS*2)) "many" chk_msk_cestab $((NR_CLIENTS*2)) flush_pids =20 -chk_msk_inuse 0 "....chk 0 msk in use after flush" +chk_msk_inuse 0 "many->0" chk_msk_cestab 0 =20 mptcp_lib_result_print_all_tap --=20 2.43.0 From nobody Tue May 14 08:35:12 2024 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 3617553398 for ; Fri, 9 Feb 2024 17:29:12 +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=1707499752; cv=none; b=i+FE/uSjfe25NFgDBsjziNuNyj7mDjDIGdKjemh6vJonoKi26Ju8Lq0bkqqKPXJ5X3hIbIhKqxQx1ScEQmm/hstA+bFqip66S2jW5unkVuHa5J0ufuxnPNzQjOQBV1JpiKSs3i9m2g1m6G7oFfKsp8W5v0kdc1Aon7/02H56RA4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707499752; c=relaxed/simple; bh=Q/q/MpSotLJM7xtBsnAgFAbv8VGi7THdXvJwIQw8TTI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WrVUQouWPGGxKE/xK0dkbTnvGf28TTFPMg8+YnXnxmgpZHl1hzRG5Q0UrPocMGhplAkStt19ykvU/Pmpnz5hEyndUFtBXWWVoTPUZN8mAnEMiaFbsVZT3XeoRQ2iBQPqPTWdzecABiwuZKX3mmgzwGfETiaOyZkElhHgUgTCNwg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=USh6Agr6; 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="USh6Agr6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DE8AC433F1; Fri, 9 Feb 2024 17:29:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707499752; bh=Q/q/MpSotLJM7xtBsnAgFAbv8VGi7THdXvJwIQw8TTI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=USh6Agr6HWaG7p3AsoXsJDt0Y91M+qA+J4g7banezrgoQJj6i1eim4nSZ2DJjea9i E7csml0/iIuNXJO3YqlZRdSXR/dGu3iz2wGhtPtEmkRFwIQTdXOdTwtVp367wLEcBK bzYSpeHVm8oi2j9Jm6I9hTMjYKJ+OZmNmG3zNwKreGSxPyR2pzUsMkD5pqERJF10Rb X9nI9T7ssjrZtP6CFxviBqOWA0HkryyntN7kYNHIlhtkgGGGZYZPsCTvJMGb2ZVxG5 tJkB4b3tn76zAHJpXlyefgCZZocutejI0/XMlyKIxYi27Ap0U28MCpbEPoxDeostzY VrEl3aPxZdq0g== From: "Matthieu Baerts (NGI0)" Date: Fri, 09 Feb 2024 18:28:42 +0100 Subject: [PATCH mptcp-net 4/5] selftests: mptcp: diag: unique 'cestab' subtest names Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240209-selftests-mptcp-uniq-title-v1-4-e4fb3a3b5f66@kernel.org> References: <20240209-selftests-mptcp-uniq-title-v1-0-e4fb3a3b5f66@kernel.org> In-Reply-To: <20240209-selftests-mptcp-uniq-title-v1-0-e4fb3a3b5f66@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=2464; i=matttbe@kernel.org; h=from:subject:message-id; bh=Q/q/MpSotLJM7xtBsnAgFAbv8VGi7THdXvJwIQw8TTI=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBlxmDj/M8+e3pSnbNBtgS7Gac2PT+VjKPncFasG A64grCOzeWJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZcZg4wAKCRD2t4JPQmmg c99UD/9vHLmO7c1z7/Oy62oVeSOkjeWzNVo3jNWWC9iJG0l+3FVWNDMuI8jaRkzrVaruvBbRpwz uH6KlJPhZ+N7XPh413FOMjMxeKCzm+d1NRr+Jlf/2iANMwW5D4mUl9YArexksrlEt1YbfBqabGO 9YlQspu0Xigkg8iMCa1FAi0UgnOjjSawf4WdjAGIEiCp69xCmpKSAne8HO934JNBa5A8wf3b5ry ExvgRA7Ptwt6Kt9nXurCn7qCf3/q1zjmu4ezEo+svD92s82sXPT4fAJa6hdBBjfMcOfGEP/T7ju GTG4tXNLQSXwoPZoAGmwbSRCLq0TYqM+JjF6BOtkZ0k3dfMhoG8sxyGuD83zvSO0AHjUByyB9+4 krbqRQauE2N+c/yG7qodBAW1n2/raxNsKcFz0SARxLF3p7aJc80uXn/OR8SKKTNWCbe4fMb8xC+ XgXT7Xjozmg3Zp5u/AopZfjV5yi+pMLDWMW1apcBixqQTXO7gsmFNCS/AqLgJDxtMUoX+3ar3fe czPaDCWq0DEMiZJnYlU7qRR9iPAudXpGvCOXaDX70tcKGbgqGvETayP33YVeIWNqmvA6mhX4J2y vRTnnnydSTE1vVTeX+SnxTxWf2fvBxDnWkedgsI60SSkj/fKOfWA5NNjWk2yGLvOsfVDobzC7VN qM9BjeVdfj23Rlw== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 It is important to have a unique (sub)test name in TAP, because some CI environments drop tests with duplicated name. Some 'cestab' subtests from the diag selftest had the same names, e.g.: ....chk 0 cestab Now the previous value is taken, to have different names, e.g.: ....chk 2->0 cestab after flush While at it, the 'after flush' info is added, similar to what is done with the 'in use' subtests. Also inspired by these 'in use' subtests, 'many' is displayed instead of a large number: many msk socket present [ ok ] ....chk many msk in use [ ok ] ....chk many cestab [ ok ] ....chk many->0 msk in use after flush [ ok ] ....chk many->0 cestab after flush [ ok ] Fixes: 81ab772819da ("selftests: mptcp: diag: check CURRESTAB counters") Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 7e7e40601c6b..2cffa85a0bb7 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -189,10 +189,15 @@ chk_msk_inuse() # $1: cestab nr chk_msk_cestab() { - local cestab=3D$1 + local expected=3D$1 + local msg=3D"....chk ${2:-${expected}} cestab" + + if [ "${expected}" -eq 0 ]; then + msg=3D"${msg} after flush" + fi =20 __chk_nr "mptcp_lib_get_counter ${ns} MPTcpExtMPCurrEstab" \ - "${cestab}" "....chk ${cestab} cestab" "" + "${expected}" "${msg}" "" } =20 wait_connected() @@ -236,7 +241,7 @@ chk_msk_cestab 2 flush_pids =20 chk_msk_inuse 0 "2->0" -chk_msk_cestab 0 +chk_msk_cestab 0 "2->0" =20 echo "a" | \ timeout ${timeout_test} \ @@ -256,7 +261,7 @@ chk_msk_cestab 1 flush_pids =20 chk_msk_inuse 0 "1->0" -chk_msk_cestab 0 +chk_msk_cestab 0 "1->0" =20 NR_CLIENTS=3D100 for I in `seq 1 $NR_CLIENTS`; do @@ -278,11 +283,11 @@ done =20 wait_msk_nr $((NR_CLIENTS*2)) "many msk socket present" chk_msk_inuse $((NR_CLIENTS*2)) "many" -chk_msk_cestab $((NR_CLIENTS*2)) +chk_msk_cestab $((NR_CLIENTS*2)) "many" flush_pids =20 chk_msk_inuse 0 "many->0" -chk_msk_cestab 0 +chk_msk_cestab 0 "many->0" =20 mptcp_lib_result_print_all_tap exit $ret --=20 2.43.0 From nobody Tue May 14 08:35:12 2024 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 6DC3D53398 for ; Fri, 9 Feb 2024 17:29:13 +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=1707499753; cv=none; b=ln6xhC3rlCPxJ7XhlQHVbLCUacfncMxVOJbX5QEOb6wcH80ThxIXBPqqr+OO09uYMbdQpUd+Vs51JqtRM87zUSU0d3Ws5FZaC5vWNLwSOV4Wq6KBsZU6VqUva25wJ5uk25WczqLs8aWeaUVp4+ig9cETS97qF8o3A82a2r2pcIA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707499753; c=relaxed/simple; bh=k19QfQTM6BklgCn0TivSF1zvEGRWJJiaNLoU+TAvgFY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AvdrZp/zChWVKuARZmMDvqKDP6Idx4ltdtWdyvzBK81pjTxqQPRBouY16y0oNLE9/xca/DVyL2Yr5fYwLBHwUCe3wy/qd56e6EzEOolHcJn3WYQibXolCQiS3Kplmkg+ePGq3Ax/LzVdPNE31ubWmEAEUaGzKAqbWDWlWSyX874= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=vDQp4RcX; 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="vDQp4RcX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B8AAC433F1; Fri, 9 Feb 2024 17:29:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707499753; bh=k19QfQTM6BklgCn0TivSF1zvEGRWJJiaNLoU+TAvgFY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=vDQp4RcXpnOherjB5p2d+v8kwTdxZCd+iyZC/TIm8Dq+3OSGtOaUJvi/P7wVR+q4W YTWJxHf+nbZhe0nM41zOXVsKNUcZpEgdW+P8QlxyuRYajhV1vWC89FlHL4rfbkpdyW G7n+gLAuy1u+qd7YIe18Wh0uwuAEUJlJvlqxZRELOqiXMokV/8/3R79AIV1VDuCrh/ dTMXG+x8oAIM8ZIBnYBrQW+L6ZljpfFeQZUpJmkskpcTNYcxBAgq1eKlUkfNCXaYmJ u0ojB+gOzZbaS4dklIljVgzl23eumM/e/wZyAj59dtnPqNRrOnNf+SOkvXS/vpSmLs J/se0mK6FIWCg== From: "Matthieu Baerts (NGI0)" Date: Fri, 09 Feb 2024 18:28:43 +0100 Subject: [PATCH mptcp-net 5/5] selftests: mptcp: lib: catch duplicated subtest entries Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240209-selftests-mptcp-uniq-title-v1-5-e4fb3a3b5f66@kernel.org> References: <20240209-selftests-mptcp-uniq-title-v1-0-e4fb3a3b5f66@kernel.org> In-Reply-To: <20240209-selftests-mptcp-uniq-title-v1-0-e4fb3a3b5f66@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=2442; i=matttbe@kernel.org; h=from:subject:message-id; bh=k19QfQTM6BklgCn0TivSF1zvEGRWJJiaNLoU+TAvgFY=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBlxmDjaByetgH9UM7ojBfZnVfTzQvfEzy8Lvw9T yzTgsku0ayJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZcZg4wAKCRD2t4JPQmmg cwcbD/9IHADkE2NvW/b6gxOQtxbcblaewJqP56BCsSTVRL0tzDSOkgyaYt6EE70qZpRoYt/0hec DxGhIAmoUd9c2SdZGKYrlsXcKuyXxzytGRi6rtyUUUB17MepIgHWdVhAa3CZiOfZqpZr4WA11+z SQsf4v+Od43VsxgP0KTTQj+xYLXF84k8AM1OaWAO9u7R2TKAYzT1XuNq6AK1gdLyNXQmCOA+03e rpcbrf2ZvIk1yvdof9KI2pvQXKmB2jSDK4rkN5Hb8BFLHQn+wPSkSm9BkpM6BEAJ9Lo7BjLJZ+x q28NkZASOUpY2kEMBTIwy+t2lhrQv5VYkWXQk+lys+WUYfvbmsCbc6U8Iauu8E0LPSezKxy05GM pL5X3Ktz5PJRMaOKGYEP1owvQle/8i6g6vOvYIySCnpX7t9p9Mjwg0WJO8CzV2G/IUC+lphiqQ3 gnIjXLFqcbs0jq+X0db9U82H+hdmG1ZyN54PJpIk6wOo/D/KiRXWeZAT/5aREtWx6raxIVbBuaN 4PxhAOj0AG3sar5hf4VaI+GQANIBPeOSGyOOG9oNDpIgN+jyX/opzmzvWGxLZ3hytPIEPyQ4/Ys SW3iAfdHC0d+IKICGm0aILlNdtYGA9iJRTdvStA3ewoCGCmaVxW5dv9uIUj7ez4J+HPrYPNBf3+ iZnaAFdfVJh73wg== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 It is important to have a unique (sub)test name in TAP, because some CI environments drop tests with duplicated name. When adding a new subtest entry, an error message is printed in case of duplicated entries. If there were duplicated entries and if all features were expected to work, the script exits with an error at the end, after having printed all subtests in the TAP format. Thanks to that, the MPTCP CI will catch such issues early. Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- Notes: - This is a patch for 'mptcp-next'. But because it depends on the other ones, I added it in this series, also to check I didn't miss anything. --- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 3a2abae5993e..037cb3e84330 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -9,6 +9,7 @@ readonly KSFT_SKIP=3D4 readonly KSFT_TEST=3D"${MPTCP_LIB_KSFT_TEST:-$(basename "${0}" .sh)}" =20 MPTCP_LIB_SUBTESTS=3D() +MPTCP_LIB_SUBTESTS_DUPLICATED=3D0 =20 # only if supported (or forced) and not disabled, see no-color.org if { [ -t 1 ] || [ "${SELFTESTS_MPTCP_LIB_COLOR_FORCE:-}" =3D "1" ]; } && @@ -146,12 +147,26 @@ mptcp_lib_kversion_ge() { mptcp_lib_fail_if_expected_feature "kernel version ${1} lower than ${v}" } =20 +__mptcp_lib_result_check_duplicated() { + local subtest + + for subtest in "${MPTCP_LIB_SUBTESTS[@]}"; do + if [[ "${subtest}" =3D=3D *" - ${KSFT_TEST}: ${*%% #*}" ]]; then + MPTCP_LIB_SUBTESTS_DUPLICATED=3D1 + mptcp_lib_print_err "Duplicated entry: ${*}" + break + fi + done +} + __mptcp_lib_result_add() { local result=3D"${1}" shift =20 local id=3D$((${#MPTCP_LIB_SUBTESTS[@]} + 1)) =20 + __mptcp_lib_result_check_duplicated "${*}" + MPTCP_LIB_SUBTESTS+=3D("${result} ${id} - ${KSFT_TEST}: ${*}") } =20 @@ -206,6 +221,12 @@ mptcp_lib_result_print_all_tap() { for subtest in "${MPTCP_LIB_SUBTESTS[@]}"; do printf "%s\n" "${subtest}" done + + if [ "${MPTCP_LIB_SUBTESTS_DUPLICATED}" =3D 1 ] && + mptcp_lib_expect_all_features; then + mptcp_lib_print_err "Duplicated test entries" + exit ${KSFT_FAIL} + fi } =20 # get the value of keyword $1 in the line marked by keyword $2 --=20 2.43.0