From nobody Thu May 9 23:09:27 2024 Received: from out-197.mta0.migadu.com (out-197.mta0.migadu.com [91.218.175.197]) (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 2004A15ADD for ; Mon, 16 Oct 2023 07:23:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="m8tR1dTW" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1697441026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c0e9royn391SyRFe03m2x7Ibz6JATDEQ+h6B3LRRtQg=; b=m8tR1dTW311lEDjT0OmjEMDB0NULM4oJmUeSFYyn+BqaTCep2fTiCeFQsJBf2OmhO0NjbW XdlirrmSyES07RYz0Mj+0XrZUIv097/ZEyJsh4A8t+USrm2z4+C5sKg49zDmyze2+QIrFW wHkfZ5vnbPvVPNWGPIKDVUoc6uAY3ns= From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 1/3] selftests: mptcp: run userspace pm tests slower Date: Mon, 16 Oct 2023 15:21:22 +0800 Message-Id: In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Geliang Tang Some userspace pm tests failed are reported by CI: 112 userspace pm add & remove address syn [ ok ] synack [ ok ] ack [ ok ] add [ ok ] echo [ ok ] mptcp_info subflows=3D1:1 [ ok ] subflows_total 2:2 [ ok ] mptcp_info add_addr_signal=3D1:1 [ ok ] rm [ ok ] rmsf [ ok ] Info: invert mptcp_info subflows=3D0:0 [ ok ] subflows_total 1:1 [fail] got subflows 0:0 expected 1:1 Server ns stats TcpPassiveOpens 2 0.0 TcpInSegs 118 0.0 This patch fixes them by change 'speed' to 5 to run the tests much more slower. Fixes: 4369c198e599 ("selftests: mptcp: test userspace pm out of transfer") Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 01480663c102..1fc33bb3aba1 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3435,7 +3435,7 @@ userspace_tests() continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then set_userspace_pm $ns1 pm_nl_set_limits $ns2 1 1 - speed=3D10 \ + speed=3D5 \ run_tests $ns1 $ns2 10.0.1.1 & local tests_pid=3D$! wait_mpj $ns1 @@ -3459,7 +3459,7 @@ userspace_tests() continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then set_userspace_pm $ns2 pm_nl_set_limits $ns1 0 1 - speed=3D10 \ + speed=3D5 \ run_tests $ns1 $ns2 10.0.1.1 & local tests_pid=3D$! wait_mpj $ns2 --=20 2.35.3 From nobody Thu May 9 23:09:27 2024 Received: from out-194.mta0.migadu.com (out-194.mta0.migadu.com [91.218.175.194]) (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 0676515EBA for ; Mon, 16 Oct 2023 07:23:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="VIpktDha" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1697441027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wKbra8FNzhZFX6d/ectQwvnFj0yJ/7rECU5VKdxro4I=; b=VIpktDhamewNfbgo0JcR7/xvfKaH7U6syYUsoioQdCLwVApszkE+kw7qyU27DKDVTjq5jF FerK4OyjkfI3IGrMrVzsAzQbaCqnByyw9Xt+2u+8OOHjF1QxyGp7hVnmzR8gwOFYlyzd92 amZZdj0usZDyhfzu4OrsxY8eb5wW6MA= From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 2/3] selftests: mptcp: fix wait_rm_addr/sf parameters Date: Mon, 16 Oct 2023 15:21:23 +0800 Message-Id: <6b2e6b713d130a23e1c103acaba5aad3809e93ba.1697431973.git.geliang.tang@suse.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Geliang Tang The second input parameter of 'wait_rm_addr/sf $1 1' is misused. If it's 1, wait_rm_addr/sf will never break, and will loop ten times, then 'wait_rm_addr/sf' equals to 'sleep 1'. This delay time is too long, which can sometimes make the tests failures. A better way to use wait_rm_addr/sf is to use rm_addr/sf_count to obtain the current value, and then pass into wait_rm_addr/sf. Fixes: 4369c198e599 ("selftests: mptcp: test userspace pm out of transfer") Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 1fc33bb3aba1..b1386b07e312 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3311,12 +3311,14 @@ userspace_pm_rm_addr() { local evts=3D$evts_ns1 local tk + local cnt =20 [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 tk=3D$(mptcp_lib_evts_get_info token "$evts") =20 + cnt=3D$(rm_addr_count ${1}) ip netns exec $1 ./pm_nl_ctl rem token $tk id $2 - wait_rm_addr $1 1 + wait_rm_addr $1 "${cnt}" } =20 # $1: ns ; $2: addr ; $3: id @@ -3342,6 +3344,7 @@ userspace_pm_rm_sf() local t=3D${3:-1} local ip=3D4 local tk da dp sp + local cnt =20 [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 if is_v6 $2; then ip=3D6; fi @@ -3350,9 +3353,10 @@ userspace_pm_rm_sf() dp=3D$(mptcp_lib_evts_get_info dport "$evts" $t) sp=3D$(mptcp_lib_evts_get_info sport "$evts" $t) =20 + cnt=3D$(rm_sf_count ${1}) ip netns exec $1 ./pm_nl_ctl dsf lip $2 lport $sp \ rip $da rport $dp token $tk - wait_rm_sf $1 1 + wait_rm_sf $1 "${cnt}" } =20 userspace_tests() --=20 2.35.3 From nobody Thu May 9 23:09:27 2024 Received: from out-208.mta0.migadu.com (out-208.mta0.migadu.com [91.218.175.208]) (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 D0A6315AE6 for ; Mon, 16 Oct 2023 07:23:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="PbeYJMmW" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1697441028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hrklmQX3ybsZThwLl+/Vf5VlJLpB5JjBZSOPeJYU+mg=; b=PbeYJMmW/i8A0QZxHU4l93tN8rTDuBrRAWNaIxT0WBrwWfzGYFgka20k7LxUX99GscS9wo lJiMXCwdIzgk5xtz7tYTGrgFpOARAxY6J41QvsY1NxH/6nn9ssHxBY4eqZkmNSajT/OipI SlIJ+YjGnPAOjX8FZ0y96UuJSMgYoXM= From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 3/3] Squash to "selftests: mptcp: userspace pm create id 0 subflow" Date: Mon, 16 Oct 2023 15:21:24 +0800 Message-Id: In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Geliang Tang Change speed to 5 too. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index b1386b07e312..7456dac7c321 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3485,7 +3485,7 @@ userspace_tests() continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then set_userspace_pm $ns2 pm_nl_set_limits $ns1 0 1 - speed=3D10 \ + speed=3D5 \ run_tests $ns1 $ns2 10.0.1.1 & local tests_pid=3D$! wait_mpj $ns2 --=20 2.35.3