From nobody Sat Apr 20 15:18:06 2024 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 D6BC98AD0 for ; Tue, 15 Nov 2022 22:10:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668550254; x=1700086254; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/+J2SJGFfiOnwickjgrCYZT4bEgVNKrrWZZlc0+2ECI=; b=lF1/GtnERm1SM2GeIlvz74HKio0UX7dPK/37ClO4IYm+Fi8lLMnO+cVU Y3aZbMZAhgfj2kDAxHv3n6MpMDOsSGedFWq5Kzr0czEbjrFtkCw+fdimj mK5+F4ms0mmvglDQS49Js4gbE8CrHZ0PgaZMbIah4OKoRQXYZADNMeawA J1Mc8ch+i500hc/LTQ9UHIkTVUqt2lwvb7bss/blSG4oBk2YhCTptTkPI aURYNtxIMTi89I+POwY0q/rKtlPJRQdI6ePfkgZJ4ajKeQU5LL7FZSS6Z u8w/cPe0lgSf5gItVPS/RFBqcYNVHgt0z2OcK5xhMoHGVtgijpmsMjZPZ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10532"; a="292089836" X-IronPort-AV: E=Sophos;i="5.96,167,1665471600"; d="scan'208";a="292089836" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2022 14:10:52 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10532"; a="616917990" X-IronPort-AV: E=Sophos;i="5.96,167,1665471600"; d="scan'208";a="616917990" Received: from imunagan-mobl.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.21.103]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2022 14:10:51 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Paolo Abeni , davem@davemloft.net, kuba@kernel.org, edumazet@google.com, fw@strlen.de, geliang.tang@suse.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net 1/3] selftests: mptcp: gives slow test-case more time Date: Tue, 15 Nov 2022 14:10:44 -0800 Message-Id: <20221115221046.20370-2-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221115221046.20370-1-mathew.j.martineau@linux.intel.com> References: <20221115221046.20370-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Paolo Abeni On slow or busy VM, some test-cases still fail because the data transfer completes before the endpoint manipulation actually took effect. Address the issue by artificially increasing the runtime for the relevant test-cases. Fixes: ef360019db40 ("selftests: mptcp: signal addresses testcases") Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/309 Reviewed-by: Mat Martineau Signed-off-by: Paolo Abeni Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index f3dd5f2a0272..2eeaf4aca644 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2152,7 +2152,7 @@ remove_tests() pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 -1 -2 slow + run_tests $ns1 $ns2 10.0.1.1 0 -1 -2 speed_10 chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 2 2 @@ -2165,7 +2165,7 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.4.1 flags signal pm_nl_set_limits $ns2 3 3 - run_tests $ns1 $ns2 10.0.1.1 0 -3 0 slow + run_tests $ns1 $ns2 10.0.1.1 0 -3 0 speed_10 chk_join_nr 3 3 3 chk_add_nr 3 3 chk_rm_nr 3 3 invert @@ -2178,7 +2178,7 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.14.1 flags signal pm_nl_set_limits $ns2 3 3 - run_tests $ns1 $ns2 10.0.1.1 0 -3 0 slow + run_tests $ns1 $ns2 10.0.1.1 0 -3 0 speed_10 chk_join_nr 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert --=20 2.38.1 From nobody Sat Apr 20 15:18:06 2024 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 40F618ADB for ; Tue, 15 Nov 2022 22:10:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668550255; x=1700086255; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aMT0jvaM6rV0r/E+20oJeXxpjy/b/2beKHw5vQly4Kk=; b=fQSqlJyjIPapd6CZRVcdkw5gOomamPL/h8HJZjVsZUNJ87c7NVzifytQ idJVmbdYcHaXZaLoJkBIL+UKzmjqcvVIyowO3I7XjfnR4HNs1s8ecIOVf hXET8Mo6jmfrNYCgEA07YT2o/ZK8BJ7SOeAnMjUV1wagTLIomCMSzTISr AEOiO7vTFsLJ7Ah9J3JD9XD0SH62iptTEhwVNcUE0ap4j6FsaWR1O8aAM XSFZ2V1JakX3eQkedrY3Q8URyhJybfy2UiCayIE9JkS41eBjWYyIZw5D9 pC/1V2EQXY+CI4SWrIIzxhmuasqKk2JzcRogI4dOYSZubFlkZm6YB/f8O w==; X-IronPort-AV: E=McAfee;i="6500,9779,10532"; a="292089838" X-IronPort-AV: E=Sophos;i="5.96,167,1665471600"; d="scan'208";a="292089838" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2022 14:10:52 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10532"; a="616917994" X-IronPort-AV: E=Sophos;i="5.96,167,1665471600"; d="scan'208";a="616917994" Received: from imunagan-mobl.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.21.103]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2022 14:10:52 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Matthieu Baerts , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, fw@strlen.de, geliang.tang@suse.com, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net 2/3] selftests: mptcp: run mptcp_sockopt from a new netns Date: Tue, 15 Nov 2022 14:10:45 -0800 Message-Id: <20221115221046.20370-3-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221115221046.20370-1-mathew.j.martineau@linux.intel.com> References: <20221115221046.20370-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Matthieu Baerts Not running it from a new netns causes issues if some MPTCP settings are modified, e.g. if MPTCP is disabled from the sysctl knob, if multiple addresses are available and added to the MPTCP path-manager, etc. In these cases, the created connection will not behave as expected, e.g. unable to create an MPTCP socket, more than one subflow is seen, etc. A new "sandbox" net namespace is now created and used to run mptcp_sockopt from this controlled environment. Fixes: ce9979129a0b ("selftests: mptcp: add mptcp getsockopt test cases") Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 0879da915014..80d36f7cfee8 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -35,8 +35,9 @@ init() =20 ns1=3D"ns1-$rndh" ns2=3D"ns2-$rndh" + ns_sbox=3D"ns_sbox-$rndh" =20 - for netns in "$ns1" "$ns2";do + for netns in "$ns1" "$ns2" "$ns_sbox";do ip netns add $netns || exit $ksft_skip ip -net $netns link set lo up ip netns exec $netns sysctl -q net.mptcp.enabled=3D1 @@ -73,7 +74,7 @@ init() =20 cleanup() { - for netns in "$ns1" "$ns2"; do + for netns in "$ns1" "$ns2" "$ns_sbox"; do ip netns del $netns done rm -f "$cin" "$cout" @@ -243,7 +244,7 @@ do_mptcp_sockopt_tests() { local lret=3D0 =20 - ./mptcp_sockopt + ip netns exec "$ns_sbox" ./mptcp_sockopt lret=3D$? =20 if [ $lret -ne 0 ]; then @@ -252,7 +253,7 @@ do_mptcp_sockopt_tests() return fi =20 - ./mptcp_sockopt -6 + ip netns exec "$ns_sbox" ./mptcp_sockopt -6 lret=3D$? =20 if [ $lret -ne 0 ]; then --=20 2.38.1 From nobody Sat Apr 20 15:18:06 2024 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 C81058AD0 for ; Tue, 15 Nov 2022 22:10:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668550256; x=1700086256; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=h27g9PViRa+DdVfY8WqZPlUq8vMy1a58+HzU30dDaXY=; b=m+Gj3+lFkSKZO843eNM8Spr10ifQjttAtQUlId2EQfTwylY7kh/vcFX6 xn/TJT7TXlCD+yR865KsIOi5zP3psC+neAdlEeCHeO/zBigddSDiZkyEj hJCOzhomMCV6nF1SbCBAODeiZyCLRVjflAKhMda7nu+OgFevNgsBdLrOC SMeZYIkUicTpe0ZTyiLChCWchJ7RMsTx9WN3KcII5+JLn5avEI83G0kCr wB+etsPA3JKlbl2DaG5F6aQGBDG5pjBH0BoRNt9q9Hkmu7WY5hyyurACI 3N5vn7RNBoX0RdE7N69EgjLJVTJeJJSVDBsN9hhg7BDFwsn4t68CZ/kiK Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10532"; a="292089840" X-IronPort-AV: E=Sophos;i="5.96,167,1665471600"; d="scan'208";a="292089840" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2022 14:10:52 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10532"; a="616917997" X-IronPort-AV: E=Sophos;i="5.96,167,1665471600"; d="scan'208";a="616917997" Received: from imunagan-mobl.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.21.103]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2022 14:10:52 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Matthieu Baerts , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, fw@strlen.de, geliang.tang@suse.com, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net 3/3] selftests: mptcp: fix mibit vs mbit mix up Date: Tue, 15 Nov 2022 14:10:46 -0800 Message-Id: <20221115221046.20370-4-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221115221046.20370-1-mathew.j.martineau@linux.intel.com> References: <20221115221046.20370-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Matthieu Baerts The estimated time was supposing the rate was expressed in mibit (bit * 1024^2) but it is in mbit (bit * 1000^2). This makes the threshold higher but in a more realistic way to avoid false positives reported by CI instances. Before this patch, the thresholds were at 7561/4005ms and now they are at 7906/4178ms. While at it, also fix a typo in the linked comment, spotted by Mat. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/310 Fixes: 1a418cb8e888 ("mptcp: simult flow self-tests") Suggested-by: Paolo Abeni Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/simult_flows.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index ffa13a957a36..40aeb5a71a2a 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -247,9 +247,10 @@ run_test() tc -n $ns2 qdisc add dev ns2eth1 root netem rate ${rate1}mbit $delay1 tc -n $ns2 qdisc add dev ns2eth2 root netem rate ${rate2}mbit $delay2 =20 - # time is measured in ms, account for transfer size, affegated link speed + # time is measured in ms, account for transfer size, aggregated link speed # and header overhead (10%) - local time=3D$((size * 8 * 1000 * 10 / (( $rate1 + $rate2) * 1024 *1024 *= 9) )) + # ms byte -> bit 10% mbit -> kbit -> bit 1= 0% + local time=3D$((1000 * size * 8 * 10 / ((rate1 + rate2) * 1000 * 1000 = * 9) )) =20 # mptcp_connect will do some sleeps to allow the mp_join handshake # completion (see mptcp_connect): 200ms on each side, add some slack --=20 2.38.1