From nobody Wed Dec 17 05:42:08 2025 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 D2A3131F05; Wed, 17 May 2023 19:16:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 671BBC433EF; Wed, 17 May 2023 19:16:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684350994; bh=ZoTW81Zq40rpS9EpFuQuPgbIxlOeh6ivM85BvnFwJgE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=OFdJPJjxuPZU0xBg3dVjwpLNpuW9Ab/u4QupElnJz/oXFKYsU1vPVQE9zlBRExkmb syByIUFetq1/8DVsKGYJKsEazhodxfO3sRMAq/NaEcAbly0IxYA86tNbVZf+LIa8HX /iv9jfhvhc2+wKF8uvPCYjPFpSyaUiUiVi/QL8FoHyMJ3xV1UwBrtHEwQTYe10AIT3 j7bXn3pSiymDMub7XDE54L3w7+22Ago6n3Ib77fwLEws2nbw9R2A6N0atEy9NhX1zf +u3au7SEP0/3jG9c3I+egVlNeoUD0PxzOG/Gcq1h+tBxmIxhg+sc7fiE0J8WboCE3U fHgeiL0RJfGcw== From: Mat Martineau Date: Wed, 17 May 2023 12:16:14 -0700 Subject: [PATCH net-next 1/5] inet: factor out locked section of inet_accept() in a new helper 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: <20230516-send-net-next-20220516-v1-1-e91822b7b6e0@kernel.org> References: <20230516-send-net-next-20220516-v1-0-e91822b7b6e0@kernel.org> In-Reply-To: <20230516-send-net-next-20220516-v1-0-e91822b7b6e0@kernel.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthieu Baerts Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, Mat Martineau X-Mailer: b4 0.12.2 From: Paolo Abeni No functional changes intended. The new helper will be used by the MPTCP protocol in the next patch to avoid duplicating a few LoC. Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts Signed-off-by: Mat Martineau --- include/net/inet_common.h | 2 ++ net/ipv4/af_inet.c | 32 +++++++++++++++++--------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/include/net/inet_common.h b/include/net/inet_common.h index cec453c18f1d..77f4b0ef5b92 100644 --- a/include/net/inet_common.h +++ b/include/net/inet_common.h @@ -31,6 +31,8 @@ int inet_dgram_connect(struct socket *sock, struct sockad= dr *uaddr, int addr_len, int flags); int inet_accept(struct socket *sock, struct socket *newsock, int flags, bool kern); +void __inet_accept(struct socket *sock, struct socket *newsock, + struct sock *newsk); int inet_send_prepare(struct sock *sk); int inet_sendmsg(struct socket *sock, struct msghdr *msg, size_t size); ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset, diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index c4aab3aacbd8..946650036c7f 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -730,6 +730,20 @@ int inet_stream_connect(struct socket *sock, struct so= ckaddr *uaddr, } EXPORT_SYMBOL(inet_stream_connect); =20 +void __inet_accept(struct socket *sock, struct socket *newsock, struct soc= k *newsk) +{ + sock_rps_record_flow(newsk); + WARN_ON(!((1 << newsk->sk_state) & + (TCPF_ESTABLISHED | TCPF_SYN_RECV | + TCPF_CLOSE_WAIT | TCPF_CLOSE))); + + if (test_bit(SOCK_SUPPORT_ZC, &sock->flags)) + set_bit(SOCK_SUPPORT_ZC, &newsock->flags); + sock_graft(newsk, newsock); + + newsock->state =3D SS_CONNECTED; +} + /* * Accept a pending connection. The TCP layer now gives BSD semantics. */ @@ -743,24 +757,12 @@ int inet_accept(struct socket *sock, struct socket *n= ewsock, int flags, /* IPV6_ADDRFORM can change sk->sk_prot under us. */ sk2 =3D READ_ONCE(sk1->sk_prot)->accept(sk1, flags, &err, kern); if (!sk2) - goto do_err; + return err; =20 lock_sock(sk2); - - sock_rps_record_flow(sk2); - WARN_ON(!((1 << sk2->sk_state) & - (TCPF_ESTABLISHED | TCPF_SYN_RECV | - TCPF_CLOSE_WAIT | TCPF_CLOSE))); - - if (test_bit(SOCK_SUPPORT_ZC, &sock->flags)) - set_bit(SOCK_SUPPORT_ZC, &newsock->flags); - sock_graft(sk2, newsock); - - newsock->state =3D SS_CONNECTED; - err =3D 0; + __inet_accept(sock, newsock, sk2); release_sock(sk2); -do_err: - return err; + return 0; } EXPORT_SYMBOL(inet_accept); =20 --=20 2.40.1 From nobody Wed Dec 17 05:42:08 2025 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 2D23931F12; Wed, 17 May 2023 19:16:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3A3BC433A0; Wed, 17 May 2023 19:16:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684350994; bh=IOY4w35P1hUP7dCa5bCvMMtraUvTn5g+EzA9MRkHVbI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=NQhG6xyaZQeAYi1QeJKehHPIRy+efatwY9ghUL+Bp+Yhe4Jg4k/2HB5uMckZlfXQA wCzaOtnJKc4k7AUwFBJTqGItqU2XyIjmU25f3u0NEW77Tcd3Pkky5eLQwhDwbGcOO7 vXnw8NUW56RcE8d330sMrTr1aJXheIw8TynXOHYGVBmTEP4u07n++T62KN6pmyIlVV Mwy60Z8LS983oa8gIcDX7q2pyz8H6f1pYdB+YL3IsVxBREMlvErtBiL13hMs6ermfB 8mGxDSsT0GsTJSZU53JH3tKNQdiO3Y9tTEqOQLmE9223P8MXxugEX+/mqfgwxRvvrY lCZTFzfCncucw== From: Mat Martineau Date: Wed, 17 May 2023 12:16:15 -0700 Subject: [PATCH net-next 2/5] mptcp: refactor mptcp_stream_accept() 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: <20230516-send-net-next-20220516-v1-2-e91822b7b6e0@kernel.org> References: <20230516-send-net-next-20220516-v1-0-e91822b7b6e0@kernel.org> In-Reply-To: <20230516-send-net-next-20220516-v1-0-e91822b7b6e0@kernel.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthieu Baerts Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, Mat Martineau X-Mailer: b4 0.12.2 From: Paolo Abeni Rewrite the mptcp socket accept op, leveraging the new __inet_accept() helper. This way we can avoid acquiring the new socket lock twice and we can avoid a couple of indirect calls. Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts Signed-off-by: Mat Martineau --- net/mptcp/protocol.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 08dc53f56bc2..2d331b2d62b7 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3747,6 +3747,7 @@ static int mptcp_stream_accept(struct socket *sock, s= truct socket *newsock, { struct mptcp_sock *msk =3D mptcp_sk(sock->sk); struct socket *ssock; + struct sock *newsk; int err; =20 pr_debug("msk=3D%p", msk); @@ -3758,17 +3759,20 @@ static int mptcp_stream_accept(struct socket *sock,= struct socket *newsock, if (!ssock) return -EINVAL; =20 - err =3D ssock->ops->accept(sock, newsock, flags, kern); - if (err =3D=3D 0 && !mptcp_is_tcpsk(newsock->sk)) { - struct mptcp_sock *msk =3D mptcp_sk(newsock->sk); + newsk =3D mptcp_accept(sock->sk, flags, &err, kern); + if (!newsk) + return err; + + lock_sock(newsk); + + __inet_accept(sock, newsock, newsk); + if (!mptcp_is_tcpsk(newsock->sk)) { + struct mptcp_sock *msk =3D mptcp_sk(newsk); struct mptcp_subflow_context *subflow; - struct sock *newsk =3D newsock->sk; =20 set_bit(SOCK_CUSTOM_SOCKOPT, &newsock->flags); msk->in_accept_queue =3D 0; =20 - lock_sock(newsk); - /* set ssk->sk_socket of accept()ed flows to mptcp socket. * This is needed so NOSPACE flag can be set from tcp stack. */ @@ -3789,11 +3793,10 @@ static int mptcp_stream_accept(struct socket *sock,= struct socket *newsock, if (unlikely(list_empty(&msk->conn_list))) inet_sk_state_store(newsk, TCP_CLOSE); } - - release_sock(newsk); } + release_sock(newsk); =20 - return err; + return 0; } =20 static __poll_t mptcp_check_writeable(struct mptcp_sock *msk) --=20 2.40.1 From nobody Wed Dec 17 05:42:08 2025 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 863E831F15; Wed, 17 May 2023 19:16:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0BF32C4339C; Wed, 17 May 2023 19:16:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684350995; bh=ZjM7OOfC3AeCHvlE5Yy28iFPBn6q3LOa2FbcG+q3L4M=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Uv6lsxDYG3qVtZoQpyQ8osGnu+4SMW4WSV8bMo2fkk/nLaQqkvBkF+mcKJt90rTY4 kOn7WtbNCOdANDUsNqRCXiGLgqvmlrQtRgLeHVfPyaa2KWYS4y054n582QtooVJu04 K7m6WnZa/C3hSwnyAV9kg/xUFfOb2Rw+oQnTPGHxU9183Q5hpD4PGfCLRav5MWnQgi sUBQZ1EbiibA+8O2WZTOAQ8SuVZpnnfucjbyx8w6+RxvP09VC+Y0cmaZE/12PGme3g VlqI89mUnEqveg9Kh84mLM6TassAcOPIkdlaPpOYWkontAV3GtL7fg/CvvuJagTsAY 2lDF+4k2Srw9g== From: Mat Martineau Date: Wed, 17 May 2023 12:16:16 -0700 Subject: [PATCH net-next 3/5] mptcp: introduces more address related mibs 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: <20230516-send-net-next-20220516-v1-3-e91822b7b6e0@kernel.org> References: <20230516-send-net-next-20220516-v1-0-e91822b7b6e0@kernel.org> In-Reply-To: <20230516-send-net-next-20220516-v1-0-e91822b7b6e0@kernel.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthieu Baerts Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, Mat Martineau X-Mailer: b4 0.12.2 From: Paolo Abeni Currently we don't track explicitly a few events related to address management suboption handling; this patch adds new mibs for ADD_ADDR and RM_ADDR options tx and for missed tx events due to internal storage exhaustion. The self-tests must be updated to properly handle different mibs with the same/shared prefix. Additionally removes a couple of warning tracking the loss event. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/378 Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts Signed-off-by: Mat Martineau --- net/mptcp/mib.c | 6 ++++++ net/mptcp/mib.h | 18 ++++++++++++++++++ net/mptcp/options.c | 5 ++++- net/mptcp/pm.c | 6 ++++-- tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++-- 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index 0dac2863c6e1..a0990c365a2e 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -34,7 +34,11 @@ static const struct snmp_mib mptcp_snmp_list[] =3D { SNMP_MIB_ITEM("NoDSSInWindow", MPTCP_MIB_NODSSWINDOW), SNMP_MIB_ITEM("DuplicateData", MPTCP_MIB_DUPDATA), SNMP_MIB_ITEM("AddAddr", MPTCP_MIB_ADDADDR), + SNMP_MIB_ITEM("AddAddrTx", MPTCP_MIB_ADDADDRTX), + SNMP_MIB_ITEM("AddAddrTxDrop", MPTCP_MIB_ADDADDRTXDROP), SNMP_MIB_ITEM("EchoAdd", MPTCP_MIB_ECHOADD), + SNMP_MIB_ITEM("EchoAddTx", MPTCP_MIB_ECHOADDTX), + SNMP_MIB_ITEM("EchoAddTxDrop", MPTCP_MIB_ECHOADDTXDROP), SNMP_MIB_ITEM("PortAdd", MPTCP_MIB_PORTADD), SNMP_MIB_ITEM("AddAddrDrop", MPTCP_MIB_ADDADDRDROP), SNMP_MIB_ITEM("MPJoinPortSynRx", MPTCP_MIB_JOINPORTSYNRX), @@ -44,6 +48,8 @@ static const struct snmp_mib mptcp_snmp_list[] =3D { SNMP_MIB_ITEM("MismatchPortAckRx", MPTCP_MIB_MISMATCHPORTACKRX), SNMP_MIB_ITEM("RmAddr", MPTCP_MIB_RMADDR), SNMP_MIB_ITEM("RmAddrDrop", MPTCP_MIB_RMADDRDROP), + SNMP_MIB_ITEM("RmAddrTx", MPTCP_MIB_RMADDRTX), + SNMP_MIB_ITEM("RmAddrTxDrop", MPTCP_MIB_RMADDRTXDROP), SNMP_MIB_ITEM("RmSubflow", MPTCP_MIB_RMSUBFLOW), SNMP_MIB_ITEM("MPPrioTx", MPTCP_MIB_MPPRIOTX), SNMP_MIB_ITEM("MPPrioRx", MPTCP_MIB_MPPRIORX), diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h index 2be3596374f4..cae71d947252 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -27,7 +27,15 @@ enum linux_mptcp_mib_field { MPTCP_MIB_NODSSWINDOW, /* Segments not in MPTCP windows */ MPTCP_MIB_DUPDATA, /* Segments discarded due to duplicate DSS */ MPTCP_MIB_ADDADDR, /* Received ADD_ADDR with echo-flag=3D0 */ + MPTCP_MIB_ADDADDRTX, /* Sent ADD_ADDR with echo-flag=3D0 */ + MPTCP_MIB_ADDADDRTXDROP, /* ADD_ADDR with echo-flag=3D0 not send due to + * resource exhaustion + */ MPTCP_MIB_ECHOADD, /* Received ADD_ADDR with echo-flag=3D1 */ + MPTCP_MIB_ECHOADDTX, /* Send ADD_ADDR with echo-flag=3D1 */ + MPTCP_MIB_ECHOADDTXDROP, /* ADD_ADDR with echo-flag=3D1 not send due + * to resource exhaustion + */ MPTCP_MIB_PORTADD, /* Received ADD_ADDR with a port-number */ MPTCP_MIB_ADDADDRDROP, /* Dropped incoming ADD_ADDR */ MPTCP_MIB_JOINPORTSYNRX, /* Received a SYN MP_JOIN with a different port-= number */ @@ -37,6 +45,8 @@ enum linux_mptcp_mib_field { MPTCP_MIB_MISMATCHPORTACKRX, /* Received an ACK MP_JOIN with a mismatched= port-number */ MPTCP_MIB_RMADDR, /* Received RM_ADDR */ MPTCP_MIB_RMADDRDROP, /* Dropped incoming RM_ADDR */ + MPTCP_MIB_RMADDRTX, /* Sent RM_ADDR */ + MPTCP_MIB_RMADDRTXDROP, /* RM_ADDR not sent due to resource exhaustion */ MPTCP_MIB_RMSUBFLOW, /* Remove a subflow */ MPTCP_MIB_MPPRIOTX, /* Transmit a MP_PRIO */ MPTCP_MIB_MPPRIORX, /* Received a MP_PRIO */ @@ -63,6 +73,14 @@ struct mptcp_mib { unsigned long mibs[LINUX_MIB_MPTCP_MAX]; }; =20 +static inline void MPTCP_ADD_STATS(struct net *net, + enum linux_mptcp_mib_field field, + int val) +{ + if (likely(net->mib.mptcp_statistics)) + SNMP_ADD_STATS(net->mib.mptcp_statistics, field, val); +} + static inline void MPTCP_INC_STATS(struct net *net, enum linux_mptcp_mib_field field) { diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 19a01b6566f1..8a8083207be4 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -687,9 +687,12 @@ static bool mptcp_established_options_add_addr(struct = sock *sk, struct sk_buff * } opts->suboptions |=3D OPTION_MPTCP_ADD_ADDR; if (!echo) { + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ADDADDRTX); opts->ahmac =3D add_addr_generate_hmac(msk->local_key, msk->remote_key, &opts->addr); + } else { + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ECHOADDTX); } pr_debug("addr_id=3D%d, ahmac=3D%llu, echo=3D%d, port=3D%d", opts->addr.id, opts->ahmac, echo, ntohs(opts->addr.port)); @@ -723,7 +726,7 @@ static bool mptcp_established_options_rm_addr(struct so= ck *sk, =20 for (i =3D 0; i < opts->rm_list.nr; i++) pr_debug("rm_list_ids[%d]=3D%d", i, opts->rm_list.ids[i]); - + MPTCP_ADD_STATS(sock_net(sk), MPTCP_MIB_RMADDRTX, opts->rm_list.nr); return true; } =20 diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 78c924506e83..7d03b5fd8200 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -26,7 +26,8 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, =20 if (add_addr & (echo ? BIT(MPTCP_ADD_ADDR_ECHO) : BIT(MPTCP_ADD_ADDR_SIGNAL))) { - pr_warn("addr_signal error, add_addr=3D%d, echo=3D%d", add_addr, echo); + MPTCP_INC_STATS(sock_net((struct sock *)msk), + echo ? MPTCP_MIB_ECHOADDTXDROP : MPTCP_MIB_ADDADDRTXDROP); return -EINVAL; } =20 @@ -48,7 +49,8 @@ int mptcp_pm_remove_addr(struct mptcp_sock *msk, const st= ruct mptcp_rm_list *rm_ pr_debug("msk=3D%p, rm_list_nr=3D%d", msk, rm_list->nr); =20 if (rm_addr) { - pr_warn("addr_signal error, rm_addr=3D%d", rm_addr); + MPTCP_ADD_STATS(sock_net((struct sock *)msk), + MPTCP_MIB_RMADDRTXDROP, rm_list->nr); return -EINVAL; } =20 diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 26310c17b4c6..0886ed2c59ea 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1492,7 +1492,7 @@ chk_add_nr() fi =20 echo -n " - echo " - count=3D$(ip netns exec $ns1 nstat -as | grep MPTcpExtEchoAdd | awk '{pri= nt $2}') + count=3D$(ip netns exec $ns1 nstat -as MPTcpExtEchoAdd | grep MPTcpExtEch= oAdd | awk '{print $2}') [ -z "$count" ] && count=3D0 if [ "$count" !=3D "$echo_nr" ]; then echo "[fail] got $count ADD_ADDR echo[s] expected $echo_nr" @@ -1614,7 +1614,7 @@ chk_rm_nr() fi =20 printf "%-${nr_blank}s %s" " " "rm " - count=3D$(ip netns exec $addr_ns nstat -as | grep MPTcpExtRmAddr | awk '{= print $2}') + count=3D$(ip netns exec $addr_ns nstat -as MPTcpExtRmAddr | grep MPTcpExt= RmAddr | awk '{print $2}') [ -z "$count" ] && count=3D0 if [ "$count" !=3D "$rm_addr_nr" ]; then echo "[fail] got $count RM_ADDR[s] expected $rm_addr_nr" --=20 2.40.1 From nobody Wed Dec 17 05:42:08 2025 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 C4B9B31F16; Wed, 17 May 2023 19:16:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 588D0C4339E; Wed, 17 May 2023 19:16:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684350995; bh=R4YpFZTl+oXNewsjYriHjMMokwZrKw/2xqb0ZCvX8KI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=m4aPRRE2SkMilCv8ZQVMXxatc7nXi0lJzt6AK5gMzj38BkUrH+XlQenaZuKKfl8sO oESA+w82ouGGC2m8wDBOQhhv5RbtybzC7Lk2/Ky+XxzAiw8r71gBdEuZRHSD/koeFv 7TAozFV35zNV9DLJxWVz1Z2dONwrKtUqVlesLEaAhikagoV5zrW2A2GxFWpq+Tzh7F ZWPZ4Icc0GZ3L8U++jK3Pe2+QeY85QnCJZmOe3Uno1pafIg6e+5OGdy3Wq5us0IL+K YIvc8TfIXL/BB9kVUA+4RJ32HVikfUCRWiFPNkGiQXIl9Cvz6QE2ilqIkb+7E9jISV DoVOn8aEC6G9A== From: Mat Martineau Date: Wed, 17 May 2023 12:16:17 -0700 Subject: [PATCH net-next 4/5] selftests: mptcp: add explicit check for new mibs 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: <20230516-send-net-next-20220516-v1-4-e91822b7b6e0@kernel.org> References: <20230516-send-net-next-20220516-v1-0-e91822b7b6e0@kernel.org> In-Reply-To: <20230516-send-net-next-20220516-v1-0-e91822b7b6e0@kernel.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthieu Baerts Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, Mat Martineau X-Mailer: b4 0.12.2 From: Paolo Abeni Instead of duplicating the all existing TX check with the TX side, add the new ones on selected test cases. Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 62 +++++++++++++++++++++= ++++ 1 file changed, 62 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 0886ed2c59ea..ca5bd2c3434a 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1585,6 +1585,44 @@ chk_add_nr() [ "${dump_stats}" =3D 1 ] && dump_stats } =20 +chk_add_tx_nr() +{ + local add_tx_nr=3D$1 + local echo_tx_nr=3D$2 + local dump_stats + local timeout + local count + + timeout=3D$(ip netns exec $ns1 sysctl -n net.mptcp.add_addr_timeout) + + printf "%-${nr_blank}s %s" " " "add TX" + count=3D$(ip netns exec $ns1 nstat -as MPTcpExtAddAddrTx | grep MPTcpExtA= ddAddrTx | awk '{print $2}') + [ -z "$count" ] && count=3D0 + + # if the test configured a short timeout tolerate greater then expected + # add addrs options, due to retransmissions + if [ "$count" !=3D "$add_tx_nr" ] && { [ "$timeout" -gt 1 ] || [ "$count"= -lt "$add_tx_nr" ]; }; then + echo "[fail] got $count ADD_ADDR[s] TX, expected $add_tx_nr" + fail_test + dump_stats=3D1 + else + echo -n "[ ok ]" + fi + + echo -n " - echo TX " + count=3D$(ip netns exec $ns2 nstat -as MPTcpExtEchoAddTx | grep MPTcpExtE= choAddTx | awk '{print $2}') + [ -z "$count" ] && count=3D0 + if [ "$count" !=3D "$echo_tx_nr" ]; then + echo "[fail] got $count ADD_ADDR echo[s] TX, expected $echo_tx_nr" + fail_test + dump_stats=3D1 + else + echo "[ ok ]" + fi + + [ "${dump_stats}" =3D 1 ] && dump_stats +} + chk_rm_nr() { local rm_addr_nr=3D$1 @@ -1660,6 +1698,26 @@ chk_rm_nr() echo "$extra_msg" } =20 +chk_rm_tx_nr() +{ + local rm_addr_tx_nr=3D$1 + + printf "%-${nr_blank}s %s" " " "rm TX " + count=3D$(ip netns exec $ns2 nstat -as MPTcpExtRmAddrTx | grep MPTcpExtRm= AddrTx | awk '{print $2}') + [ -z "$count" ] && count=3D0 + if [ "$count" !=3D "$rm_addr_tx_nr" ]; then + echo "[fail] got $count RM_ADDR[s] expected $rm_addr_tx_nr" + fail_test + dump_stats=3D1 + else + echo -n "[ ok ]" + fi + + [ "${dump_stats}" =3D 1 ] && dump_stats + + echo "$extra_msg" +} + chk_prio_nr() { local mp_prio_nr_tx=3D$1 @@ -1939,6 +1997,7 @@ signal_address_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 + chk_add_tx_nr 1 1 chk_add_nr 1 1 fi =20 @@ -2120,6 +2179,7 @@ add_addr_timeout_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow chk_join_nr 1 1 1 + chk_add_tx_nr 4 4 chk_add_nr 4 0 fi =20 @@ -2165,6 +2225,7 @@ remove_tests() pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow chk_join_nr 1 1 1 + chk_rm_tx_nr 1 chk_rm_nr 1 1 fi =20 @@ -2263,6 +2324,7 @@ remove_tests() pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow chk_join_nr 3 3 3 + chk_rm_tx_nr 0 chk_rm_nr 0 3 simult fi =20 --=20 2.40.1 From nobody Wed Dec 17 05:42:08 2025 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 1497B34CC5; Wed, 17 May 2023 19:16:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A537BC433AA; Wed, 17 May 2023 19:16:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684350995; bh=p0EvOzBCztilHL/SDblWqqPkxHoLTNRrTlbvKEjqEQs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Wn9xLqJumVoWoHFjJdhePzT07lUrdklIn3rJEyuflfVnGGJu7h4N2NQdRRg1FXKh1 Uhsi134FtxG05IeXWrmKSDRCQJbslo7Ehq797p2tAiuR2ftZWjGxLWxSgY5o02L2un DwM/pfk38Qs5+NcfaQWeSFpg/VgEzffKnoqTWa1NdM0f/heYyU9wxz6irRzVCWTjOW DZDf/tZ3vEEgGo4G9HnSVYjv8dRkDWn2B5Ur4ZBYxxQBdFRYrsi1a1z7+fwRIQmzKs 36102DDwyEZcg7t2w/KWNYAFYoFk2VgLLRbRyu4PiJs1dyEvVm80YWoHhSy8Lzjym9 ZY+ypDwG/fEag== From: Mat Martineau Date: Wed, 17 May 2023 12:16:18 -0700 Subject: [PATCH net-next 5/5] selftests: mptcp: centralize stats dumping 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: <20230516-send-net-next-20220516-v1-5-e91822b7b6e0@kernel.org> References: <20230516-send-net-next-20220516-v1-0-e91822b7b6e0@kernel.org> In-Reply-To: <20230516-send-net-next-20220516-v1-0-e91822b7b6e0@kernel.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthieu Baerts Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, Mat Martineau X-Mailer: b4 0.12.2 From: Paolo Abeni If a test case fails, the mptcp_join.sh script can dump the netns MIBs multiple times, leading to confusing output. Let's dump such info only once per test-case, when needed. This additionally allow removing some code duplication. Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 66 ++-------------------= ---- 1 file changed, 5 insertions(+), 61 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index ca5bd2c3434a..e74d3074ef90 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -34,6 +34,7 @@ evts_ns1=3D"" evts_ns2=3D"" evts_ns1_pid=3D0 evts_ns2_pid=3D0 +stats_dumped=3D0 =20 declare -A all_tests declare -a only_tests_ids @@ -87,6 +88,7 @@ init_partial() fi done =20 + stats_dumped=3D0 check_invert=3D0 validate_checksum=3D$checksum FAILING_LINKS=3D"" @@ -347,6 +349,9 @@ fail_test() { ret=3D1 failed_tests[${TEST_COUNT}]=3D"${TEST_NAME}" + + [ "${stats_dumped}" =3D 0 ] && dump_stats + stats_dumped=3D1 } =20 get_failed_tests_ids() @@ -1120,7 +1125,6 @@ chk_csum_nr() local csum_ns1=3D${1:-0} local csum_ns2=3D${2:-0} local count - local dump_stats local extra_msg=3D"" local allow_multi_errors_ns1=3D0 local allow_multi_errors_ns2=3D0 @@ -1144,7 +1148,6 @@ chk_csum_nr() { [ "$count" -lt $csum_ns1 ] && [ $allow_multi_errors_ns1 -eq 1 ]; }; = then echo "[fail] got $count data checksum error[s] expected $csum_ns1" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi @@ -1158,11 +1161,9 @@ chk_csum_nr() { [ "$count" -lt $csum_ns2 ] && [ $allow_multi_errors_ns2 -eq 1 ]; }; = then echo "[fail] got $count data checksum error[s] expected $csum_ns2" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi - [ "${dump_stats}" =3D 1 ] && dump_stats =20 echo "$extra_msg" } @@ -1173,7 +1174,6 @@ chk_fail_nr() local fail_rx=3D$2 local ns_invert=3D${3:-""} local count - local dump_stats local ns_tx=3D$ns1 local ns_rx=3D$ns2 local extra_msg=3D"" @@ -1205,7 +1205,6 @@ chk_fail_nr() { [ "$count" -gt "$fail_tx" ] && [ $allow_tx_lost -eq 1 ]; }; then echo "[fail] got $count MP_FAIL[s] TX expected $fail_tx" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi @@ -1220,13 +1219,10 @@ chk_fail_nr() { [ "$count" -gt "$fail_rx" ] && [ $allow_rx_lost -eq 1 ]; }; then echo "[fail] got $count MP_FAIL[s] RX expected $fail_rx" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi =20 - [ "${dump_stats}" =3D 1 ] && dump_stats - echo "$extra_msg" } =20 @@ -1236,7 +1232,6 @@ chk_fclose_nr() local fclose_rx=3D$2 local ns_invert=3D$3 local count - local dump_stats local ns_tx=3D$ns2 local ns_rx=3D$ns1 local extra_msg=3D" " @@ -1254,7 +1249,6 @@ chk_fclose_nr() if [ "$count" !=3D "$fclose_tx" ]; then echo "[fail] got $count MP_FASTCLOSE[s] TX expected $fclose_tx" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi @@ -1266,13 +1260,10 @@ chk_fclose_nr() if [ "$count" !=3D "$fclose_rx" ]; then echo "[fail] got $count MP_FASTCLOSE[s] RX expected $fclose_rx" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi =20 - [ "${dump_stats}" =3D 1 ] && dump_stats - echo "$extra_msg" } =20 @@ -1282,7 +1273,6 @@ chk_rst_nr() local rst_rx=3D$2 local ns_invert=3D${3:-""} local count - local dump_stats local ns_tx=3D$ns1 local ns_rx=3D$ns2 local extra_msg=3D"" @@ -1299,7 +1289,6 @@ chk_rst_nr() if [ $count -lt $rst_tx ]; then echo "[fail] got $count MP_RST[s] TX expected $rst_tx" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi @@ -1310,13 +1299,10 @@ chk_rst_nr() if [ "$count" -lt "$rst_rx" ]; then echo "[fail] got $count MP_RST[s] RX expected $rst_rx" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi =20 - [ "${dump_stats}" =3D 1 ] && dump_stats - echo "$extra_msg" } =20 @@ -1325,7 +1311,6 @@ chk_infi_nr() local infi_tx=3D$1 local infi_rx=3D$2 local count - local dump_stats =20 printf "%-${nr_blank}s %s" " " "itx" count=3D$(ip netns exec $ns2 nstat -as | grep InfiniteMapTx | awk '{print= $2}') @@ -1333,7 +1318,6 @@ chk_infi_nr() if [ "$count" !=3D "$infi_tx" ]; then echo "[fail] got $count infinite map[s] TX expected $infi_tx" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi @@ -1344,12 +1328,9 @@ chk_infi_nr() if [ "$count" !=3D "$infi_rx" ]; then echo "[fail] got $count infinite map[s] RX expected $infi_rx" fail_test - dump_stats=3D1 else echo "[ ok ]" fi - - [ "${dump_stats}" =3D 1 ] && dump_stats } =20 chk_join_nr() @@ -1364,7 +1345,6 @@ chk_join_nr() local infi_nr=3D${8:-0} local corrupted_pkts=3D${9:-0} local count - local dump_stats local with_cookie local title=3D"${TEST_NAME}" =20 @@ -1378,7 +1358,6 @@ chk_join_nr() if [ "$count" !=3D "$syn_nr" ]; then echo "[fail] got $count JOIN[s] syn expected $syn_nr" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi @@ -1396,7 +1375,6 @@ chk_join_nr() else echo "[fail] got $count JOIN[s] synack expected $syn_ack_nr" fail_test - dump_stats=3D1 fi else echo -n "[ ok ]" @@ -1408,11 +1386,9 @@ chk_join_nr() if [ "$count" !=3D "$ack_nr" ]; then echo "[fail] got $count JOIN[s] ack expected $ack_nr" fail_test - dump_stats=3D1 else echo "[ ok ]" fi - [ "${dump_stats}" =3D 1 ] && dump_stats if [ $validate_checksum -eq 1 ]; then chk_csum_nr $csum_ns1 $csum_ns2 chk_fail_nr $fail_nr $fail_nr @@ -1472,7 +1448,6 @@ chk_add_nr() local mis_syn_nr=3D${7:-0} local mis_ack_nr=3D${8:-0} local count - local dump_stats local timeout =20 timeout=3D$(ip netns exec $ns1 sysctl -n net.mptcp.add_addr_timeout) @@ -1486,7 +1461,6 @@ chk_add_nr() if [ "$count" !=3D "$add_nr" ] && { [ "$timeout" -gt 1 ] || [ "$count" -l= t "$add_nr" ]; }; then echo "[fail] got $count ADD_ADDR[s] expected $add_nr" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi @@ -1497,7 +1471,6 @@ chk_add_nr() if [ "$count" !=3D "$echo_nr" ]; then echo "[fail] got $count ADD_ADDR echo[s] expected $echo_nr" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi @@ -1509,7 +1482,6 @@ chk_add_nr() if [ "$count" !=3D "$port_nr" ]; then echo "[fail] got $count ADD_ADDR[s] with a port-number expected $port_n= r" fail_test - dump_stats=3D1 else echo "[ ok ]" fi @@ -1522,7 +1494,6 @@ chk_add_nr() echo "[fail] got $count JOIN[s] syn with a different \ port-number expected $syn_nr" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi @@ -1535,7 +1506,6 @@ chk_add_nr() echo "[fail] got $count JOIN[s] synack with a different \ port-number expected $syn_ack_nr" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi @@ -1548,7 +1518,6 @@ chk_add_nr() echo "[fail] got $count JOIN[s] ack with a different \ port-number expected $ack_nr" fail_test - dump_stats=3D1 else echo "[ ok ]" fi @@ -1561,7 +1530,6 @@ chk_add_nr() echo "[fail] got $count JOIN[s] syn with a mismatched \ port-number expected $mis_syn_nr" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi @@ -1574,22 +1542,18 @@ chk_add_nr() echo "[fail] got $count JOIN[s] ack with a mismatched \ port-number expected $mis_ack_nr" fail_test - dump_stats=3D1 else echo "[ ok ]" fi else echo "" fi - - [ "${dump_stats}" =3D 1 ] && dump_stats } =20 chk_add_tx_nr() { local add_tx_nr=3D$1 local echo_tx_nr=3D$2 - local dump_stats local timeout local count =20 @@ -1604,7 +1568,6 @@ chk_add_tx_nr() if [ "$count" !=3D "$add_tx_nr" ] && { [ "$timeout" -gt 1 ] || [ "$count"= -lt "$add_tx_nr" ]; }; then echo "[fail] got $count ADD_ADDR[s] TX, expected $add_tx_nr" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi @@ -1615,12 +1578,9 @@ chk_add_tx_nr() if [ "$count" !=3D "$echo_tx_nr" ]; then echo "[fail] got $count ADD_ADDR echo[s] TX, expected $echo_tx_nr" fail_test - dump_stats=3D1 else echo "[ ok ]" fi - - [ "${dump_stats}" =3D 1 ] && dump_stats } =20 chk_rm_nr() @@ -1630,7 +1590,6 @@ chk_rm_nr() local invert local simult local count - local dump_stats local addr_ns=3D$ns1 local subflow_ns=3D$ns2 local extra_msg=3D"" @@ -1657,7 +1616,6 @@ chk_rm_nr() if [ "$count" !=3D "$rm_addr_nr" ]; then echo "[fail] got $count RM_ADDR[s] expected $rm_addr_nr" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi @@ -1681,20 +1639,16 @@ chk_rm_nr() else echo "[fail] got $count RM_SUBFLOW[s] expected in range [$rm_subflow_nr= :$((rm_subflow_nr*2))]" fail_test - dump_stats=3D1 fi return fi if [ "$count" !=3D "$rm_subflow_nr" ]; then echo "[fail] got $count RM_SUBFLOW[s] expected $rm_subflow_nr" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi =20 - [ "${dump_stats}" =3D 1 ] && dump_stats - echo "$extra_msg" } =20 @@ -1708,13 +1662,10 @@ chk_rm_tx_nr() if [ "$count" !=3D "$rm_addr_tx_nr" ]; then echo "[fail] got $count RM_ADDR[s] expected $rm_addr_tx_nr" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi =20 - [ "${dump_stats}" =3D 1 ] && dump_stats - echo "$extra_msg" } =20 @@ -1723,7 +1674,6 @@ chk_prio_nr() local mp_prio_nr_tx=3D$1 local mp_prio_nr_rx=3D$2 local count - local dump_stats =20 printf "%-${nr_blank}s %s" " " "ptx" count=3D$(ip netns exec $ns1 nstat -as | grep MPTcpExtMPPrioTx | awk '{pr= int $2}') @@ -1731,7 +1681,6 @@ chk_prio_nr() if [ "$count" !=3D "$mp_prio_nr_tx" ]; then echo "[fail] got $count MP_PRIO[s] TX expected $mp_prio_nr_tx" fail_test - dump_stats=3D1 else echo -n "[ ok ]" fi @@ -1742,12 +1691,9 @@ chk_prio_nr() if [ "$count" !=3D "$mp_prio_nr_rx" ]; then echo "[fail] got $count MP_PRIO[s] RX expected $mp_prio_nr_rx" fail_test - dump_stats=3D1 else echo "[ ok ]" fi - - [ "${dump_stats}" =3D 1 ] && dump_stats } =20 chk_subflow_nr() @@ -1779,7 +1725,6 @@ chk_subflow_nr() ss -N $ns1 -tOni ss -N $ns1 -tOni | grep token ip -n $ns1 mptcp endpoint - dump_stats fi } =20 @@ -1819,7 +1764,6 @@ chk_mptcp_info() if [ "$dump_stats" =3D 1 ]; then ss -N $ns1 -inmHM ss -N $ns2 -inmHM - dump_stats fi } =20 --=20 2.40.1