From nobody Thu Sep 19 01:21:18 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 E4E1117A5AC for ; Fri, 9 Aug 2024 11:53:37 +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=1723204418; cv=none; b=GtmQDU6TCr1Dprp82BJH5JpIpwzdGoFuyU1vywbzOJGV+49XtqtQP0AKTnTUhQGx0k5c1F4HttxqBFs2wuwL7EYx0rkG2mFBcfzkR/mZEFN7OJ5TBQJmWgQexneZ2thnzyX+VYOiV9iO7c9qd8Iure/vT+PvTHvOT96zWOGdeZk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723204418; c=relaxed/simple; bh=fmjxhC/ZoHiChWVetnjFuqjsv4acoJhHSK+S4Qit81c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rZKTEuyCxI/4C0r6Ke7w9OajQ/Zbe5QmOjK/nArBOVQjD3DtRsNF/0//DI3w7hQ1LiZ7D3W15YcPoMCOg2qyhhP374XNukzjhvKxHJCeIW8T/fI3JYr7UuBjL0J/uzYTHHxxl1mByJodrceVbC5NPeRME9d2bIjjtGi9YDK58IY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OUYwKcFS; 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="OUYwKcFS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7CAAC32786; Fri, 9 Aug 2024 11:53:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723204417; bh=fmjxhC/ZoHiChWVetnjFuqjsv4acoJhHSK+S4Qit81c=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=OUYwKcFSb4EzQg3Q5KYJxMUZ0BbV0dfgI0oLH9+BNhSKGfMP/iIYKObLRrJ3CYAMD +YEDDh+JuXtlWOxtMfU7s7Kl1wlsx/oM8wanN9nvs6n8hYoMeNTlIifCk0QOJXd2jp 68wTKmcvsxty9UQ9072C1F71jcPi8t0IZbrZzKkuy95ByUBcFzd5r3uqyqwDJBh7+m KY4lcYwAPHxDky8ogCMYbXrF5rTOu3iveRK0hNKkVvabBNYbQzOTtaffJ0HS7tNm1k CMMizZWPABb10+JlICmOFahiasZRl8bT+BX0AskQ94m4sVXNg7HqaRbeSAmhHPK51L r9J6ZXOpEKdqQ== From: "Matthieu Baerts (NGI0)" Date: Fri, 09 Aug 2024 13:51:19 +0200 Subject: [PATCH mptcp-next v4 1/8] selftests: mptcp: join: no extra msg if no counter 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: <20240809-mptcp-join-tx-mib-v4-1-98b0b0e098c5@kernel.org> References: <20240809-mptcp-join-tx-mib-v4-0-98b0b0e098c5@kernel.org> In-Reply-To: <20240809-mptcp-join-tx-mib-v4-0-98b0b0e098c5@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=2529; i=matttbe@kernel.org; h=from:subject:message-id; bh=fmjxhC/ZoHiChWVetnjFuqjsv4acoJhHSK+S4Qit81c=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmtgM/cUt0EwT2wuXpBn4+8m+ZL5awD71CUtI6t WpfeYM80eKJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZrYDPwAKCRD2t4JPQmmg c+WlEACLb30l2nECRtVkRasQC+jpYB9xTYnY8l140SGyucaSK0n3MLN3CtCPTcPfPrs1Mpds4oC 509DpSQJJdlCGuLQQBS7Co+HrnpFBXEtpWRXQGB3d5mbI9PD5kA5MP/weFi/kBQmPaUa3aIKimU S9zfQD8UO0fKup2h7eKhoVfuFGFruoNUaV1NQu/+uZb4ntp4V13EaHDKW0bt1VeTSfpcxnj6NoN m7eBoIDn3ypecW+dDBfxhxRO0DmJRAuzeN+SSNpmRdQySsru+A97pnugx4XD4lllDWY6QPfaQcC GknxxKCNLNGY5qdrRLrmP7W45Lbiu5zTI4vqPYZkQo0vFyKTeWHVEpFdTBpG5g2Es1tWNL5PD8O TJqh2U2/bOiSTJRDMGE9TXthuiNNmB1CJxLNT+RfzwaTJDn17F5ogq6bNiLH3YO5Nbvn6KQOJPK G72MtqufqXj7ZQ0R1ovCOrRd1lPuRCbKC9NS+Kf9tvow7Sd89BrWuCDODwT11aZbuJ08taVynF0 Ohuuw8innTOOyZA8+ZIfwNGnd9Tp6d6MDkAkTau+kKh+I+o25raMahPXENG3x14qxFBMq+dmIJT OpNgWs6R5sEau60AdexGnVDLPixMs6BGPQsHaexhtwU+Q35M9e2XzOv0ZoQky7FPpBj5Enchsbj X7D+bWGAKsv+i4Q== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 The checksum and fail counters might not be available. Then no need to display an extra message with missing info. While at it, fix the indentation around, which is wrong since the same commit. Fixes: 47867f0a7e83 ("selftests: mptcp: join: skip check if MIB counter not= supported") Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 01c1e0871aca..a1f80dac59a7 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1112,7 +1112,7 @@ chk_csum_nr() =20 print_check "sum" count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtDataCsumErr") - if [ "$count" !=3D "$csum_ns1" ]; then + if [ -n "$count" ] && [ "$count" !=3D "$csum_ns1" ]; then extra_msg+=3D" ns1=3D$count" fi if [ -z "$count" ]; then @@ -1125,7 +1125,7 @@ chk_csum_nr() fi print_check "csum" count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtDataCsumErr") - if [ "$count" !=3D "$csum_ns2" ]; then + if [ -n "$count" ] && [ "$count" !=3D "$csum_ns2" ]; then extra_msg+=3D" ns2=3D$count" fi if [ -z "$count" ]; then @@ -1169,13 +1169,13 @@ chk_fail_nr() =20 print_check "ftx" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPFailTx") - if [ "$count" !=3D "$fail_tx" ]; then + if [ -n "$count" ] && [ "$count" !=3D "$fail_tx" ]; then extra_msg+=3D",tx=3D$count" fi if [ -z "$count" ]; then print_skip elif { [ "$count" !=3D "$fail_tx" ] && [ $allow_tx_lost -eq 0 ]; } || - { [ "$count" -gt "$fail_tx" ] && [ $allow_tx_lost -eq 1 ]; }; then + { [ "$count" -gt "$fail_tx" ] && [ $allow_tx_lost -eq 1 ]; }; then fail_test "got $count MP_FAIL[s] TX expected $fail_tx" else print_ok @@ -1183,13 +1183,13 @@ chk_fail_nr() =20 print_check "failrx" count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPFailRx") - if [ "$count" !=3D "$fail_rx" ]; then + if [ -n "$count" ] && [ "$count" !=3D "$fail_rx" ]; then extra_msg+=3D",rx=3D$count" fi if [ -z "$count" ]; then print_skip elif { [ "$count" !=3D "$fail_rx" ] && [ $allow_rx_lost -eq 0 ]; } || - { [ "$count" -gt "$fail_rx" ] && [ $allow_rx_lost -eq 1 ]; }; then + { [ "$count" -gt "$fail_rx" ] && [ $allow_rx_lost -eq 1 ]; }; then fail_test "got $count MP_FAIL[s] RX expected $fail_rx" else print_ok --=20 2.45.2 From nobody Thu Sep 19 01:21:18 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 D50BD17A5AC for ; Fri, 9 Aug 2024 11:53:38 +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=1723204418; cv=none; b=sgGYTPFlND/bMCD8wJf3GckVR7fksTZjGyau4Hykl4HvzHBdbpo4OcxakUyk8oHT553/HuYzQlZeMB1NxaM8qzOjWnrKZThM9P+/jEK6rggA06TjxyXwoZXN8zvDxkOMCvwxApKYyx1+OQH+V7hxv9rZREPNKr31Y9pyHKljTz4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723204418; c=relaxed/simple; bh=JV4e98MvcVbeKw2dLX39p0IafI6FZY3aJONWF4RkBEs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=spA9Gq2upkuLuMH2QHh7eE8wo7ACahrUsCLdjFBpJV0I03aZhYoKRMeCb48q5g44JZ+zoOJlCS29ShDwtzT8d4bTYig7atBgl9dRZY6/CWI5qsFbUY6OQuoVHuKVN8aM0GSt1hCHkBnQHdGzswjq55Rui/1LURvy0kdKQD94uEo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ScQ6Vk+r; 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="ScQ6Vk+r" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E58D6C32782; Fri, 9 Aug 2024 11:53:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723204418; bh=JV4e98MvcVbeKw2dLX39p0IafI6FZY3aJONWF4RkBEs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ScQ6Vk+rIvFGxrAoc5bpnno9ChFd8HYJtyURglleu7DbNM2ATvnuyKCLYeGYyo8LE nZqFYJlOPfBt1PyUWcKvTHT7Vl/hEgYDRqX3xZp24/qXo2BjQJjHDJNXbjOSRoS0kh xZrWi+YBdZcqnQHa7ZEP+qh2/NBaqgfW9r+9TZD9oLNL0+R8QBg+HOcnmh+22WhD/k GTypgIwuhIJFFVrI3LTXLpZkXoOuLz7Cg17CpT8vFOLMrbFEnDLWaKXZ1dVwZcG8uI 4XYhdjyjlW4imlpuIPQEAtWyBHmCjhluFO8yOpq6OVbQ028FSFCSmE5eXYr7O3M64W xG02M5Oup05fw== From: "Matthieu Baerts (NGI0)" Date: Fri, 09 Aug 2024 13:51:20 +0200 Subject: [PATCH mptcp-next v4 2/8] mptcp: MIB counters for sent MP_JOIN 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: <20240809-mptcp-join-tx-mib-v4-2-98b0b0e098c5@kernel.org> References: <20240809-mptcp-join-tx-mib-v4-0-98b0b0e098c5@kernel.org> In-Reply-To: <20240809-mptcp-join-tx-mib-v4-0-98b0b0e098c5@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=4854; i=matttbe@kernel.org; h=from:subject:message-id; bh=JV4e98MvcVbeKw2dLX39p0IafI6FZY3aJONWF4RkBEs=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmtgM/S92f+d95yYmaG6l4S7EKEjanZr72bUT63 a3YQxzum96JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZrYDPwAKCRD2t4JPQmmg c3+gD/9YLLj906mzz1Ozy4+ZQUNYBFXsYy8cLuFpBfxJCvzG6T5S3HUBPQ/5ZhQTiRik0vCpeoU 3YyiabS+4YpbiW0IZcASigTMl3l5IC0JDobOCHjsTTbsIlEA8P4uYyonbaBzFpQydgHyF4HoBgw Y1xdX7eta+k3AYqxfi64zgL8AvCQp9nmlfkFYiLOxlwBQpq8wIz+UNn1f+13HgBbNkfx7mWUy4G 2raaAzgVuwR8bGlKE5ZOhzBFsTo1ELt1SmddyCulhLSlViXioX9WjZg7uJlAzGF6W34c8FHA9/U 4LBzmd3evU7OqIPBpizuQIR0UvBJtnG+QKqjrQXKSCtLp2sl3ssYF98ZY52c6h8vf6LvKCf8rJn AZvKZRYYKZjpSvznXEE5+vLC+xz+vBzqCPHLuGDjL37EkuT0Gqcdoinpt4WrJr5tmZT7AjCtW5z 2lsB3Y+f7suNawmsh9wpz1occd9kzxdS1XKU2nEc/mQdJm7W8ewvF55mJc8ORP30IHHffaGnsgA USDgAWmqUcHVwGWDUEAdT98HTPZulj51FIiJ2/tajssUKvvPs+pYYKLdaFSHiMmpJLCtM+FTC1l W+YlQntytWnqAGANknMRH4Aa1vipYv6tcGj7XsRy/YytPQLcymedcg3J2fhhMLhwP/teET2D0Rs Agk9HkBifhzw8cw== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Recently, a few issues have been discovered around the creation of additional subflows. Without these counters, it was difficult to point out the reason why some subflows were not created as expected. These counters should have been added earlier, because there is no other simple ways to extract such information from the kernel, and understand why subflows have not been created. While at it, some pr_debug() have been added, just in case the errno needs to be printed. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/509 Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- Notes: - v2: - Add "ERR" suffix in variable names. (Geliang) - v3: - removed Fully Established Error counter: should only happen with the userspace PM, which will propagate the error in this case (ENOTCONN). (Geliang) - v4: - use remote=3D%d, not with ':'. (Geliang) --- net/mptcp/mib.c | 4 ++++ net/mptcp/mib.h | 4 ++++ net/mptcp/subflow.c | 21 ++++++++++++++++++--- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index 7884217f33eb..ec0d461cb921 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -25,6 +25,10 @@ static const struct snmp_mib mptcp_snmp_list[] =3D { SNMP_MIB_ITEM("MPJoinSynAckHMacFailure", MPTCP_MIB_JOINSYNACKMAC), SNMP_MIB_ITEM("MPJoinAckRx", MPTCP_MIB_JOINACKRX), SNMP_MIB_ITEM("MPJoinAckHMacFailure", MPTCP_MIB_JOINACKMAC), + SNMP_MIB_ITEM("MPJoinSynTx", MPTCP_MIB_JOINSYNTX), + SNMP_MIB_ITEM("MPJoinSynTxCreatSkErr", MPTCP_MIB_JOINSYNTXCREATSKERR), + SNMP_MIB_ITEM("MPJoinSynTxBindErr", MPTCP_MIB_JOINSYNTXBINDERR), + SNMP_MIB_ITEM("MPJoinSynTxConnectErr", MPTCP_MIB_JOINSYNTXCONNECTERR), SNMP_MIB_ITEM("DSSNotMatching", MPTCP_MIB_DSSNOMATCH), SNMP_MIB_ITEM("InfiniteMapTx", MPTCP_MIB_INFINITEMAPTX), SNMP_MIB_ITEM("InfiniteMapRx", MPTCP_MIB_INFINITEMAPRX), diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h index 66aa67f49d03..d68136f93dac 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -20,6 +20,10 @@ enum linux_mptcp_mib_field { MPTCP_MIB_JOINSYNACKMAC, /* HMAC was wrong on SYN/ACK + MP_JOIN */ MPTCP_MIB_JOINACKRX, /* Received an ACK + MP_JOIN */ MPTCP_MIB_JOINACKMAC, /* HMAC was wrong on ACK + MP_JOIN */ + MPTCP_MIB_JOINSYNTX, /* Sending a SYN + MP_JOIN */ + MPTCP_MIB_JOINSYNTXCREATSKERR, /* Not able to create a socket when sendin= g a SYN + MP_JOIN */ + MPTCP_MIB_JOINSYNTXBINDERR, /* Not able to bind() the address when sendin= g a SYN + MP_JOIN */ + MPTCP_MIB_JOINSYNTXCONNECTERR, /* Not able to connect() when sending a SY= N + MP_JOIN */ MPTCP_MIB_DSSNOMATCH, /* Received a new mapping that did not match the p= revious one */ MPTCP_MIB_INFINITEMAPTX, /* Sent an infinite mapping */ MPTCP_MIB_INFINITEMAPRX, /* Received an infinite mapping */ diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index a7fb4d46e024..6cd71061ef3e 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1575,12 +1575,17 @@ int __mptcp_subflow_connect(struct sock *sk, const = struct mptcp_pm_local *local, u32 remote_token; int addrlen; =20 + /* The userspace PM sent the request too early? */ if (!mptcp_is_fully_established(sk)) goto err_out; =20 err =3D mptcp_subflow_create_socket(sk, local->addr.family, &sf); - if (err) + if (err) { + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_JOINSYNTXCREATSKERR); + pr_debug("msk=3D%p local=3D%d remote=3D%d create sock error: %d\n", + msk, local_id, remote_id, err); goto err_out; + } =20 ssk =3D sf->sk; subflow =3D mptcp_subflow_ctx(ssk); @@ -1615,8 +1620,12 @@ int __mptcp_subflow_connect(struct sock *sk, const s= truct mptcp_pm_local *local, #endif ssk->sk_bound_dev_if =3D local->ifindex; err =3D kernel_bind(sf, (struct sockaddr *)&addr, addrlen); - if (err) + if (err) { + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_JOINSYNTXBINDERR); + pr_debug("msk=3D%p local=3D%d remote=3D%d bind error: %d\n", + msk, local_id, remote_id, err); goto failed; + } =20 mptcp_crypto_key_sha(subflow->remote_key, &remote_token, NULL); pr_debug("msk=3D%p remote_token=3D%u local_id=3D%d remote_id=3D%d", msk, @@ -1631,8 +1640,14 @@ int __mptcp_subflow_connect(struct sock *sk, const s= truct mptcp_pm_local *local, sock_hold(ssk); list_add_tail(&subflow->node, &msk->conn_list); err =3D kernel_connect(sf, (struct sockaddr *)&addr, addrlen, O_NONBLOCK); - if (err && err !=3D -EINPROGRESS) + if (err && err !=3D -EINPROGRESS) { + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_JOINSYNTXCONNECTERR); + pr_debug("msk=3D%p local=3D%d remote=3D%d connect error: %d\n", + msk, local_id, remote_id, err); goto failed_unlink; + } + + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_JOINSYNTX); =20 /* discard the subflow socket */ mptcp_sock_graft(ssk, sk->sk_socket); --=20 2.45.2 From nobody Thu Sep 19 01:21:18 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 D800019307E for ; Fri, 9 Aug 2024 11:53:39 +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=1723204419; cv=none; b=UNw1CC60Uz0Fv13KVCLZBm+ZF1RSwJc2f4wQqgiikXxEivJrAIxIPVbJVlR9tQtKmIlEM6SH/kLCIxjaNhAwlQzxOwXOXyrLfvzQ3BOyFTEqcOmb9ktxObxUkVrtQ6lfzXjyud9JXV2BHZhDQLnGRwwi6ZJfxK6n7oGSokvjSi0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723204419; c=relaxed/simple; bh=4qOuC2MTCctuAx75QWVtBN5+Usgkze7z+2y087lwyDI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fqAvukkVEKBp10fbSes9yo6TNBG8bAcF1Sc3SnofLVd9TAB6P8LTasqw7fG/91WP8khDIslKBLTt+C9L86BjxjLCIQmqy2mq/kGM0W0jYFNQUikGaHd/pJKPQZ8rqyuf8XUqM9XOvJ9rOcd5aSYSE2/s0X3qXufodLDpUjm9FYg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iRZCIE01; 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="iRZCIE01" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6C55C4AF0D; Fri, 9 Aug 2024 11:53:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723204419; bh=4qOuC2MTCctuAx75QWVtBN5+Usgkze7z+2y087lwyDI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=iRZCIE01qgxI+/CME8WDFpj7IOk1ZenZnquDIfvDj7QUUnWn4UzmVuEKAFz5lvIuP 6YartWlJ6+HesvSqg5B2Ap3CFlUDcReTDlGurdI/qOMjZWoxIN2FFnoSk1+96crwU2 qaclQE1bxiL3HYf+kIv6sKcYUhDLL6mdk/x15Ji9qqeJEIeeuPQ3uSiH9eoC6J/tWh UEgdYmf82e8oy3iN2bXfPucZwsJSlX/PoTg2uEAEnXG/6US4RiII15Q2n3+AjqAiNG hcniMNcSjHQuOkoaZDp0ic7RzUuWYXVHKDJeJ3yL+rXGuoe+DDpmVzmbSGG8NrcLp4 FhFN1O/F1Fomg== From: "Matthieu Baerts (NGI0)" Date: Fri, 09 Aug 2024 13:51:21 +0200 Subject: [PATCH mptcp-next v4 3/8] selftests: mptcp: join: reduce join_nr params 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: <20240809-mptcp-join-tx-mib-v4-3-98b0b0e098c5@kernel.org> References: <20240809-mptcp-join-tx-mib-v4-0-98b0b0e098c5@kernel.org> In-Reply-To: <20240809-mptcp-join-tx-mib-v4-0-98b0b0e098c5@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=2785; i=matttbe@kernel.org; h=from:subject:message-id; bh=4qOuC2MTCctuAx75QWVtBN5+Usgkze7z+2y087lwyDI=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmtgM/AXy1e8B5BcTOJ5Zs/Jl+E7u05nSoetv/T W8jZde3aZ+JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZrYDPwAKCRD2t4JPQmmg c+nGEADL0UH58vqKNt1OxiI/oi3sZCmIshollJCvqB9YS1ZgAy49Pe4z718sulNIvPbgR8Tj4Zj Y8a5t8QELPgyiH0BcArQ41Ge5JdaahquT4aK+mz0clTKk0Dcepc57Vl/s99Tagn+N0/JeQOJ11y P94mv55/UfMimNcFFTE0EVsXBhx7hKg63+iyKVskHpxUekya4AN2llRczJ3JhUUuoF9rsf06zIZ D0Xh2oTH7SYi1W/CCFYjGnGPDkAqeXBgN4dbpg+EyQGPMU1VrTV9lCe4XPx+Gs7ZtDkLqMjqdMl SwkdbVTvDYJH24yvbI9Sr/lQHqynOAuH8jrMQgWrrPFLtY1+wj2gdHcSmBZEAlXNeBDEd9XR8mx 7R4pQS5KvkyB7Y2FJaOFlYYBXCRp3PXKSH2LsSqz6acnLV2mQe63K4+TlN0wAbl+a7HM7/T18ZP ABWm7N5N+q4QXLYgtqK7hpmjy+wRFAH9bRVuBsunMs+V4DhcdVQAevUERMjJj6j1F5YyA3mjVv5 tMPlSYt73Wsu7FRd+UWV/w5TtpJjZpvjK2R6Iv5enNdrk6O7Qx4DksP3F6tFSV7e+ztPZBhC+NL riL2mh+zFpvGkFgb+xqzZCKbT+QZbr+T9iYDgWhjsbTQYiFLmCQJFsq2yqWRCjldycuEa8Da5Qv CcVAXw7ujXB9WJg== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 chk_join_nr() currently takes 9 positional parameters, 6 of them are optional. It makes it hard to read: chk_join_nr 1 1 1 1 0 1 1 0 4 Naming these vars helps to make it easier to read: join_csum_ns1=3D1 join_csum_ns2=3D0 \ join_fail_nr=3D1 join_rst_nr=3D1 join_infi_nr=3D0 \ join_corrupted_pkts=3D4 \ chk_join_nr 1 1 1 It will then be easier to add new optional parameters. Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 31 ++++++++++++++++++---= ---- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index a1f80dac59a7..0401ba1aaf1b 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -61,6 +61,12 @@ unset sflags unset fastclose unset fullmesh unset speed +unset join_csum_ns1 +unset join_csum_ns2 +unset join_fail_nr +unset join_rst_nr +unset join_infi_nr +unset join_corrupted_pkts =20 # generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) =3D=3D 0x30) || # (ip6 && (ip6[74] & 0xf0) =3D=3D 0x30)'" @@ -1314,12 +1320,12 @@ chk_join_nr() local syn_nr=3D$1 local syn_ack_nr=3D$2 local ack_nr=3D$3 - local csum_ns1=3D${4:-0} - local csum_ns2=3D${5:-0} - local fail_nr=3D${6:-0} - local rst_nr=3D${7:-0} - local infi_nr=3D${8:-0} - local corrupted_pkts=3D${9:-0} + local csum_ns1=3D${join_csum_ns1:-0} + local csum_ns2=3D${join_csum_ns2:-0} + local fail_nr=3D${join_fail_nr:-0} + local rst_nr=3D${join_rst_nr:-0} + local infi_nr=3D${join_infi_nr:-0} + local corrupted_pkts=3D${join_corrupted_pkts:-0} local count local with_cookie =20 @@ -3138,7 +3144,8 @@ fastclose_tests() MPTCP_LIB_SUBTEST_FLAKY=3D1 test_linkfail=3D1024 fastclose=3Dserver \ run_tests $ns1 $ns2 10.0.1.1 - chk_join_nr 0 0 0 0 0 0 1 + join_rst_nr=3D1 \ + chk_join_nr 0 0 0 chk_fclose_nr 1 1 invert chk_rst_nr 1 1 fi @@ -3157,7 +3164,10 @@ fail_tests() MPTCP_LIB_SUBTEST_FLAKY=3D1 test_linkfail=3D128 \ run_tests $ns1 $ns2 10.0.1.1 - chk_join_nr 0 0 0 +1 +0 1 0 1 "$(pedit_action_pkts)" + join_csum_ns1=3D+1 join_csum_ns2=3D+0 \ + join_fail_nr=3D1 join_rst_nr=3D0 join_infi_nr=3D1 \ + join_corrupted_pkts=3D"$(pedit_action_pkts)" \ + chk_join_nr 0 0 0 chk_fail_nr 1 -1 invert fi =20 @@ -3170,7 +3180,10 @@ fail_tests() pm_nl_add_endpoint $ns2 10.0.2.2 dev ns2eth2 flags subflow test_linkfail=3D1024 \ run_tests $ns1 $ns2 10.0.1.1 - chk_join_nr 1 1 1 1 0 1 1 0 "$(pedit_action_pkts)" + join_csum_ns1=3D1 join_csum_ns2=3D0 \ + join_fail_nr=3D1 join_rst_nr=3D1 join_infi_nr=3D0 \ + join_corrupted_pkts=3D"$(pedit_action_pkts)" \ + chk_join_nr 1 1 1 fi } =20 --=20 2.45.2 From nobody Thu Sep 19 01:21:18 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 98B00193077 for ; Fri, 9 Aug 2024 11:53:40 +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=1723204420; cv=none; b=fr8kxC3qA2X4UJkB0FAg5y29FixmCjBvYIoL6pMZX1M36f6spGYie8Bog0U1eSR7Ewg2wMz46fKacEfutaxy07fH4eRhVlirvazJ+HSgfSr3nQLTs87JOI37UgSK/mHXG66aP0nt1Qwn2Fi8dkZ85byA3PU+yRXDhpuemzPvskA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723204420; c=relaxed/simple; bh=dcvHN8tXoyOB6ReR4Ha5tUVZbK852mFX8b6oevVKsrg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CBwTgZ+LItvdGLs+SipNeFpUwRLPk/PBi//fGmjm8W83tNsu89I3XnageBX3whf3WbBCjLqvPMLXWvN+AhOP/gFefY8h7sc1k/bQTzhvyysW9s4WHoiwPQKWmSwsn7iOweqzNk7VDEClvJVGGrjH8RZwpC3R3EKvmNrby8B5/ZI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=t3BT6Awu; 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="t3BT6Awu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E498AC32782; Fri, 9 Aug 2024 11:53:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723204420; bh=dcvHN8tXoyOB6ReR4Ha5tUVZbK852mFX8b6oevVKsrg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=t3BT6AwuIoyHFfZfXovy62BFwPdTSPyjiYidbhKsDQiGzf2kkZTfgB6LTe5T8Q4HD y2CAlj6t636fJTP2RYDfz3nM4gt40fApfYp1C9QNsm5QdDG0Mx5ptHDgfB9Ux4dvnA TFFAdXQchYZCge4jfnhU/s/KxMQaFQvne1udinnnF2yAPnygaOsr73cqRIDB5VdVO7 JJ5DcDR/sO9m02kF5CDKr0Ggrfn1uZQlKRIGUSNzxhO9Iy1Rwlqa6wtNA5VP2GG5vr Hb6wMOLj/41OZCi8rBISxt1HYwM5KZ7N2n8SfAZUP7jPBIgsdKbtW2se4gZ8dpQ9hZ RV1FP8sR8wykA== From: "Matthieu Baerts (NGI0)" Date: Fri, 09 Aug 2024 13:51:22 +0200 Subject: [PATCH mptcp-next v4 4/8] selftests: mptcp: join: one line for join check 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: <20240809-mptcp-join-tx-mib-v4-4-98b0b0e098c5@kernel.org> References: <20240809-mptcp-join-tx-mib-v4-0-98b0b0e098c5@kernel.org> In-Reply-To: <20240809-mptcp-join-tx-mib-v4-0-98b0b0e098c5@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=3162; i=matttbe@kernel.org; h=from:subject:message-id; bh=dcvHN8tXoyOB6ReR4Ha5tUVZbK852mFX8b6oevVKsrg=; b=owEBbAKT/ZANAwAIAfa3gk9CaaBzAcsmYgBmtgM/QTTub0Zza0seHHE/kYckTwRt8l5i4umd1 Bi7+LLLdrWJAjIEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZrYDPwAKCRD2t4JPQmmg c1S7D/d65Q/+GxWehtNRuzIkR56PZG/gbcSB7JqyAnU0MRKwKharpYHiQLRFdCRvXrSAt7yjJ1W 8vrY13piV3atGvjyWy77BijvqudTF+K/6zy+Q9EUmYAA0pAM15DpcNCQUVmSea1QD1jNzQUlvcJ g7hnqbFoQrDCIoe7QXUvWhR2hjBTqTNRQw508sMlQzW4JoqzNZ5xPlMgB0ahdFC4VZeyRn7/t15 CUmLz50vAtio5H8eVFWT+S7UVwo2w9n7M9k+lZGQ4qrIzngjEh4viu+X8L5Z22QDjoH5qvi3soK Vfyh9zBStb+WB5tajpW+WJ+zn/KTAZdKsqlGIX31Qpy9ILc9l0n9iS7Zhf4szjF6waWO6lCwFbj h1srXR7ZrlbYsdVtZ5n3LUIurH7V82wMXQuspmcU3bHrxyiGYpOQI3cpvTGOmXFblkwUaaubHIN pIjof6ij4vLnMorn6LF4gj8u1dReINQA97/w1Y8ykd4aowcbyHF4chNWAF9O6Zysq25RBidhrXq AMu6cNuTr5qRgedkBs6bdK3bobYosfdD9mAzEYRHS/q8A0Io2oz9gvwHb9naxLzecCU6vNK3HK4 Zq31vPxey3T3Gy2dKo1T3WMFCpGJfeMrix6uscKV4gWbX0MIiZxwxd6eWO66pn+2TOBdm0qp0Ed nACZaEGk9KApf X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Most tests are checking if the expected number of SYN/SYN+ACK/ACK JOINs have been received, each of them on one line. More Join related tests are going to be checked soon, no need to add 5 new lines per test in case of success, just one is enough. In case of issue, the errors will still be reported like before. Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- Notes: - v4 - fail_test with a description. (Geliang) --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 45 ++++++++++++++++-----= ---- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 0401ba1aaf1b..9739c57f5ba6 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -202,6 +202,22 @@ print_skip() mptcp_lib_pr_skip "${@}" } =20 +# $1: check name; $2: rc +print_results() +{ + local check=3D"${1}" + local rc=3D${2} + + print_check "${check}" + if [ ${rc} =3D ${KSFT_PASS} ]; then + print_ok + elif [ ${rc} =3D ${KSFT_SKIP} ]; then + print_skip + else + fail_test "see above" + fi +} + # [ $1: fail msg ] mark_as_skipped() { @@ -1326,6 +1342,7 @@ chk_join_nr() local rst_nr=3D${join_rst_nr:-0} local infi_nr=3D${join_infi_nr:-0} local corrupted_pkts=3D${join_corrupted_pkts:-0} + local rc=3D${KSFT_PASS} local count local with_cookie =20 @@ -1333,43 +1350,41 @@ chk_join_nr() print_info "${corrupted_pkts} corrupted pkts" fi =20 - print_check "syn" count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPJoinSynRx") if [ -z "$count" ]; then - print_skip + rc=3D${KSFT_SKIP} elif [ "$count" !=3D "$syn_nr" ]; then + rc=3D${KSFT_FAIL} + print_check "syn" fail_test "got $count JOIN[s] syn expected $syn_nr" - else - print_ok fi =20 - print_check "synack" with_cookie=3D$(ip netns exec $ns2 sysctl -n net.ipv4.tcp_syncookies) count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtMPJoinSynAckRx") if [ -z "$count" ]; then - print_skip + rc=3D${KSFT_SKIP} elif [ "$count" !=3D "$syn_ack_nr" ]; then # simult connections exceeding the limit with cookie enabled could go up= to # synack validation as the conn limit can be enforced reliably only after # the subflow creation - if [ "$with_cookie" =3D 2 ] && [ "$count" -gt "$syn_ack_nr" ] && [ "$cou= nt" -le "$syn_nr" ]; then - print_ok - else + if [ "$with_cookie" !=3D 2 ] || [ "$count" -le "$syn_ack_nr" ] || [ "$co= unt" -gt "$syn_nr" ]; then + rc=3D${KSFT_FAIL} + print_check "synack" fail_test "got $count JOIN[s] synack expected $syn_ack_nr" fi - else - print_ok fi =20 - print_check "ack" count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPJoinAckRx") if [ -z "$count" ]; then - print_skip + rc=3D${KSFT_SKIP} elif [ "$count" !=3D "$ack_nr" ]; then + rc=3D${KSFT_FAIL} + print_check "ack" fail_test "got $count JOIN[s] ack expected $ack_nr" - else - print_ok fi + + print_results "join Rx" ${rc} + if $validate_checksum; then chk_csum_nr $csum_ns1 $csum_ns2 chk_fail_nr $fail_nr $fail_nr --=20 2.45.2 From nobody Thu Sep 19 01:21:18 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 9114C192B9F for ; Fri, 9 Aug 2024 11:53:41 +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=1723204421; cv=none; b=A8V7qbG4tOFVHY0/a9IU5BFXVkLk9w081omDGFo8QgcMaAn6fmu9s+MT4K3b0eCmRrxvS/2cj4GIeGtWj86mKpy4DTaq5ix+ug5bAd5TwugZhKQ6sdP4DVL3FclVrj+OeeOmvZWmMaQOlF7hcwN7LpeakhODI9joe0lxf2CdpRU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723204421; c=relaxed/simple; bh=oUbKAORZxUAlgllMUyhOdrEUI2zUNhTF+JHNRu7hDNU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sHIyn8B8KNECyHtNgYa+Z4lAreDCreSz4ffBrIPFacA7qDuEwnXHCyogKN0vtNYNRcL5lzjoJZymgcVG4dsXo3s3zZdEcujljrKIfB11APtu+xgXiAvMLwFJDz/NFeQgT+8BtjpZtP0eVNMcJJMM/70dJm2RUUn1UOd5LWSAPTU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tk6ZPq/H; 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="tk6ZPq/H" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2F89C4AF0D; Fri, 9 Aug 2024 11:53:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723204421; bh=oUbKAORZxUAlgllMUyhOdrEUI2zUNhTF+JHNRu7hDNU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=tk6ZPq/HGOBsV/jfigfbBJoz2ltR5GI9DEfcO6IY9sUQ2ZROMCPGIFxFmhgCBuYtG jNqNOoAB0cr2yEFexBXIhgM9ZBkMgu2LQXUIVsl/rBlUlK0s/2QXTQJ0wwIlgHGxsF XQ9JLaZ7WRr5YJKFVoIspAaIGLXh9bhhFhIOe+hmbgrw2DyF8Qjnl91uK9AhEtHzwc YKL9ABLgMEKdDTqe6QeTZnBPX/x5MkBLd/Yfj2WfThqAuyUsyAkEWY02ojBvqL/iWD qwdc04o+J6OsllAn7PlpcqQ39qWzGDs7DBQL6uzWd4Mebg8DzaiVljg2HL3VRQD4Ie hVkgTREuyB4hA== From: "Matthieu Baerts (NGI0)" Date: Fri, 09 Aug 2024 13:51:23 +0200 Subject: [PATCH mptcp-next v4 5/8] selftests: mptcp: join: validate MPJ SYN TX MIB counters 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: <20240809-mptcp-join-tx-mib-v4-5-98b0b0e098c5@kernel.org> References: <20240809-mptcp-join-tx-mib-v4-0-98b0b0e098c5@kernel.org> In-Reply-To: <20240809-mptcp-join-tx-mib-v4-0-98b0b0e098c5@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=6067; i=matttbe@kernel.org; h=from:subject:message-id; bh=oUbKAORZxUAlgllMUyhOdrEUI2zUNhTF+JHNRu7hDNU=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmtgM/Z+cIuVa4d1QhtBR/1d3OxoJAp/Lp10XB/ rPLxQSsLtyJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZrYDPwAKCRD2t4JPQmmg c5rIEADLtrixZx3PKeG1AF4bJuJIFxt+a61QTp9A+JGpZOjtzz6nuhvDwQ5zXHoaiI3Xx+yALh7 fVdonDlkQlaDyhIUEpZe9EQx36+WIZI0BOgzY3Af+N8vSIRAIo8o5vcstZx+jDhzL+W1Cd7ftmD cl9u64/4cKbyZd1DovxII979GhiTmi+2g5FrI00d6yuSYEQ8BAkb4KeLKD6F/GWOhykDzKb7EOC Oz3r1GfpG8d0322ZdM7rxrpVUV1Vjfya1l1tZh+m7D1fEVN4Paga4QEJuP4mDbqyWrcN68ZK9Zo c7vbBISA/kIRIwt2FgfB24T1eQoOipiwoIQulES0naQwt/SyYr5u3ikMq95BTDxV+6k9h13MCVp mwXymOaINzqX/z/oKsMKUugn8TFztsRoSDLwY9M18oG+O6r51m6R61gwAAHlxK4MfC1LXgNoEbv KG65IRxMmRvKbWThZDlGnH+MDlzdATTPjRJzKmsI0fTvUcRFhacOoVPykJVcIUa0viHqU7pf9N/ bjzovSMxEo79t8YUhQlDjd/PIs1+R/oWF7dmN5O3CN8E2YKBcohmm9yvTFyiYKqb82rDDp5QYa/ oh0F7TLASv4C59MUay3F056GB8TA7x9nhVEw0TNb3xhxJ1q6S2Ivs9YFLES2ruJLdHsrewOraxN Bpwk9kddQAyFE7g== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 A few new MPJoinSynTx MIB counters have been added in a previous commit. They are being validated here in mptcp_join.sh selftest, each time the number of received MPJ are checked. Most of the time, the number of sent SYN+MPJ is the same as the received ones. But sometimes, there are more, because there are dropped, or there are errors. While at it, the "no MPC reuse with single endpoint" subtest has been modified to force a bind() error. Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- Notes: - v3: - Force a bind error (Geliang) - Validate join tx with rx ones. (Geliang) - v4: - do not depend on chk_join_nr. (Geliang) - unset optional vars, just in case. --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 89 +++++++++++++++++++++= +--- 1 file changed, 78 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 9739c57f5ba6..320cee75ac41 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -67,6 +67,10 @@ unset join_fail_nr unset join_rst_nr unset join_infi_nr unset join_corrupted_pkts +unset join_syn_tx +unset join_create_err +unset join_bind_err +unset join_connect_err =20 # generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) =3D=3D 0x30) || # (ip6 && (ip6[74] & 0xf0) =3D=3D 0x30)'" @@ -1331,6 +1335,54 @@ chk_infi_nr() fi } =20 +chk_join_tx_nr() +{ + local syn_tx=3D${join_syn_tx:-0} + local create=3D${join_create_err:-0} + local bind=3D${join_bind_err:-0} + local connect=3D${join_connect_err:-0} + local rc=3D${KSFT_PASS} + local count + + count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtMPJoinSynTx") + if [ -z "$count" ]; then + rc=3D${KSFT_SKIP} + elif [ "$count" !=3D "$syn_tx" ]; then + rc=3D${KSFT_FAIL} + print_check "syn tx" + fail_test "got $count JOIN[s] syn tx expected $syn_tx" + fi + + count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtMPJoinSynTxCreatSkErr") + if [ -z "$count" ]; then + rc=3D${KSFT_SKIP} + elif [ "$count" !=3D "$create" ]; then + rc=3D${KSFT_FAIL} + print_check "syn tx create socket error" + fail_test "got $count JOIN[s] syn tx create socket error expected $creat= e" + fi + + count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtMPJoinSynTxBindErr") + if [ -z "$count" ]; then + rc=3D${KSFT_SKIP} + elif [ "$count" !=3D "$bind" ]; then + rc=3D${KSFT_FAIL} + print_check "syn tx bind error" + fail_test "got $count JOIN[s] syn tx bind error expected $bind" + fi + + count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtMPJoinSynTxConnectErr") + if [ -z "$count" ]; then + rc=3D${KSFT_SKIP} + elif [ "$count" !=3D "$connect" ]; then + rc=3D${KSFT_FAIL} + print_check "syn tx connect error" + fail_test "got $count JOIN[s] syn tx connect error expected $connect" + fi + + print_results "join Tx" ${rc} +} + chk_join_nr() { local syn_nr=3D$1 @@ -1385,6 +1437,9 @@ chk_join_nr() =20 print_results "join Rx" ${rc} =20 + join_syn_tx=3D"${join_syn_tx:-${syn_nr}}" \ + chk_join_tx_nr + if $validate_checksum; then chk_csum_nr $csum_ns1 $csum_ns2 chk_fail_nr $fail_nr $fail_nr @@ -1925,9 +1980,11 @@ subflows_error_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.12.2 flags subflow speed=3Dslow \ run_tests $ns1 $ns2 10.0.1.1 - chk_join_nr 0 0 0 + join_bind_err=3D1 \ + chk_join_nr 0 0 0 fi =20 # multiple subflows, with subflow creation error @@ -1939,7 +1996,8 @@ subflows_error_tests() pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow speed=3Dslow \ run_tests $ns1 $ns2 10.0.1.1 - chk_join_nr 1 1 1 + join_syn_tx=3D2 \ + chk_join_nr 1 1 1 fi =20 # multiple subflows, with subflow timeout on MPJ @@ -1951,7 +2009,8 @@ subflows_error_tests() pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow speed=3Dslow \ run_tests $ns1 $ns2 10.0.1.1 - chk_join_nr 1 1 1 + join_syn_tx=3D2 \ + chk_join_nr 1 1 1 fi =20 # multiple subflows, check that the endpoint corresponding to @@ -1972,7 +2031,8 @@ subflows_error_tests() =20 # additional subflow could be created only if the PM select # the later endpoint, skipping the already used one - chk_join_nr 1 1 1 + join_syn_tx=3D2 \ + chk_join_nr 1 1 1 fi } =20 @@ -2058,7 +2118,8 @@ signal_address_tests() 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 - chk_join_nr 1 1 1 + join_syn_tx=3D3 \ + chk_join_nr 1 1 1 chk_add_nr 3 3 fi =20 @@ -2226,7 +2287,8 @@ add_addr_timeout_tests() pm_nl_set_limits $ns2 2 2 speed=3D10 \ run_tests $ns1 $ns2 10.0.1.1 - chk_join_nr 1 1 1 + join_syn_tx=3D2 \ + chk_join_nr 1 1 1 chk_add_nr 8 0 fi } @@ -2326,7 +2388,8 @@ remove_tests() pm_nl_set_limits $ns2 2 2 addr_nr_ns1=3D-3 speed=3D10 \ run_tests $ns1 $ns2 10.0.1.1 - chk_join_nr 1 1 1 + join_syn_tx=3D2 join_connect_err=3D1 \ + chk_join_nr 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert chk_rst_nr 0 0 @@ -2391,7 +2454,8 @@ remove_tests() pm_nl_set_limits $ns2 3 3 addr_nr_ns1=3D-8 speed=3Dslow \ run_tests $ns1 $ns2 10.0.1.1 - chk_join_nr 1 1 1 + join_syn_tx=3D3 \ + chk_join_nr 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert chk_rst_nr 0 0 @@ -3619,7 +3683,8 @@ endpoint_tests() =20 mptcp_lib_kill_wait $tests_pid =20 - chk_join_nr 3 3 3 + join_syn_tx=3D4 \ + chk_join_nr 3 3 3 chk_rm_nr 1 1 fi =20 @@ -3654,7 +3719,8 @@ endpoint_tests() chk_mptcp_info subflows 2 subflows 2 mptcp_lib_kill_wait $tests_pid =20 - chk_join_nr 3 3 3 + join_connect_err=3D1 \ + chk_join_nr 3 3 3 chk_add_nr 4 4 chk_rm_nr 2 1 invert fi @@ -3685,7 +3751,8 @@ endpoint_tests() wait_mpj $ns2 mptcp_lib_kill_wait $tests_pid =20 - chk_join_nr 2 2 2 + join_syn_tx=3D3 join_connect_err=3D1 \ + chk_join_nr 2 2 2 chk_add_nr 2 2 chk_rm_nr 1 0 invert fi --=20 2.45.2 From nobody Thu Sep 19 01:21:18 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 C573E17A5AC for ; Fri, 9 Aug 2024 11:53:42 +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=1723204422; cv=none; b=SS+GV6wgG7d5ciAHw1IiawIL90Xazi4uJF7rHwPgboRBnGY6po2Id7NkTxhJzWu7qOMC0gt+1KAdrbBA4AOE37IdPMYlqzWZYkGKgaJ5DzTQ+gKvYwglqKviJynxwNWl4t/vVf5x+Jr8DHwKc2ly5agVOTjnvXEl949HzKZsDdo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723204422; c=relaxed/simple; bh=dvCq1v8vZWclkTPB1+uiopJJ8muV5zHagRgFs+ze98E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UPtm8CMI09I5auDa9o64PLerqSJnS4vjH4YYB6MD2Amyxq2EZRnghrbqEXhYWknS8tfZJjQQdJHvk5IVYnAp2DF7fTcm8utoICHgD+U4wu8HVUid+6iocf5BRJ8dnK+C+lmX6fpKLa39PZCu0pvvO7dQ/tohjnGRpxNLq96wxXU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GwNwTLK6; 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="GwNwTLK6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1E98C4AF0E; Fri, 9 Aug 2024 11:53:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723204422; bh=dvCq1v8vZWclkTPB1+uiopJJ8muV5zHagRgFs+ze98E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=GwNwTLK6RtD/zdObqpAYUhk9z4fU6HjPvQ4trlw+/qp/RNUw2TlYYjiHbjHNWQTb4 RDhoZBgSs9DjDSkB8MYv3SGiNJLXVukBv2LGdpoP3fH1xw9cXHU7YWQB7qHEG87iF9 /NGNcDuXcuPSTSErWoXO2As/AcYs6D6O2UNd6BgfOU18brVAbtCA/ojzreVDkO1zt9 vwGPaVjG+YJKJZk6Y87O5F2QM2BCVfuhvxzJSnZlO8lSyACBscjoM9foQLdqKmBgRp ODZOjIEMn8r/yrEAWI1INNfUTbI6wpPUhXnQDrsHJPm6WN7RI0zQiwGyIRIEVVQCTf THl5QiipC8jIg== From: "Matthieu Baerts (NGI0)" Date: Fri, 09 Aug 2024 13:51:24 +0200 Subject: [PATCH mptcp-next v4 6/8] selftests: mptcp: join: more explicit check name 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: <20240809-mptcp-join-tx-mib-v4-6-98b0b0e098c5@kernel.org> References: <20240809-mptcp-join-tx-mib-v4-0-98b0b0e098c5@kernel.org> In-Reply-To: <20240809-mptcp-join-tx-mib-v4-0-98b0b0e098c5@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=7975; i=matttbe@kernel.org; h=from:subject:message-id; bh=dvCq1v8vZWclkTPB1+uiopJJ8muV5zHagRgFs+ze98E=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmtgM/i29nxZ56onAUn2Jn+BKKv+TPEAO6Vo2vz o2vyRYtCWKJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZrYDPwAKCRD2t4JPQmmg c+22EACaSpg5R8CPv92t+8UdhAywlTulxHUSsyXLelqfkfIqTMEvw6p6nWhhpun1HnMYdABNF+g bokufnwbQXgftlCcf3Yp5ZsKz7djwyYlTGGRJxqgesB7z54XallURYtShX4pI3sTLAFmKKQrCZL eKHnrPSjtw0IIHmKHzTuSTpu51huBdxDv7jhS+Vk3gJ5v6S96lQMz2s4ooyB6bMEUR5M5sTojXA kKFSu/1/tn14xnk5opRXVJuMYgFQ2LsIpaMhfnNo2H1xCpdrqQQ9iJjwK9QVL0dqhhxH6qEXHPS bY00JSVop/4VQRF4Hlk16r6uZAwJT7x1OQ7Yg7btJO1Ad1vy+vJdbnz9QNXMfJ9hFVh30063iHb sPSVQc2cTdTz9v94RK/VlY3vUvvGhAnMPYLoNSfN2IaxcBcabU+iaPuBPzui6lAKt6UY4dpojPS rBye77YUcCP0Jm+mMu6MVeWtGBtHJYtiiP5clPkH5nEAkn1Wl78y07YqyMtwtiLRlMt3aM+Qqpi +HROtxvHSkjszD0k0Bv/aIgPRT1fzaPduwpfYo7o25rTqmme507eJvoBZjUBcxRolhwMHdSIBHM +2YE2Xp+t33ReJ3PUILiVrEBSt5eOKU31VwhQNB0trwpMcibyHr1IcDPmZFSu68JXfqaZMqGSWJ 6C+9gYrqYRAExBQ== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Before, the check names had to be very short. It is no longer the case now that these checks are printed on a dedicated line. Then, it looks better to have more explicit names. Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- Notes: - v4: - specify (again) tx in the failed message. (Geliang) --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 65 +++++++++++++--------= ---- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 320cee75ac41..c54ea286128c 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -860,7 +860,7 @@ chk_cestab_nr() local cestab=3D$2 local count =20 - print_check "cestab $cestab" + print_check "currently established: $cestab" count=3D$(mptcp_lib_get_counter ${ns} "MPTcpExtMPCurrEstab") if [ -z "$count" ]; then print_skip @@ -1136,7 +1136,7 @@ chk_csum_nr() csum_ns2=3D${csum_ns2:1} fi =20 - print_check "sum" + print_check "checksum server" count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtDataCsumErr") if [ -n "$count" ] && [ "$count" !=3D "$csum_ns1" ]; then extra_msg+=3D" ns1=3D$count" @@ -1149,7 +1149,8 @@ chk_csum_nr() else print_ok fi - print_check "csum" + + print_check "checksum client" count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtDataCsumErr") if [ -n "$count" ] && [ "$count" !=3D "$csum_ns2" ]; then extra_msg+=3D" ns2=3D$count" @@ -1193,7 +1194,7 @@ chk_fail_nr() fail_rx=3D${fail_rx:1} fi =20 - print_check "ftx" + print_check "fail tx" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPFailTx") if [ -n "$count" ] && [ "$count" !=3D "$fail_tx" ]; then extra_msg+=3D",tx=3D$count" @@ -1207,7 +1208,7 @@ chk_fail_nr() print_ok fi =20 - print_check "failrx" + print_check "fail rx" count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPFailRx") if [ -n "$count" ] && [ "$count" !=3D "$fail_rx" ]; then extra_msg+=3D",rx=3D$count" @@ -1240,7 +1241,7 @@ chk_fclose_nr() extra_msg=3D"invert" fi =20 - print_check "ctx" + print_check "fast close tx" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPFastcloseTx") if [ -z "$count" ]; then print_skip @@ -1251,7 +1252,7 @@ chk_fclose_nr() print_ok fi =20 - print_check "fclzrx" + print_check "fast close rx" count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPFastcloseRx") if [ -z "$count" ]; then print_skip @@ -1281,7 +1282,7 @@ chk_rst_nr() extra_msg=3D"invert" fi =20 - print_check "rtx" + print_check "reset tx" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPRstTx") if [ -z "$count" ]; then print_skip @@ -1293,7 +1294,7 @@ chk_rst_nr() print_ok fi =20 - print_check "rstrx" + print_check "reset rx" count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPRstRx") if [ -z "$count" ]; then print_skip @@ -1314,7 +1315,7 @@ chk_infi_nr() local infi_rx=3D$2 local count =20 - print_check "itx" + print_check "infi tx" count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtInfiniteMapTx") if [ -z "$count" ]; then print_skip @@ -1324,7 +1325,7 @@ chk_infi_nr() print_ok fi =20 - print_check "infirx" + print_check "infi rx" count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtInfiniteMapRx") if [ -z "$count" ]; then print_skip @@ -1407,8 +1408,8 @@ chk_join_nr() rc=3D${KSFT_SKIP} elif [ "$count" !=3D "$syn_nr" ]; then rc=3D${KSFT_FAIL} - print_check "syn" - fail_test "got $count JOIN[s] syn expected $syn_nr" + print_check "syn rx" + fail_test "got $count JOIN[s] syn rx expected $syn_nr" fi =20 with_cookie=3D$(ip netns exec $ns2 sysctl -n net.ipv4.tcp_syncookies) @@ -1421,8 +1422,8 @@ chk_join_nr() # the subflow creation if [ "$with_cookie" !=3D 2 ] || [ "$count" -le "$syn_ack_nr" ] || [ "$co= unt" -gt "$syn_nr" ]; then rc=3D${KSFT_FAIL} - print_check "synack" - fail_test "got $count JOIN[s] synack expected $syn_ack_nr" + print_check "synack rx" + fail_test "got $count JOIN[s] synack rx expected $syn_ack_nr" fi fi =20 @@ -1431,8 +1432,8 @@ chk_join_nr() rc=3D${KSFT_SKIP} elif [ "$count" !=3D "$ack_nr" ]; then rc=3D${KSFT_FAIL} - print_check "ack" - fail_test "got $count JOIN[s] ack expected $ack_nr" + print_check "ack rx" + fail_test "got $count JOIN[s] ack rx expected $ack_nr" fi =20 print_results "join Rx" ${rc} @@ -1512,7 +1513,7 @@ chk_add_nr() =20 timeout=3D$(ip netns exec ${ns_tx} sysctl -n net.mptcp.add_addr_timeout) =20 - print_check "add" + print_check "add addr rx" count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtAddAddr") if [ -z "$count" ]; then print_skip @@ -1524,7 +1525,7 @@ chk_add_nr() print_ok fi =20 - print_check "echo" + print_check "add addr echo rx" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtEchoAdd") if [ -z "$count" ]; then print_skip @@ -1535,7 +1536,7 @@ chk_add_nr() fi =20 if [ $port_nr -gt 0 ]; then - print_check "pt" + print_check "add addr rx with port" count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtPortAdd") if [ -z "$count" ]; then print_skip @@ -1545,7 +1546,7 @@ chk_add_nr() print_ok fi =20 - print_check "syn" + print_check "syn rx port" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPJoinPortSynRx") if [ -z "$count" ]; then print_skip @@ -1556,7 +1557,7 @@ chk_add_nr() print_ok fi =20 - print_check "synack" + print_check "synack rx port" count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPJoinPortSynAckRx") if [ -z "$count" ]; then print_skip @@ -1567,7 +1568,7 @@ chk_add_nr() print_ok fi =20 - print_check "ack" + print_check "ack rx port" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPJoinPortAckRx") if [ -z "$count" ]; then print_skip @@ -1578,7 +1579,7 @@ chk_add_nr() print_ok fi =20 - print_check "syn" + print_check "syn rx port mismatch" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMismatchPortSynRx") if [ -z "$count" ]; then print_skip @@ -1589,7 +1590,7 @@ chk_add_nr() print_ok fi =20 - print_check "ack" + print_check "ack rx port mismatch" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMismatchPortAckRx") if [ -z "$count" ]; then print_skip @@ -1613,7 +1614,7 @@ chk_add_tx_nr() =20 timeout=3D$(ip netns exec $ns1 sysctl -n net.mptcp.add_addr_timeout) =20 - print_check "add TX" + print_check "add addr tx" count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtAddAddrTx") if [ -z "$count" ]; then print_skip @@ -1625,7 +1626,7 @@ chk_add_tx_nr() print_ok fi =20 - print_check "echo TX" + print_check "add addr echo tx" count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtEchoAddTx") if [ -z "$count" ]; then print_skip @@ -1663,7 +1664,7 @@ chk_rm_nr() extra_msg=3D"invert" fi =20 - print_check "rm" + print_check "rm addr rx" count=3D$(mptcp_lib_get_counter ${addr_ns} "MPTcpExtRmAddr") if [ -z "$count" ]; then print_skip @@ -1673,7 +1674,7 @@ chk_rm_nr() print_ok fi =20 - print_check "rmsf" + print_check "rm subflow" count=3D$(mptcp_lib_get_counter ${subflow_ns} "MPTcpExtRmSubflow") if [ -z "$count" ]; then print_skip @@ -1708,7 +1709,7 @@ chk_rm_tx_nr() { local rm_addr_tx_nr=3D$1 =20 - print_check "rm TX" + print_check "rm addr tx" count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtRmAddrTx") if [ -z "$count" ]; then print_skip @@ -1727,7 +1728,7 @@ chk_prio_nr() local mpj_syn_ack=3D$4 local count =20 - print_check "ptx" + print_check "mp_prio tx" count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPPrioTx") if [ -z "$count" ]; then print_skip @@ -1737,7 +1738,7 @@ chk_prio_nr() print_ok fi =20 - print_check "prx" + print_check "mp_prio rx" count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPPrioRx") if [ -z "$count" ]; then print_skip --=20 2.45.2 From nobody Thu Sep 19 01:21:18 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 92BD217A5AC for ; Fri, 9 Aug 2024 11:53:43 +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=1723204423; cv=none; b=ZtxoU98ES0hE9EovsIVcworlzuZ07EQcnOr/To6/ePXWl1dknr4npxsju0QA5rNiThyX/6Md/YWAKls3x//u5g1Ce4VS22V/4PankXeue7vf9kRqIFblTxAIeGLnPNdvnmuBJzDFICNc5X+zXtTm2vWmA37TcXpJMoHkrkDTcmg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723204423; c=relaxed/simple; bh=hjYY+Ub43ZQ656E9aYfMeR033msk6NZtHY2IFVJ8Cj0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qfKeKJEN9yKxDxedscY5qmn7qUUKUltM7OBW0YjIMoz88dAxB0MFBE3SR9g3gOEgm6sBFMez+vvtfMv9zeEvJeeGTOheGABzsZsO6JO3c/iGP6n7TP1b0m0eZpagD+mykJ5utd9YmhckEt41OSyr34iLPuTdtLq0RUp9dWii2AE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lkX04PmZ; 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="lkX04PmZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2014C32782; Fri, 9 Aug 2024 11:53:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723204423; bh=hjYY+Ub43ZQ656E9aYfMeR033msk6NZtHY2IFVJ8Cj0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=lkX04PmZkufpbkF2znH+z/cPWmYkUTq+oatdldnCmfRkcFZ0UadIemwkxATpPNoHF 5/0LYsohF6jBBo2zCCQ8SrSHmw2r9PlgexWIR73kHK4XSuvoiSphrwp7XyXtU3RGDj Vee/KaL/NJ8TzaCn4lpfUbU71hY7EGd+UyGUri9JGh3AT+aNTBALH9rAySR4nzFwzM z5VL27c56olpM6700M0RC+c6t761928TaUAwZLWNAoI5tKjNV5JXqN5mIHlzUcOT8S 9RFyIPuO1x1x4+2nJMvdbPsxiKlP70QaydUvmoxjrUlzHzdOixrCNkP6iahsXILfVc pGae2sNIWNNSQ== From: "Matthieu Baerts (NGI0)" Date: Fri, 09 Aug 2024 13:51:25 +0200 Subject: [PATCH mptcp-next v4 7/8] selftests: mptcp: join: specify host being checked 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: <20240809-mptcp-join-tx-mib-v4-7-98b0b0e098c5@kernel.org> References: <20240809-mptcp-join-tx-mib-v4-0-98b0b0e098c5@kernel.org> In-Reply-To: <20240809-mptcp-join-tx-mib-v4-0-98b0b0e098c5@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=8676; i=matttbe@kernel.org; h=from:subject:message-id; bh=hjYY+Ub43ZQ656E9aYfMeR033msk6NZtHY2IFVJ8Cj0=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmtgM/2LlbGYdesLwzoP5wO7ZC/CXqGGCtxay82 XgGJ1hwb0GJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZrYDPwAKCRD2t4JPQmmg c3etEADxIB9cYfhsVAqzlsilulmW6w+RibVvCIxNbBBAi0/vrGsoHHKJUNe4yDWkIQs9/AB6mkG BtE+ZEwn9s7YyKM7QSEG6lVcUopXHoxewbscjCpVYJaxOZPk6lZ+9eWCck1c9SpwBIGreO6pOb2 7Wmf+RdYXO//S1/RTYc1+cLNPhG+LPaCRzJVwL8NAwaQqJOudZGgpQXqALE5HIgE/XoRQEx9kGS iVZfjRQEddxVRPusbLhEKuio7hD2GdDQdHZ27skp7RztaF+RodgIS19DF8quZJ7bjNFMK7mj6gG HXAUioN1FjiJopsrqZqKmUuWdgHfbE02pF6X9vbZNMhOWUykY+Uwc4jv68YryeXkrwos+J7I2ao EUojsOoaciqnv0fKmlu2jekfcUK+r5hTNEwWsiJIx9DmosCYRge3JY1g4BtvJiNDsyuKRPqc0Ng ZsETsi/H3DlbWnSR+witFk1YtoV+3iw+5EPuWe36e0plLIQcz7oaa0zkB77eEt8ByxZd7w7P9LY sbUFTJ95kd9dEakkqBM2mO6rBNU8ZY0fdJHA4Cpgplgvn/fsm/wHLXa4m+QedJHNKQIfxTs4rH6 3mQNF8yb101uAcCAbYeHFa+lXlHrCAj3/RtCmM3ALj1Dip5v1J/sei+kbuLVHrlSU0DA51duSjH 6SLN5lEx6ytp8rw== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Instead of displaying 'invert' when looking at some events like MP_FAIL, MP_FASTCLOSE, MP_RESET, RM_ADDR, which is a bit vague because they are not traditionnaly sent from one side, the host being checked is now printed. For the ADD_ADDR, only display the host when it is the client sending it, which is more unusual. Also before, the 'invert' message was printed after a few checks, but it was not clear which ones exactly. Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 89 +++++++++++++--------= ---- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index c54ea286128c..717de94201ba 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1175,6 +1175,8 @@ chk_fail_nr() local count local ns_tx=3D$ns1 local ns_rx=3D$ns2 + local tx=3D"server" + local rx=3D"client" local extra_msg=3D"" local allow_tx_lost=3D0 local allow_rx_lost=3D0 @@ -1182,7 +1184,8 @@ chk_fail_nr() if [[ $ns_invert =3D "invert" ]]; then ns_tx=3D$ns2 ns_rx=3D$ns1 - extra_msg=3D"invert" + tx=3D"client" + rx=3D"server" fi =20 if [[ "${fail_tx}" =3D "-"* ]]; then @@ -1194,10 +1197,10 @@ chk_fail_nr() fail_rx=3D${fail_rx:1} fi =20 - print_check "fail tx" + print_check "fail tx ${tx}" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPFailTx") if [ -n "$count" ] && [ "$count" !=3D "$fail_tx" ]; then - extra_msg+=3D",tx=3D$count" + extra_msg+=3D" tx=3D$count" fi if [ -z "$count" ]; then print_skip @@ -1208,10 +1211,10 @@ chk_fail_nr() print_ok fi =20 - print_check "fail rx" + print_check "fail rx ${rx}" count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPFailRx") if [ -n "$count" ] && [ "$count" !=3D "$fail_rx" ]; then - extra_msg+=3D",rx=3D$count" + extra_msg+=3D" rx=3D$count" fi if [ -z "$count" ]; then print_skip @@ -1233,37 +1236,35 @@ chk_fclose_nr() local count local ns_tx=3D$ns2 local ns_rx=3D$ns1 - local extra_msg=3D"" + local tx=3D"client" + local rx=3D"server" =20 if [[ $ns_invert =3D "invert" ]]; then ns_tx=3D$ns1 ns_rx=3D$ns2 - extra_msg=3D"invert" + tx=3D"server" + rx=3D"client" fi =20 - print_check "fast close tx" + print_check "fast close tx ${tx}" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPFastcloseTx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$fclose_tx" ]; then - extra_msg+=3D",tx=3D$count" fail_test "got $count MP_FASTCLOSE[s] TX expected $fclose_tx" else print_ok fi =20 - print_check "fast close rx" + print_check "fast close rx ${rx}" count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPFastcloseRx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$fclose_rx" ]; then - extra_msg+=3D",rx=3D$count" fail_test "got $count MP_FASTCLOSE[s] RX expected $fclose_rx" else print_ok fi - - print_info "$extra_msg" } =20 chk_rst_nr() @@ -1274,15 +1275,17 @@ chk_rst_nr() local count local ns_tx=3D$ns1 local ns_rx=3D$ns2 - local extra_msg=3D"" + local tx=3D"server" + local rx=3D"client" =20 if [[ $ns_invert =3D "invert" ]]; then ns_tx=3D$ns2 ns_rx=3D$ns1 - extra_msg=3D"invert" + tx=3D"client" + rx=3D"server" fi =20 - print_check "reset tx" + print_check "reset tx ${tx}" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPRstTx") if [ -z "$count" ]; then print_skip @@ -1294,7 +1297,7 @@ chk_rst_nr() print_ok fi =20 - print_check "reset rx" + print_check "reset rx ${rx}" count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPRstRx") if [ -z "$count" ]; then print_skip @@ -1305,8 +1308,6 @@ chk_rst_nr() else print_ok fi - - print_info "$extra_msg" } =20 chk_infi_nr() @@ -1315,7 +1316,7 @@ chk_infi_nr() local infi_rx=3D$2 local count =20 - print_check "infi tx" + print_check "infi tx client" count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtInfiniteMapTx") if [ -z "$count" ]; then print_skip @@ -1325,7 +1326,7 @@ chk_infi_nr() print_ok fi =20 - print_check "infi rx" + print_check "infi rx server" count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtInfiniteMapRx") if [ -z "$count" ]; then print_skip @@ -1501,19 +1502,21 @@ chk_add_nr() local mis_ack_nr=3D0 local ns_tx=3D$ns1 local ns_rx=3D$ns2 - local extra_msg=3D"" + local tx=3D"" + local rx=3D"" local count local timeout =20 if [[ $ns_invert =3D "invert" ]]; then ns_tx=3D$ns2 ns_rx=3D$ns1 - extra_msg=3D"invert" + tx=3D" client" + rx=3D" server" fi =20 timeout=3D$(ip netns exec ${ns_tx} sysctl -n net.mptcp.add_addr_timeout) =20 - print_check "add addr rx" + print_check "add addr rx${rx}" count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtAddAddr") if [ -z "$count" ]; then print_skip @@ -1525,7 +1528,7 @@ chk_add_nr() print_ok fi =20 - print_check "add addr echo rx" + print_check "add addr echo rx${tx}" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtEchoAdd") if [ -z "$count" ]; then print_skip @@ -1536,7 +1539,7 @@ chk_add_nr() fi =20 if [ $port_nr -gt 0 ]; then - print_check "add addr rx with port" + print_check "add addr rx with port${rx}" count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtPortAdd") if [ -z "$count" ]; then print_skip @@ -1546,7 +1549,7 @@ chk_add_nr() print_ok fi =20 - print_check "syn rx port" + print_check "syn rx port${tx}" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPJoinPortSynRx") if [ -z "$count" ]; then print_skip @@ -1557,7 +1560,7 @@ chk_add_nr() print_ok fi =20 - print_check "synack rx port" + print_check "synack rx port${rx}" count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPJoinPortSynAckRx") if [ -z "$count" ]; then print_skip @@ -1568,7 +1571,7 @@ chk_add_nr() print_ok fi =20 - print_check "ack rx port" + print_check "ack rx port${tx}" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPJoinPortAckRx") if [ -z "$count" ]; then print_skip @@ -1579,7 +1582,7 @@ chk_add_nr() print_ok fi =20 - print_check "syn rx port mismatch" + print_check "syn rx port mismatch${tx}" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMismatchPortSynRx") if [ -z "$count" ]; then print_skip @@ -1590,7 +1593,7 @@ chk_add_nr() print_ok fi =20 - print_check "ack rx port mismatch" + print_check "ack rx port mismatch${tx}" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMismatchPortAckRx") if [ -z "$count" ]; then print_skip @@ -1601,8 +1604,6 @@ chk_add_nr() print_ok fi fi - - print_info "$extra_msg" } =20 chk_add_tx_nr() @@ -1646,6 +1647,8 @@ chk_rm_nr() local count local addr_ns=3D$ns1 local subflow_ns=3D$ns2 + local addr=3D"server" + local subflow=3D"client" local extra_msg=3D"" =20 shift 2 @@ -1655,16 +1658,14 @@ chk_rm_nr() shift done =20 - if [ -z $invert ]; then - addr_ns=3D$ns1 - subflow_ns=3D$ns2 - elif [ $invert =3D "true" ]; then + if [ "$invert" =3D "true" ]; then addr_ns=3D$ns2 subflow_ns=3D$ns1 - extra_msg=3D"invert" + addr=3D"client" + subflow=3D"server" fi =20 - print_check "rm addr rx" + print_check "rm addr rx ${addr}" count=3D$(mptcp_lib_get_counter ${addr_ns} "MPTcpExtRmAddr") if [ -z "$count" ]; then print_skip @@ -1674,7 +1675,7 @@ chk_rm_nr() print_ok fi =20 - print_check "rm subflow" + print_check "rm subflow ${subflow}" count=3D$(mptcp_lib_get_counter ${subflow_ns} "MPTcpExtRmSubflow") if [ -z "$count" ]; then print_skip @@ -1688,7 +1689,7 @@ chk_rm_nr() count=3D$((count + cnt)) if [ "$count" !=3D "$rm_subflow_nr" ]; then suffix=3D"$count in [$rm_subflow_nr:$((rm_subflow_nr*2))]" - extra_msg+=3D" simult" + extra_msg=3D"simult" fi if [ $count -ge "$rm_subflow_nr" ] && \ [ "$count" -le "$((rm_subflow_nr *2 ))" ]; then @@ -1709,7 +1710,7 @@ chk_rm_tx_nr() { local rm_addr_tx_nr=3D$1 =20 - print_check "rm addr tx" + print_check "rm addr tx client" count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtRmAddrTx") if [ -z "$count" ]; then print_skip @@ -1728,7 +1729,7 @@ chk_prio_nr() local mpj_syn_ack=3D$4 local count =20 - print_check "mp_prio tx" + print_check "mp_prio tx server" count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPPrioTx") if [ -z "$count" ]; then print_skip @@ -1738,7 +1739,7 @@ chk_prio_nr() print_ok fi =20 - print_check "mp_prio rx" + print_check "mp_prio rx client" count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPPrioRx") if [ -z "$count" ]; then print_skip --=20 2.45.2 From nobody Thu Sep 19 01:21:18 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 92B6217A5AC for ; Fri, 9 Aug 2024 11:53:44 +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=1723204424; cv=none; b=U43aEh/0vLi14FxmKHyIk8OIIUN7XryxYD4NGsLSmXcSZX+sfhMdUA8jhW/U6advurn/06yuzlmIXpKDar+EXysdff/alv+wFoYUh3PUvLFP1D+FbJQK2NaxVY84QlgEJz1IdbMfsWT1/DdhLkmltxoukx5wo/Ja25gv4/AEWNk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723204424; c=relaxed/simple; bh=piK/4W3mQ6FZZ7PaDzpZTdz5dIEmN8KdnW5JUvSs/kI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=H6uQzampvh0FYJovB72oFpQz7Xp4I8+E1Mus2/yCNRWNCw1Yn/9xOtJUf+llDas0HEwDaFqEXBBHARXpyqJffb7F33Jel9iNUmzd7HEjYE3I2GlyPyPIXAms4hdEtf8lzqeqJgEby539XvD+iG2rBzazcidyuHsiCdptUJ6c3gQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AkmmyRZf; 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="AkmmyRZf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E50FAC32786; Fri, 9 Aug 2024 11:53:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723204424; bh=piK/4W3mQ6FZZ7PaDzpZTdz5dIEmN8KdnW5JUvSs/kI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=AkmmyRZfGygB4fLXvVdEvpJQA1FDZcVQsj7h8+0qn8YBPd8+BXBM7rlASzSJy365l IoHDkm1GAZxDf0YqQBF9m3mW3gNI/9VHVgh+AVjAHBIj1U+R49dxtovfgIkQ/sY5pA Mz/My3P9YNv0K2umFpy2rdnLZRAyktAXf2dE5NJEQ/yktI8ZJEtS8uDcgSLwqR3Q/C D5T0d6E0BBON27Xl/sMQ1hdwjww5IYV9vTdVZFfszJTofmaJJYRpW9aZv10SvMkuf6 8EhD1gswGVBqjn2uXpe0JYn9B8yZ5Sbm/fA/+6mpBZBo60Bdekm7gslNC3tGZRp6/3 Yh34QHSqm5xjQ== From: "Matthieu Baerts (NGI0)" Date: Fri, 09 Aug 2024 13:51:26 +0200 Subject: [PATCH mptcp-next v4 8/8] selftests: mptcp: join: mute errors when ran in the background 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: <20240809-mptcp-join-tx-mib-v4-8-98b0b0e098c5@kernel.org> References: <20240809-mptcp-join-tx-mib-v4-0-98b0b0e098c5@kernel.org> In-Reply-To: <20240809-mptcp-join-tx-mib-v4-0-98b0b0e098c5@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=4122; i=matttbe@kernel.org; h=from:subject:message-id; bh=piK/4W3mQ6FZZ7PaDzpZTdz5dIEmN8KdnW5JUvSs/kI=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmtgM/XEqaDJdUmEZFtRGGVqP/0KBSJ97sDIfYe d9sMMXS2q+JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZrYDPwAKCRD2t4JPQmmg cx2oEADj0Vs7EIPF+ZnZgQ/7znK18d+8xgAdv3Jj+TuNfZ4yI2Z7htkNx0Em0O2Ji9l5zcoBmVb dlmOhH0VxEsef9NniUwSaCaDzU+EMnXZD7fqtQvn0MABFznYggCS89B6o8JuRcx2Cvq55+JxpXG K80i3pzKqSOLjHYdMIV4Rx/UsfLZ6Rl6rIhJ4PdxEM09FdBUJ41q8C7CwGSqvwmZ/EMtpYUZlE8 U9lcgTptc+LfA2jbisDcnsxxZStUWBXN+w4Vgw0Y3T960mxONd360nr1DvoBbulb/9eKqhmCrir uLF7k2k4Lg5FiV3mXGa0mVL526ROxU9r1vlCSWWuuXwN2vMVphXZjbsS0CCUffO7RZJi0hKe4Wp WCbX1A36kW/7vu9gxU95h5ybOeYdMtZxSpvMb6Z/z/UZKlfJne/NgAndEnDjakg1qESHkZrzbl7 PVHYzw62m02K7DwLZcsfkzlBr54oV3goxUqcyy5TksXFPKUMCap+1tA0zS/x0ukisjiQo2P2WlF jKQ5s3xmpVh2vimv9PJc4fGz0IKCuwL7DAMXga2ajxIK2GlkrGYMRiSCx1YyiE/rzorEqNODwG3 B6xKT2tW2yh+0Qae6D8SN9o1eqWKUToqu1JR78iUclSNKSxJ8/UTfUztqjW8+FcYrPc/oGCpps7 /GmRl2UNswa073Q== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 The test is supposed to be killed before the end, which will likely cause "Connection reset by peer" errors. It is confusing, especially because in case of real transfer errors, the test will not be marked as failed. But that's OK, there are many other tests checking that. Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 36 ++++++++++++---------= ---- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 717de94201ba..60422d11a2ae 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3486,8 +3486,8 @@ userspace_tests() continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then set_userspace_pm $ns1 pm_nl_set_limits $ns2 2 2 - speed=3D5 \ - run_tests $ns1 $ns2 10.0.1.1 & + { speed=3D5 \ + run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null local tests_pid=3D$! wait_mpj $ns1 userspace_pm_add_addr $ns1 10.0.2.1 10 @@ -3521,8 +3521,8 @@ 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=3D5 \ - run_tests $ns1 $ns2 10.0.1.1 & + { speed=3D5 \ + run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null local tests_pid=3D$! wait_mpj $ns2 userspace_pm_add_sf $ns2 10.0.3.2 20 @@ -3550,8 +3550,8 @@ 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=3D5 \ - run_tests $ns1 $ns2 10.0.1.1 & + { speed=3D5 \ + run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null local tests_pid=3D$! wait_mpj $ns2 chk_mptcp_info subflows 0 subflows 0 @@ -3571,8 +3571,8 @@ 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=3D5 \ - run_tests $ns1 $ns2 10.0.1.1 & + { speed=3D5 \ + run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null local tests_pid=3D$! wait_mpj $ns2 userspace_pm_add_sf $ns2 10.0.3.2 20 @@ -3595,8 +3595,8 @@ 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=3D5 \ - run_tests $ns1 $ns2 10.0.1.1 & + { speed=3D5 \ + run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null local tests_pid=3D$! wait_mpj $ns1 userspace_pm_add_addr $ns1 10.0.2.1 10 @@ -3626,8 +3626,8 @@ endpoint_tests() pm_nl_set_limits $ns1 2 2 pm_nl_set_limits $ns2 2 2 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - speed=3Dslow \ - run_tests $ns1 $ns2 10.0.1.1 & + { speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null local tests_pid=3D$! =20 wait_mpj $ns1 @@ -3651,8 +3651,8 @@ endpoint_tests() pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow - test_linkfail=3D4 speed=3D20 \ - run_tests $ns1 $ns2 10.0.1.1 & + { test_linkfail=3D4 speed=3D20 \ + run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null local tests_pid=3D$! =20 wait_mpj $ns2 @@ -3698,8 +3698,8 @@ endpoint_tests() pm_nl_add_endpoint $ns1 10.0.2.1 id 1 flags signal # broadcast IP: no packet for this address will be received on ns1 pm_nl_add_endpoint $ns1 224.0.0.1 id 2 flags signal - test_linkfail=3D4 speed=3D20 \ - run_tests $ns1 $ns2 10.0.1.1 & + { test_linkfail=3D4 speed=3D20 \ + run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null local tests_pid=3D$! =20 wait_mpj $ns2 @@ -3735,8 +3735,8 @@ endpoint_tests() # broadcast IP: no packet for this address will be received on ns1 pm_nl_add_endpoint $ns1 224.0.0.1 id 2 flags signal pm_nl_add_endpoint $ns2 10.0.3.2 id 3 flags subflow - test_linkfail=3D4 speed=3D20 \ - run_tests $ns1 $ns2 10.0.1.1 & + { test_linkfail=3D4 speed=3D20 \ + run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null local tests_pid=3D$! =20 wait_attempt_fail $ns2 --=20 2.45.2